rpms/scrub/devel scrub.spec, 1.2, 1.3 scrub-1.6-rpmoptflags.patch, 1.1, NONE
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Sat May 21 05:25:20 UTC 2005
Author: spot
Update of /cvs/extras/rpms/scrub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22505/devel
Modified Files:
scrub.spec
Removed Files:
scrub-1.6-rpmoptflags.patch
Log Message:
Scrub cleanups as suggested by Matthias Saou.
Index: scrub.spec
===================================================================
RCS file: /cvs/extras/rpms/scrub/devel/scrub.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scrub.spec 20 May 2005 00:51:08 -0000 1.2
+++ scrub.spec 21 May 2005 05:25:18 -0000 1.3
@@ -1,12 +1,11 @@
Name: scrub
Version: 1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Disk scrubbing program
License: GPL
Group: System Environment/Base
URL: http://www.llnl.gov/linux/scrub/scrub.html
Source0: ftp://ftp.llnl.gov/pub/linux/scrub/%{name}-%{version}-1.tgz
-Patch0: scrub-1.6-rpmoptflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -17,18 +16,14 @@
%prep
%setup -q
-%patch0 -p1
%build
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -s -m 755 scrub $RPM_BUILD_ROOT%{_bindir}
-gzip scrub.1
-install -m 644 scrub.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
+install -D -m 755 scrub $RPM_BUILD_ROOT%{_bindir}/scrub
+install -D -m 644 scrub.1 $RPM_BUILD_ROOT%{_mandir}/man1/scrub.1
%clean
rm -rf $RPM_BUILD_ROOT
@@ -37,8 +32,11 @@
%defattr(-,root,root)
%doc README ChangeLog DISCLAIMER COPYING
%{_bindir}/scrub
-%{_mandir}/man1/scrub.1.gz
+%{_mandir}/man1/scrub.1*
%changelog
+* Sat May 21 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-2
+- cleanups
+
* Thu May 19 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-1
- initial package for Fedora Extras
--- scrub-1.6-rpmoptflags.patch DELETED ---
More information about the fedora-extras-commits
mailing list