From f134349a3aa37803ad369573c339b29c1d66f01c Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 8 Jan 2009 13:30:19 +0100 Subject: * Thu Jan 08 2009 Hans Ulrich Niedermann - 1.4.2-2 - Fix tcsh location definition for Fedora - fix install script using DESTDIR --- phoronix-test-suite-1.4.2-destdir.patch | 61 +++++++++++++++++++++++++++++ phoronix-test-suite-1.4.2-fedora-tcsh.patch | 25 ++++++++++++ phoronix-test-suite.spec | 17 +++++--- 3 files changed, 97 insertions(+), 6 deletions(-) create mode 100644 phoronix-test-suite-1.4.2-destdir.patch create mode 100644 phoronix-test-suite-1.4.2-fedora-tcsh.patch diff --git a/phoronix-test-suite-1.4.2-destdir.patch b/phoronix-test-suite-1.4.2-destdir.patch new file mode 100644 index 0000000..cff44e3 --- /dev/null +++ b/phoronix-test-suite-1.4.2-destdir.patch @@ -0,0 +1,61 @@ +diff -ru phoronix-test-suite/install-sh phoronix-test-suite-destdir/install-sh +--- phoronix-test-suite/install-sh 2008-11-08 03:02:28.000000000 +0100 ++++ phoronix-test-suite-destdir/install-sh 2009-01-07 16:47:42.000000000 +0100 +@@ -37,37 +37,38 @@ + exit + fi + +-if [ ! -w $INSTALL_PREFIX ] ++mkdir -p $DESTDIR$INSTALL_PREFIX ++if [ ! -w $DESTDIR$INSTALL_PREFIX ] + then + echo "\nERROR: $INSTALL_PREFIX is not writable. Run this installer as root or specify a different directory prefix as the first argument sent to this script.\n" + exit + fi + +-rm -rf $INSTALL_PREFIX/share/phoronix-test-suite/ +-rm -rf $INSTALL_PREFIX/share/doc/phoronix-test-suite/ ++rm -rf $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ ++rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ + +-mkdir -p $INSTALL_PREFIX/bin/ +-mkdir -p $INSTALL_PREFIX/share/man/man1/ +-mkdir -p $INSTALL_PREFIX/share/phoronix-test-suite/ +-mkdir -p $INSTALL_PREFIX/share/doc/phoronix-test-suite/ +- +-cp CHANGE-LOG $INSTALL_PREFIX/share/doc/phoronix-test-suite/ +-cp COPYING $INSTALL_PREFIX/share/doc/phoronix-test-suite/ +-cp AUTHORS $INSTALL_PREFIX/share/doc/phoronix-test-suite/ ++mkdir -p $DESTDIR$INSTALL_PREFIX/bin/ ++mkdir -p $DESTDIR$INSTALL_PREFIX/share/man/man1/ ++mkdir -p $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ ++mkdir -p $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ ++ ++cp CHANGE-LOG $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ ++cp COPYING $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ ++cp AUTHORS $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ + + cd documentation/ +-cp -r * $INSTALL_PREFIX/share/doc/phoronix-test-suite/ ++cp -r * $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ + cd .. +-rm -rf $INSTALL_PREFIX/share/doc/phoronix-test-suite/man-pages/ ++rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/man-pages/ + +-cp documentation/man-pages/*.1 $INSTALL_PREFIX/share/man/man1/ ++cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/share/man/man1/ + +-cp -r pts/ $INSTALL_PREFIX/share/phoronix-test-suite/ +-rm -f $INSTALL_PREFIX/share/phoronix-test-suite/pts/etc/scripts/package-build-* +-cp -r pts-core/ $INSTALL_PREFIX/share/phoronix-test-suite/ ++cp -r pts/ $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ ++rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts/etc/scripts/package-build-* ++cp -r pts-core/ $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ + +-sed 's:PTS_DIR=`pwd`:PTS_DIR='"$INSTALL_PREFIX"'\/share\/phoronix-test-suite:g' phoronix-test-suite > $INSTALL_PREFIX/bin/phoronix-test-suite +-chmod +x $INSTALL_PREFIX/bin/phoronix-test-suite ++sed 's:PTS_DIR=`pwd`:PTS_DIR='"$INSTALL_PREFIX"'\/share\/phoronix-test-suite:g' phoronix-test-suite > $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite ++chmod +x $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite + + echo "\nPhoronix Test Suite Installation Completed\n + Executable File: $INSTALL_PREFIX/bin/phoronix-test-suite diff --git a/phoronix-test-suite-1.4.2-fedora-tcsh.patch b/phoronix-test-suite-1.4.2-fedora-tcsh.patch new file mode 100644 index 0000000..560ca7b --- /dev/null +++ b/phoronix-test-suite-1.4.2-fedora-tcsh.patch @@ -0,0 +1,25 @@ +From 1e34810553e04ea59d1ac8d21d4a500caed25fdd Mon Sep 17 00:00:00 2001 +From: Hans Ulrich Niedermann +Date: Thu, 8 Jan 2009 13:20:35 +0100 +Subject: [PATCH] Fix erroneous location of tcsh on Fedora + +--- + pts/distro-xml/fedora-packages.xml | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/pts/distro-xml/fedora-packages.xml b/pts/distro-xml/fedora-packages.xml +index 1b4331e..f224df6 100644 +--- a/pts/distro-xml/fedora-packages.xml ++++ b/pts/distro-xml/fedora-packages.xml +@@ -18,7 +18,7 @@ + + csh + tcsh +- /usr/bin/tcsh ++ /bin/tcsh + + + libpng-development +-- +1.6.0.3 + diff --git a/phoronix-test-suite.spec b/phoronix-test-suite.spec index f5ae62d..e2baa9d 100644 --- a/phoronix-test-suite.spec +++ b/phoronix-test-suite.spec @@ -1,6 +1,6 @@ Name: phoronix-test-suite Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Phoronix graphics card test suite Group: User Interface/X @@ -8,6 +8,8 @@ License: GPLv3+ URL: http://www.phoronix-test-suite.com/ # Redirected from http://www.phoronix-test-suite.com/download.php?file=%{name}-%{version} Source0: http://www.phoronix.net/downloads/phoronix-test-suite/releases/%{name}-%{version}.tar.gz +Patch1: phoronix-test-suite-1.4.2-destdir.patch +Patch2: phoronix-test-suite-1.4.2-fedora-tcsh-2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: @@ -23,18 +25,17 @@ Tests some graphics stuff (TBD). %prep %setup -q -n %{name} +%patch1 -p1 -b .destdir +%patch2 -p1 -b .fedora-tcsh %build -#configure -#make %{?_smp_mflags} %install rm -rf "$RPM_BUILD_ROOT" -#make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p "$RPM_BUILD_ROOT%{_prefix}" -./install-sh "$RPM_BUILD_ROOT%{_prefix}" +env DESTDIR="$RPM_BUILD_ROOT" ./install-sh "%{_prefix}" +rm -f "$RPM_BUILD_ROOT/usr/share/phoronix-test-suite/pts/distro-xml/fedora-packages.xml.fedora-tcsh" %clean @@ -509,5 +510,9 @@ rm -rf "$RPM_BUILD_ROOT" %{_datadir}/%{name}/pts/test-suites/xrender.xml %changelog +* Thu Jan 8 2009 Hans Ulrich Niedermann - 1.4.2-2 +- Fix tcsh location definition for Fedora +- fix install script using DESTDIR + * Wed Jan 7 2009 Hans Ulrich Niedermann - 1.4.2-1 - Initial rpm package -- cgit