Hello community, here is the log from the commit of package dbench checked in at Sun Feb 25 23:21:47 CET 2007. -------- --- dbench/dbench.changes 2007-02-08 17:08:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/dbench/dbench.changes 2007-02-21 17:43:16.423146000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 21 17:42:05 CET 2007 - yxu@suse.de + +- merge several fixing_suse_cert_dependency patches into one file + +------------------------------------------------------------------- Old: ---- fix-suse_cert-dependency-finished.patch fix-suse_cert-dependency-more.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbench.spec ++++++ --- /var/tmp/diff_new_pack.z22822/_old 2007-02-25 23:21:32.000000000 +0100 +++ /var/tmp/diff_new_pack.z22822/_new 2007-02-25 23:21:32.000000000 +0100 @@ -15,15 +15,13 @@ Group: System/Benchmark Autoreqprov: on Version: 3.04 -Release: 38 +Release: 40 Summary: File System Benchmark Similar to Netbench URL: http://samba.org/ftp/tridge/dbench/ Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-ctcstools.tar.bz2 Patch0: verbose.diff Patch1: fix-suse_cert-dependency.patch -Patch2: fix-suse_cert-dependency-more.patch -Patch3: fix-suse_cert-dependency-finished.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,11 +57,7 @@ %prep %setup -q -n %{name}-%{version} -a1 %patch0 -p1 -cd ctcstools %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -cd .. %build CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --datadir=/usr/share/dbench @@ -106,7 +100,9 @@ /usr/share/qa /usr/lib/ctcs2 -%changelog -n dbench +%changelog +* Wed Feb 21 2007 - yxu@suse.de +- merge several fixing_suse_cert_dependency patches into one file * Thu Feb 08 2007 - yxu@suse.de - finished removing dependency on pkg suse_cert * Mon Jan 29 2007 - yxu@suse.de ++++++ fix-suse_cert-dependency.patch ++++++ --- /var/tmp/diff_new_pack.z22822/_old 2007-02-25 23:21:32.000000000 +0100 +++ /var/tmp/diff_new_pack.z22822/_new 2007-02-25 23:21:32.000000000 +0100 @@ -1,15 +1,7 @@ -diff -Naur ctcstools/do_dbench ctcstools.fixed/do_dbench ---- ctcstools/do_dbench 2005-12-06 13:53:13.000000000 +0100 -+++ ctcstools.fixed/do_dbench 2006-02-06 14:21:34.000000000 +0100 -@@ -7,6 +7,7 @@ - # + yes: launch dbench test - # + no: exit 2 (= internal error in ctcs2) - # -+# Note: default workingdirectory is /abuild/dbench - # - # - # Script is intended to be invoked from within ctcs2 which captures -@@ -16,7 +17,6 @@ +diff -pur dbench-3.04-orig/ctcstools/do_dbench dbench-3.04/ctcstools/do_dbench +--- dbench-3.04-orig/ctcstools/do_dbench 2007-02-21 16:19:11.000000000 +0100 ++++ dbench-3.04/ctcstools/do_dbench 2007-02-21 16:31:09.000000000 +0100 +@@ -16,7 +16,6 @@ # # exitcode=2 # (= internal error in ctcs2) @@ -17,7 +9,7 @@ # dbench test constants default_workdir=/abuild/dbench -@@ -25,13 +25,6 @@ +@@ -25,13 +24,6 @@ diskspace_per_client=22 # MByte number_clients=1000 runtime=3600 # seconds @@ -31,16 +23,43 @@ # ============ START aux functions ============== -@@ -87,7 +80,7 @@ +@@ -68,7 +60,7 @@ function tidy_up() { + # Guard against re-entrancy -- yes, it may cause a race + invoked_tidy_up="yes" + echo "$(date): Caught signal; waiting 15s for dbench childs..." +- "$SLEEP" 15 ++ sleep 15 + echo " Overall runtime: $SECONDS seconds." + # This should be unnecessary: dbench itself will + # remove $workdir upon termination... +@@ -87,7 +79,7 @@ SECONDS=0 trap tidy_up 1 2 3 15 -timestamp="$(get_timestamp)" -+timestamp="$(dat '+%y%m%d.%H%M%S')" ++timestamp="$(date '+%y%m%d.%H%M%S')" basename=dbench-"${timestamp}" workdir="$default_workdir" dbench_opts="" -@@ -163,10 +156,10 @@ +@@ -137,7 +129,7 @@ then + exit "$exitcode" + } + else +- "$MKDIR" -p "$workdir" || { ++ mkdir -p "$workdir" || { + echo "Could not create working directory $workdir. Aborting..." + kill $$ # invokes tidy_up + } +@@ -151,7 +143,7 @@ Needed access rights rwx not all set. Ab + } + + wtestfile="${workdir}/prepare_workdir.$$.$$" +-echo "$wtestfile" > "$wtestfile" ; "$RM" "$wtestfile" || { ++echo "$wtestfile" > "$wtestfile" ; rm "$wtestfile" || { + echo "\ + Working directory $workdir: + Cannot create or remove files there (maybe filesystem full or read-only?) +@@ -163,10 +155,10 @@ Aborting..." # abort in case of shortage # minfree="$((diskspace_per_client * number_clients))" # MByte @@ -54,7 +73,7 @@ if [ "$?" -ne 0 -o -z "$freespace" ] then echo "\ -@@ -178,7 +171,7 @@ +@@ -178,7 +170,7 @@ fi if [ "$freespace" -lt "$minfree" ] then echo "\ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de