Scrub cleanups as suggested by Matthias Saou.
This commit is contained in:
parent
1e41c093b7
commit
13baa49674
@ -1,11 +0,0 @@
|
||||
--- scrub-1.6/Makefile.BAD 2005-05-19 19:41:25.000000000 -0500
|
||||
+++ scrub-1.6/Makefile 2005-05-19 19:41:33.000000000 -0500
|
||||
@@ -6,7 +6,7 @@
|
||||
OBJS= scrub.o md5.o genrand.o
|
||||
CC= gcc
|
||||
# if rand_r comes up undefined, add -DNEED_RAND_R to CFLAGS
|
||||
-CFLAGS=-O -Wall -g
|
||||
+CFLAGS=${RPM_OPT_FLAGS}
|
||||
|
||||
|
||||
all: scrub pad
|
18
scrub.spec
18
scrub.spec
@ -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 @@ with a particular pattern.
|
||||
|
||||
%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 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%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@redhat.com> 1.6-2
|
||||
- cleanups
|
||||
|
||||
* Thu May 19 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.6-1
|
||||
- initial package for Fedora Extras
|
||||
|
Loading…
Reference in New Issue
Block a user