rpms/scrub
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Scrub cleanups as suggested by Matthias Saou.

Browse Source
This commit is contained in:
Tom Callaway 2005-05-21 05:25:18 +00:00
parent 1e41c093b7
commit 13baa49674
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scrub-1.6-rpmoptflags.patch
View File

@ -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
View File

@ -1,12 +1,11 @@
Name: scrub Name: scrub
Version: 1.6 Version: 1.6
Release: 1%{?dist} Release: 2%{?dist}
Summary: Disk scrubbing program Summary: Disk scrubbing program
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
URL: http://www.llnl.gov/linux/scrub/scrub.html URL: http://www.llnl.gov/linux/scrub/scrub.html
Source0: ftp://ftp.llnl.gov/pub/linux/scrub/%{name}-%{version}-1.tgz 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description %description
@ -17,18 +16,14 @@ with a particular pattern.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
make %{?_smp_mflags} make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir} install -D -m 755 scrub $RPM_BUILD_ROOT%{_bindir}/scrub
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -D -m 644 scrub.1 $RPM_BUILD_ROOT%{_mandir}/man1/scrub.1
install -s -m 755 scrub $RPM_BUILD_ROOT%{_bindir}
gzip scrub.1
install -m 644 scrub.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -37,8 +32,11 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%doc README ChangeLog DISCLAIMER COPYING %doc README ChangeLog DISCLAIMER COPYING
%{_bindir}/scrub %{_bindir}/scrub
%{_mandir}/man1/scrub.1.gz %{_mandir}/man1/scrub.1*
%changelog %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 * Thu May 19 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.6-1
- initial package for Fedora Extras - initial package for Fedora Extras