rpms/dbench/EL-5 dbench-3.04-datadir.patch, NONE, 1.1 dbench-3.04-destdir.patch, NONE, 1.1 dbench.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Rahul Sundaram (sundaram) fedora-extras-commits at redhat.com
Wed Sep 12 06:55:41 UTC 2007


Author: sundaram

Update of /cvs/pkgs/rpms/dbench/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11477

Modified Files:
	.cvsignore sources 
Added Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
	dbench.spec 
Log Message:
Initial build


dbench-3.04-datadir.patch:

--- NEW FILE dbench-3.04-datadir.patch ---
--- dbench-3.04/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-07-11 15:27:53.000000000 -0400
@@ -32,9 +32,9 @@ tbench_srv: $(SRV_OBJS)
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir)/dbench $(DESTDIR)/$(mandir)
 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
-	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 client.txt $(DESTDIR)/$(datadir)/dbench
 	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
 	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
--- dbench-3.04/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-3.04/dbench.c	2007-07-11 15:29:50.000000000 -0400
@@ -29,7 +29,7 @@ int sync_open = 0, sync_dirs = 0;
 char *tcp_options = TCP_OPTIONS;
 static int timelimit = 600, warmup;
 static const char *directory = ".";
-static char *loadfile = DATADIR "/client.txt";
+static char *loadfile = DATADIR "/dbench/client.txt";
 static struct timeval tv_start;
 static struct timeval tv_end;
 

dbench-3.04-destdir.patch:

--- NEW FILE dbench-3.04-destdir.patch ---
--- dbench-3.04/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-3.04/Makefile.in	2007-06-20 16:44:56.000000000 -0400
@@ -32,12 +32,12 @@
 
 # Careful here: don't install client.txt over itself.
 install: all
-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
-	${INSTALLCMD} client.txt $(datadir)
-	${INSTALLCMD} -m644 dbench.1 $(mandir)
-	ln -sf dbench.1 $(mandir)/tbench.1
-	ln -sf dbench.1 $(mandir)/tbench_srv.1
+	${INSTALLCMD} -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)
+	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)/$(bindir)
+	${INSTALLCMD} client.txt $(DESTDIR)/$(datadir)
+	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)/$(mandir)
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench.1
+	ln -sf dbench.1 $(DESTDIR)/$(mandir)/tbench_srv.1
 
 clean:
 	rm -f *.o *~ dbench tbench tbench_srv


--- NEW FILE dbench.spec ---
Name:           dbench
Version:        3.04 
Release:        6%{?dist}
Summary:        Filesystem load benchmarking tool

Group:          System Environment/Base
License:        GPLv2+
Source0:        http://samba.org/ftp/tridge/dbench/dbench-%{version}.tar.gz 
URL:            http://samba.org/ftp/tridge/dbench/README
Patch0:         dbench-3.04-destdir.patch
Patch1:         dbench-3.04-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
%description
Dbench is a file system benchmark that generates load patterns similar
to those of the commercial Netbench benchmark, but without requiring a
lab of Windows load generators to run. It is now considered a de facto
standard for generating load on the Linux VFS.

%prep
%setup -q
%patch0 -p1 -b .destdir 
%patch1 -p1 -b .datadir

%build 
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}/man1 INSTALLCMD='install -p'

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%dir %{_datadir}/dbench
%{_datadir}/dbench/client.txt
%{_bindir}/*
%{_mandir}/man1/*

%changelog

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-6
- Drop redundant version macro
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-5
- Fix version. Dropped BR on glibc-headers
* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-4
- Fixed docs

* Tue Sep 11 2007 Rahul Sundaram<sundaram at redhat.com> - 3.04-3
- Fixed description, man page location, timestamps, BR and license tag

* Wed Jul 11 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-2
- add patch to move client.txt to %%{_datadir}/dbench and have the app look
  there for the file

* Wed Jun 20 2007 John (J5) Palmieri <johnp at redhat.com> - 3.04-1
- add patch to respect DESTDIR
- realy make and make install dbench
- place client.txt file in a sane location

* Wed Jun 20 2007 Rahul Sundaram <sundaram at redhat.com>
- split from olpc-utils as suggested in review. Based on the spec from J5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Sep 2007 16:16:51 -0000	1.1
+++ .cvsignore	12 Sep 2007 06:55:07 -0000	1.2
@@ -0,0 +1 @@
+dbench-3.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbench/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Sep 2007 16:16:51 -0000	1.1
+++ sources	12 Sep 2007 06:55:07 -0000	1.2
@@ -0,0 +1 @@
+efd0c958da79c1cd941ecd3f63e637ae  dbench-3.04.tar.gz




More information about the fedora-extras-commits mailing list