Author: sls Date: Tue Jun 5 16:20:50 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- removed lib64.patch
- dirs.patch updated for ver. 5.1.3
- added unixbench.sh wrapper
- rel. 0.9 (seems OK on i686)
---- Files affected:
packages/unixbench:
unixbench-dirs.patch (1.1 -> 1.2) , unixbench.spec (1.16 -> 1.17) ,
unixbench.sh (NONE -> 1.1) (NEW), unixbench-lib64.patch (1.1 -> NONE)
(REMOVED)
---- Diffs:
================================================================
Index: packages/unixbench/unixbench-dirs.patch
diff -u packages/unixbench/unixbench-dirs.patch:1.1
packages/unixbench/unixbench-dirs.patch:1.2
--- packages/unixbench/unixbench-dirs.patch:1.1 Thu Oct 25 10:24:35 2001
+++ packages/unixbench/unixbench-dirs.patch Tue Jun 5 18:20:45 2012
@@ -1,115 +1,3 @@
---- unixbench-4.1.0/Run.orig Thu Jul 29 00:04:47 1999
-+++ unixbench-4.1.0/Run Wed Oct 24 11:51:45 2001
-@@ -87,55 +87,36 @@
- UNAME="uname -a"
- fi
-
--# check that the required files are in the proper places
--if make check; then
-- :
--else
-- make all
--fi
-+WORKDIR=`mktemp -d ${TMPDIR:-/tmp}/unixbenchXXXXXX`
-+cd $WORKDIR
-+
-+trap "rm -rf $WORKDIR; exit" EXIT INT
-
-+UNIXBENCHDIR="/usr/lib/unixbench"
-
--# establish full paths to directories
--_WD=`pwd`
--HOMEDIR=${HOMEDIR-.}
--cd $HOMEDIR
--HOMEDIR=`pwd`
--cd $_WD
--
--BINDIR=${BINDIR-${HOMEDIR}/pgms}
--cd $BINDIR
--BINDIR=`pwd`
--cd $_WD
-+BINDIR=${UNIXBENCHDIR}
- # let's extend the path to this directory
- PATH="${PATH}:${BINDIR}"
-
--SCRPDIR=${SCRPDIR-${HOMEDIR}/pgms}
--cd $SCRPDIR
--SCRPDIR=`pwd`
--cd $_WD
--
--TMPDIR=${HOMEDIR}/tmp
--cd $TMPDIR
--TMPDIR=`pwd`
--cd $_WD
--
--RESULTDIR=${RESULTDIR-${HOMEDIR}/results}
--cd $RESULTDIR
--RESULTDIR=`pwd`
--cd $_WD
-+SCRPDIR=${UNIXBENCHDIR}
-+
-+mkdir ${WORKDIR}/tmp
-+MYTMPDIR=${WORKDIR}/tmp
-+
-+mkdir ${WORKDIR}/results
-+RESULTDIR=${WORKDIR}/results
-
- TIMEACCUM=${TIMEACCUM-${RESULTDIR}/times}
-
--TESTDIR=${TESTDIR-${HOMEDIR}/testdir}
--cd $TESTDIR
--TESTDIR=`pwd`
--cd $_WD
-+mkdir ${WORKDIR}/testdir
-+TESTDIR=${WORKDIR}/testdir
-+
-+export WORKDIR BINDIR MYTMPDIR RESULTDIR PATH TESTDIR TIMEACCUM
-
--export BINDIR TMPDIR RESULTDIR PATH TESTDIR TIMEACCUM
- #
- cat ${BINDIR}/unixbench.logo # display banner
- rm -f ${TIMEACCUM} # clean out old time accumulation file
--echo "kill -9 $$" > ${TMPDIR}/kill_run ; chmod u+x ${TMPDIR}/kill_run
-+echo "kill -9 $$" > ${MYTMPDIR}/kill_run ; chmod u+x ${MYTMPDIR}/kill_run
- #
- arithmetic="arithoh short int long float double whetstone-double"
- oldsystem="execl fstime fsbuffer fsdisk pipe context1 spawn syscall"
-@@ -216,7 +197,7 @@
- fi
-
- date=`date`
--TMPTIMES=${TMPDIR}/$$.tmp
-+TMPTIMES=${MYTMPDIR}/$$.tmp
- LOGFILE=${RESULTDIR}/log
- REPORTLOG=${RESULTDIR}/report
- #add old log to accumulated log or move it
-@@ -366,7 +347,7 @@
-
- C)
- logmsg="C Compiler Throughput"
-- prog="looper ${looper-60} ${CC} cctest.c"
-+ prog="looper ${looper-60} ${CC} ${SCRPDIR}/cctest.c"
- stdout=/dev/null
- repeat="$shortloop"
- cleanopt="-m $TMPTIMES"
-@@ -386,7 +367,7 @@
- dc)
- logmsg="Dc: sqrt(2) to 99 decimal places"
- prog="looper ${looper-30} dc"
-- stdin=dc.dat
-+ stdin=${SCRPDIR}/dc.dat
- stdout=/dev/null
- cleanopt="-m $TMPTIMES"
- ;;
-@@ -449,7 +430,7 @@
- if [ "$runoption" != 'D' ] # level 1
- then
- # regular Run - set logfile to go on signal
-- trap "${BINDIR}/cleanup.sh -L $LOGFILE -i $i $cleanopt -a; exit"
1 2 3 15
-+ trap "${BINDIR}/cleanup.sh -L $LOGFILE -i $i $cleanopt -a; rm -rf
$WORKDIR; exit" 1 2 3 15
- else
- trap "exit" 1 2 3 15
- fi #end level 1
--- unixbench-4.1.0/pgms/tst.sh.orig Mon Nov 27 18:07:03 1995
+++ unixbench-4.1.0/pgms/tst.sh Wed Oct 24 11:53:23 2001
@@ -14,7 +14,7 @@
@@ -117,7 +5,25 @@
###############################################################################
ID="@(#)tst.sh:3.4 -- 5/15/91 19:30:24";
-sort >sort.$$ <sort.src
-+sort >sort.$$ <${SCRPDIR}/sort.src
- od sort.$$ | sort -n +1 > od.$$
++sort >sort.$$ <${UB_BINDIR}/sort.src
+ od sort.$$ | sort -n -k 1 > od.$$
grep the sort.$$ | tee grep.$$ | wc > wc.$$
rm sort.$$ grep.$$ od.$$ wc.$$
+--- UnixBench/Run.orig 2012-06-05 14:41:53.016735725 +0200
++++ UnixBench/Run 2012-06-05 14:42:19.356633000 +0200
+@@ -784,15 +784,6 @@
+ # Set the language.
+ $ENV{'LANG'} = $language;
+
+- # Check that the required files are in the proper places.
+- system("make check");
+- if ($? != 0) {
+- system("make all");
+- if ($? != 0) {
+- abortRun("\"make all\" failed");
+- }
+- }
+-
+ # Create a script to kill this run.
+ system("echo \"kill -9 $$\" > \"${TMPDIR}/kill_run\"");
+ chmod(0755, $TMPDIR . "/kill_run");
================================================================
Index: packages/unixbench/unixbench.spec
diff -u packages/unixbench/unixbench.spec:1.16
packages/unixbench/unixbench.spec:1.17
--- packages/unixbench/unixbench.spec:1.16 Mon Jun 4 20:18:01 2012
+++ packages/unixbench/unixbench.spec Tue Jun 5 18:20:45 2012
@@ -4,13 +4,13 @@
Summary(pl.UTF-8): Unix Bench
Name: unixbench
Version: 5.1.3
-Release: 0.1
+Release: 0.9
License: unknown ("for usage of Linux community")
Group: Applications/System
Source0:
http://byte-unixbench.googlecode.com/files/%{relname}%{version}.tgz
# Source0-md5: 21edc4a9e41ad1f9b0297d7b6d45c99a
+Source1: unixbench.sh
Patch0: %{name}-dirs.patch
-Patch1: %{name}-lib64.patch
URL: http://code.google.com/p/byte-unixbench/
Requires: bc
Requires: ed
@@ -34,11 +34,10 @@
Unix Bench, bazowany na Unix Benchmark z Byte Magazine.
%prep
-%setup -q
+%setup -q -n %{relname}
+install %{SOURCE1} unixbench.sh
%patch0 -p1
-%if "%{_lib}" == "lib64"
-%patch1 -p1
-%endif
+%{__sed} -i "/export.UB_BINDIR/s@=.*@=%{_libdir}/unixbench@" unixbench.sh
%build
rm -f pgms/select
@@ -51,7 +50,8 @@
install pgms/* $RPM_BUILD_ROOT%{_libdir}/unixbench
install testdir/* $RPM_BUILD_ROOT%{_libdir}/unixbench
-install Run $RPM_BUILD_ROOT%{_bindir}/unixbench
+install Run $RPM_BUILD_ROOT%{_libdir}/unixbench
+install unixbench.sh $RPM_BUILD_ROOT%{_bindir}/unixbench
%clean
rm -rf $RPM_BUILD_ROOT
@@ -64,7 +64,8 @@
%attr(755,root,root) %{_libdir}/unixbench/[ae-hl-rtw]*
%attr(755,root,root) %{_libdir}/unixbench/c[lo]*
%attr(755,root,root) %{_libdir}/unixbench/d[ho]*
-%attr(755,root,root) %{_libdir}/unixbench/index.sh
+%attr(755,root,root) %{_libdir}/unixbench/int
+%attr(755,root,root) %{_libdir}/unixbench/Run
%attr(755,root,root) %{_libdir}/unixbench/s[ehpy]*
%{_libdir}/unixbench/cctest.c
%{_libdir}/unixbench/dc.dat
@@ -78,6 +79,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2012/06/05 16:20:45 sls
+- removed lib64.patch
+- dirs.patch updated for ver. 5.1.3
+- added unixbench.sh wrapper
+- rel. 0.9 (seems OK on i686)
+
Revision 1.16 2012/06/04 18:18:01 sls
- ver. 5.1.3 (NFY)
- updated URL
================================================================
Index: packages/unixbench/unixbench.sh
diff -u /dev/null packages/unixbench/unixbench.sh:1.1
--- /dev/null Tue Jun 5 18:20:51 2012
+++ packages/unixbench/unixbench.sh Tue Jun 5 18:20:45 2012
@@ -0,0 +1,8 @@
+#!/bin/sh
+WORKDIR=`mktemp -d ${TMPDIR:-/tmp}/unixbenchXXXXXX`
+export UB_BINDIR=/usr/lib/unixbench
+export UB_TMPDIR=$WORKDIR
+export UB_RESULTDIR=$WORKDIR
+export UB_TESTDIR=$WORKDIR
+cp $UB_BINDIR/sort.src $UB_TESTDIR
+$UB_BINDIR/Run $@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/unixbench/unixbench-dirs.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/unixbench/unixbench.spec?r1=1.16&r2=1.17
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
