From a0be5a94ee0e6419d666789197f26a576fe81a95 Mon Sep 17 00:00:00 2001
From: Doug Ledford <dledford@redhat.com>
Date: Thu, 24 Jul 2008 13:31:49 -0400
Subject: Update spec to exploded source repo style spec file and bump release
 for rebuild

Signed-off-by: Doug Ledford <dledford@redhat.com>
---
 distropkg/mdadm.spec | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/distropkg/mdadm.spec b/distropkg/mdadm.spec
index fac4ded..b75fbf8 100644
--- a/distropkg/mdadm.spec
+++ b/distropkg/mdadm.spec
@@ -1,17 +1,10 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     2.6.7
-Release:     1%{?dist}
-Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
-Source1:     mdmonitor.init
-Source2:     mdadm.rules
-Patch1:      mdadm-2.5.2-s390-build.patch
-Patch2:      mdadm-2.5.2-static.patch
-Patch3:      mdadm-2.2-nodiet.patch
-Patch4:      mdadm-2.5.2-cflags.patch
-Patch5:      mdadm-2.6.1-build.patch
-Patch6:      mdadm-2.6.4-open.patch
-URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
+Release:     2%{?dist}
+SCMType:     git
+SCMURL:      git://fedorapeople.org/~dledford/mdadm.git
+URL:         http://neil.brown.name/blog/mdadm
 License:     GPLv2+
 Group:       System Environment/Base
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,25 +21,14 @@ almost all functions without a configuration file, though a configuration
 file can be used to help with some common tasks.
 
 %prep
-%setup -q
-%patch1 -p1 -b .s390
-%patch2 -p1 -b .static
-%patch3 -p1 -b .nodiet
-%patch4 -p1 -b .cflags
-%patch5 -p1 -b .build
-%patch6 -p1 -b .open
+make clean
 
 %build
-make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdassemble.static mdassemble mdadm.static mdadm
+make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR=%{_sysconfdir} INITRDDIR=%{_initrddir} MDASSEMBLE_AUTO=1 mdassemble.static mdassemble mdadm.static mdadm
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install
-install -Dp -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
-mkdir -p -m 755 $RPM_BUILD_ROOT/etc/udev/rules.d
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/udev/rules.d/70-mdadm.rules
-
-mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
+make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin SYSCONFDIR=%{_sysconfdir} INITRDDIR=%{_initrddir} install fedora-install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +67,11 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Thu Jul 24 2008 Doug Ledford <dledford@redhat.com> - 2.6.7-2
+- Bump version and switch from Source method to SCM method
+- Remove unnecessary Source and Patch lines
+- Remove unnecessary install actions now handled by make fedora-install
+
 * Thu Jun 26 2008 Doug Ledford <dledford@redhat.com> - 2.6.7-1
 - Update to latest upstream version (should resolve #444237)
 - Drop incremental patch as it's now part of upstream
-- 
cgit