summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2008-07-24 13:31:49 -0400
committerDoug Ledford <dledford@redhat.com>2008-07-24 13:31:49 -0400
commit276a08bd1babe54ae4cd9c832c177f442efd3ca0 (patch)
treea308f0bae1bd9a963db90e4afc4acceb5dd3156b
parentab704c3b972e6e1ea23c321686f4c98e476edf4b (diff)
downloadmdadm-f8.zip
mdadm-f8.tar.gz
mdadm-f8.tar.xz
Update spec to exploded source repo style spec file and bump release for rebuildf8
Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r--distropkg/mdadm.spec32
1 files changed, 12 insertions, 20 deletions
diff --git a/distropkg/mdadm.spec b/distropkg/mdadm.spec
index 5a3c10a..44bea1b 100644
--- a/distropkg/mdadm.spec
+++ b/distropkg/mdadm.spec
@@ -1,15 +1,10 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm
Version: 2.6.4
-Release: 1%{?dist}
-Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
-Source1: mdmonitor.init
-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
-URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/
+Release: 2%{?dist}
+SCMType: git
+SCMURL: git://fedorapeople.org/~dledford/mdadm.git
+URL: http://neil.brown.name/blog/mdadm
License: GPL
Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,22 +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
+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 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
@@ -79,6 +66,11 @@ fi
%attr(0700,root,root) %dir /var/run/mdadm
%changelog
+* Thu Jul 24 2008 Doug Ledford <dledford@redhat.com> - 2.6.4-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
+
* Fri Oct 19 2007 Doug Ledford <dledford@redhat.com> - 2.6.4-1
- Update to latest upstream and remove patches upstream has taken