rpms/bonnie++/devel bonnie++-1.96-makefile.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.4, 1.5 bonnie++.spec, 1.22, 1.23 sources, 1.4, 1.5 bonnie++-1.03e-makefile.patch, 1.1, NONE

[joshkayse]

Author: joshkayse

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

Modified Files:
	.cvsignore bonnie++.spec sources 
Added Files:
	bonnie++-1.96-makefile.patch import.log 
Removed Files:
	bonnie++-1.03e-makefile.patch 
Log Message:
update to bonnie++ 1.96

bonnie++-1.96-makefile.patch:
 Makefile.in |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE bonnie++-1.96-makefile.patch ---
--- bonnie++-1.96.orig/Makefile.in	2009-12-09 10:01:09.000000000 -0500
+++ bonnie++-1.96/Makefile.in	2009-12-09 10:02:33.000000000 -0500
@@ -17,6 +17,8 @@ THREAD_LFLAGS=@thread_ldflags@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 
+DESTDIR=
+
 BONSRC=bonnie++.cpp bon_io.cpp bon_file.cpp bon_time.cpp semaphore.cpp \
  sync.cpp thread.cpp bon_suid.cpp duration.cpp rand.o util.o
 BONOBJS=$(BONSRC:.cpp=.o)
@@ -52,15 +54,15 @@ generate_randfile: generate_randfile.o
 	$(LINK) generate_randfile.o -o generate_randfile
 
 install-bin: $(EXE) $(EXES)
-	mkdir -p $(eprefix)/bin $(eprefix)/sbin
-	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin
-	@INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin
-	@INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin
+	mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin
+	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin
+	@INSTALL_PROGRAM@ @stripping@ $(EXE) $(DESTDIR)$(eprefix)/bin
+	@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
 	$(CXX) -c $<


--- NEW FILE import.log ---
bonnie++-1_96-1_fc13:HEAD:bonnie++-1.96-1.fc13.src.rpm:1260373813


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bonnie++/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 May 2009 17:19:43 -0000	1.4
+++ .cvsignore	9 Dec 2009 15:51:28 -0000	1.5
@@ -1 +1 @@
-bonnie++-1.03e.tgz
+bonnie++-1.96.tgz


Index: bonnie++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bonnie++/devel/bonnie++.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- bonnie++.spec	24 Jul 2009 18:19:24 -0000	1.22
+++ bonnie++.spec	9 Dec 2009 15:51:28 -0000	1.23
@@ -1,14 +1,14 @@
 Name:           bonnie++
-Version:        1.03e
-Release:        3%{?dist}
+Version:        1.96
+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.03e.tgz
-Patch0:         bonnie++-1.03e-makefile.patch
+Source0:        http://www.coker.com.au/bonnie++/experimental/bonnie++-%{version}.tgz
+Patch0:         %{name}-%{version}-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 %description
@@ -22,7 +22,7 @@ Do not leave bonnie++ installed on a pro
 test servers.
 
 %prep
-%setup -q -n bonnie++-1.03e
+%setup -q -n bonnie++-%{version}
 %patch0 -p1
 
 
@@ -45,15 +45,24 @@ rm -rf $RPM_BUILD_ROOT
 %doc readme.html copyright.txt credits.txt debian/changelog
 %{_mandir}/man1/bon_csv2html.1*
 %{_mandir}/man1/bon_csv2txt.1*
+%{_mandir}/man1/generate_randfile.1*
 %{_mandir}/man8/bonnie++.8*
+%{_mandir}/man8/getc_putc.8.*
 %{_mandir}/man8/zcav.8*
 %{_sbindir}/bonnie++
+%{_sbindir}/getc_putc
+%{_sbindir}/getc_putc_helper
 %{_sbindir}/zcav
 %{_bindir}/bon_csv2html
 %{_bindir}/bon_csv2txt
+%{_bindir}/generate_randfile
 
 
 %changelog
+* Wed Dec  9 2009 Rob Myers <rmyers at fedoraproject.org> - 1.96
+- Update to experimental version (#490895)
+- Merge patch from David Fetter
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03e-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bonnie++/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 May 2009 17:19:43 -0000	1.4
+++ sources	9 Dec 2009 15:51:28 -0000	1.5
@@ -1 +1 @@
-750aa5b5051263a99c6c195888c74968  bonnie++-1.03e.tgz
+7b8594559f00887d2865de1838328b35  bonnie++-1.96.tgz


--- bonnie++-1.03e-makefile.patch DELETED ---