rpms/bonnie++/devel bonnie++-1.03e-makefile.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 bonnie++.spec, 1.19, 1.20 sources, 1.3, 1.4 bonnie++-1.03a-gcc43.patch, 1.1, NONE bonnie++-1.03a-mandir.patch, 1.1, NONE

[Steven Pritchard]

Author: steve

Update of /cvs/pkgs/rpms/bonnie++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv311

Modified Files:
	.cvsignore bonnie++.spec sources 
Added Files:
	bonnie++-1.03e-makefile.patch 
Removed Files:
	bonnie++-1.03a-gcc43.patch bonnie++-1.03a-mandir.patch 
Log Message:
Update to 1.03e.
Drop gcc43 patch (upstream has a fix).
Use configure and patch Makefile to install correctly.


bonnie++-1.03e-makefile.patch:

--- NEW FILE bonnie++-1.03e-makefile.patch ---
--- bonnie++-1.03e.orig/Makefile.in	2002-10-13 15:26:36.000000000 -0500
+++ bonnie++-1.03e/Makefile.in	2009-05-13 16:02:22.000000000 -0500
@@ -14,6 +14,8 @@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 
+DESTDIR=
+
 BONSRC=bon_io.cpp bon_file.cpp bon_time.cpp semaphore.cpp forkit.cpp \
  bon_suid.cpp
 BONOBJS=$(BONSRC:.cpp=.o)
@@ -33,14 +35,14 @@
 	$(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS)
 
 install-bin: $(EXES)
-	mkdir -p $(eprefix)/bin $(eprefix)/sbin
-	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin
-	@INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin
+	mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin
+	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin
+	@INSTALL_SCRIPT@ $(SCRIPTS) $(DESTDIR)$(eprefix)/bin
 
 install: install-bin
-	mkdir -p @mandir@/man1 @mandir@/man8
-	@INSTALL_DATA@ $(MAN1) @mandir@/man1
-	@INSTALL_DATA@ $(MAN8) @mandir@/man8
+	mkdir -p $(DESTDIR)@mandir@/man1 $(DESTDIR)@mandir@/man8
+	@INSTALL_DATA@ $(MAN1) $(DESTDIR)@mandir@/man1
+	@INSTALL_DATA@ $(MAN8) $(DESTDIR)@mandir@/man8
 
 %.o: %.cpp %.h bonnie.h port.h
 	$(CXX) -c $<


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bonnie++/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Jul 2008 21:20:59 -0000	1.3
+++ .cvsignore	15 May 2009 17:19:43 -0000	1.4
@@ -1 +1 @@
-bonnie++-1.03c.tgz
+bonnie++-1.03e.tgz


Index: bonnie++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bonnie++/devel/bonnie++.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- bonnie++.spec	24 Feb 2009 05:28:44 -0000	1.19
+++ bonnie++.spec	15 May 2009 17:19:43 -0000	1.20
@@ -1,15 +1,15 @@
 Name:           bonnie++
-Version:        1.03c
-Release:        2%{?dist}
+Version:        1.03e
+Release:        1%{?dist}
 
 Summary:        Filesystem and disk benchmark & burn-in suite
 
 Group:          Applications/System
 License:        GPLv2
 URL:            http://www.coker.com.au/bonnie++/
-Source0:        http://www.coker.com.au/bonnie++/bonnie++-1.03c.tgz
+Source0:        http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz
+Patch0:         bonnie++-1.03e-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-Patch1:         bonnie++-1.03a-gcc43.patch
 
 %description
 bonnie++ filesystem and disk benchmark suite aggressively reads & writes
@@ -22,18 +22,19 @@ Do not leave bonnie++ installed on a pro
 test servers.
 
 %prep
-%setup -q -n bonnie++-1.03c
-%patch1 -p1
+%setup -q -n bonnie++-1.03e
+%patch0 -p1
 sed -i 's|${INSTALL}\s\+-s\b|${INSTALL}|' Makefile
 
 
 %build
-make %{?_smp_mflags} MORECFLAGS="$RPM_OPT_FLAGS"
+%configure
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %clean
@@ -43,10 +44,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc readme.html copyright.txt credits.txt debian/changelog
-%{_mandir}/man1/bon_csv2html.1.gz
-%{_mandir}/man1/bon_csv2txt.1.gz
-%{_mandir}/man8/bonnie++.8.gz
-%{_mandir}/man8/zcav.8.gz
+%{_mandir}/man1/bon_csv2html.1*
+%{_mandir}/man1/bon_csv2txt.1*
+%{_mandir}/man8/bonnie++.8*
+%{_mandir}/man8/zcav.8*
 %{_sbindir}/bonnie++
 %{_sbindir}/zcav
 %{_bindir}/bon_csv2html
@@ -54,6 +55,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 13 2009 Steven Pritchard <steve at kspei.com> 1.03e-1
+- Update to 1.03e
+- Drop gcc43 patch (upstream has a fix)
+- Use configure and patch Makefile to install correctly
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03c-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bonnie++/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Jul 2008 21:20:59 -0000	1.3
+++ sources	15 May 2009 17:19:43 -0000	1.4
@@ -1 +1 @@
-77a1ba78f37bdd7f024b67e1e36ad151  bonnie++-1.03c.tgz
+750aa5b5051263a99c6c195888c74968  bonnie++-1.03e.tgz


--- bonnie++-1.03a-gcc43.patch DELETED ---


--- bonnie++-1.03a-mandir.patch DELETED ---