rpms/dbench/devel dbench-4.0-datadir.patch, NONE, 1.1 dbench-4.0-destdir.patch, NONE, 1.1 dbench-3.04-datadir.patch, 1.1, NONE dbench-3.04-destdir.patch, 1.1, NONE

[Rahul Sundaram (sundaram)]

Author: sundaram

Update of /cvs/pkgs/rpms/dbench/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7391

Added Files:
	dbench-4.0-datadir.patch dbench-4.0-destdir.patch 
Removed Files:
	dbench-3.04-datadir.patch dbench-3.04-destdir.patch 
Log Message:
update patches


dbench-4.0-datadir.patch:

--- NEW FILE dbench-4.0-datadir.patch ---
--- dbench-4.0/Makefile.in.datadir	2007-07-11 15:26:53.000000000 -0400
+++ dbench-4.0/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-4.0/dbench.c.datadir	2007-07-11 15:28:31.000000000 -0400
+++ dbench-4.0/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-4.0-destdir.patch:

--- NEW FILE dbench-4.0-destdir.patch ---
--- dbench-4.0/Makefile.in.destdir	2007-06-20 16:42:46.000000000 -0400
+++ dbench-4.0/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


--- dbench-3.04-datadir.patch DELETED ---


--- dbench-3.04-destdir.patch DELETED ---