[phoronix-test-suite/f15] new upstream release

Fri Jan 6 21:29:20 UTC 2012

commit 8ea667cac8f61261097f47a3ac5e6314aa3fe1d0
Author: Markus Mayer <markus at thinking-guy.(none)>
Date:   Fri Jan 6 22:27:44 2012 +0100

    new upstream release

 .gitignore                                 |    1 +
 README.Fedora                              |   19 ++++---
 phoronix-test-suite.spec                   |   27 ++++----
 phoronix-test-suite_fix_desktop_file.patch |   29 ---------
 phoronix-test-suite_fix_install-sh.patch   |   51 ----------------
 phoronix-test-suite_fix_install.patch      |   91 ++++++++++++++++++++++++++++
 sources                                    |    2 +-
 7 files changed, 117 insertions(+), 103 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 8d34fb3..cdd6881 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 phoronix-test-suite-1.8.1.tar.gz
 /phoronix-test-suite-3.4.0.tar.gz
+/phoronix-test-suite-3.6.1.tar.gz
diff --git a/README.Fedora b/README.Fedora
index a6fd293..915d7a6 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -11,13 +11,16 @@ list-tests.
 
 Below is a list of known tests involving non-free software which PTS can run:
 
-etqw-demo          - ET: Quake Wars Demo                [VERIFIED,   NON-FREE]
-lightsmark         - Lightsmark                         [VERIFIED,   NON-FREE]
-super-pi           - Super PI                           [VERIFIED,   NON-FREE]
-unigine-sanctuary  - Unigine Sanctuary                  [VERIFIED,   NON-FREE]
-unigine-tropics    - Unigine Tropics                    [VERIFIED,   NON-FREE]
-ut2004-demo        - Unreal Tournament 2004 Demo        [VERIFIED,   NON-FREE]
-fgl-glxgears       - ATI fgl_glxgears                   [VERIFIED, RESTRICTED]
-
+ut2004-demo
+unigine-heaven
+unigine-sanctuary
+unigine-tropics
+quake4
+prey
+lightsmark
+etqw
+etqw-demo
+etqw-demo-iqc
+doom3
 
 phoronix-test-suite gui is not working due to missing php-gtk package.
diff --git a/phoronix-test-suite.spec b/phoronix-test-suite.spec
index adc6a73..d3428d7 100644
--- a/phoronix-test-suite.spec
+++ b/phoronix-test-suite.spec
@@ -1,6 +1,6 @@
 Name:       phoronix-test-suite
-Version:    3.4.0
-Release:    3%{?dist}
+Version:    3.6.1
+Release:    1%{?dist}
 Summary:    An Automated, Open-Source Testing Framework
 
 Group:      Applications/System
@@ -8,8 +8,7 @@ License:    GPLv3+
 URL:        http://%{name}.com/
 Source0:    http://www.%{name}.com/releases/%{name}-%{version}.tar.gz
 Source1:    README.Fedora
-Patch1:     %{name}_fix_install-sh.patch
-Patch2:     %{name}_fix_desktop_file.patch
+Patch1:     %{name}_fix_install.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
@@ -22,6 +21,10 @@ Requires: php-process
 Requires: php-xml
 Requires: hicolor-icon-theme
 
+#Packages required by tests. Use the following command to create this list:
+#cat phoronix-test-suite/pts-core/external-test-dependencies/xml/fedora-packages.xml phoronix-test-suite/pts-core/external-test-dependencies/xml/generic-packages.xml| grep PackageName |sed -e 's/^.*<PackageName>\([^<]*\)<\/PackageName>.*$/\1/g' |xargs yum info|grep Name|sed -e 's/.*:\s\([^\s]*\)/\1/g'|sort|uniq|xargs
+Requires: atlas-devel autoconf automake bison blas blas-devel boost-devel bzip2-devel cmake compat-libstdc++-33 curl flex freeglut-devel freeimage freeimage-devel gcc gcc-c++ gcc-gfortran glew-devel glibc-devel gmp-devel gtk2-devel imlib2-devel jam lapack-devel lib3ds-devel libaio-devel libcurl libpng-devel libtool libXv-devel libXvMC-devel make ncurses-devel numactl-devel openmpi openmpi-devel perl perl-SDL popt-devel portaudio-devel python scons SDL-devel SDL_gfx-devel SDL_image-devel SDL_net-devel SDL_sound-devel SDL_ttf-devel taglib-devel tcl tcsh xorg-x11-server-devel yasm zlib-devel
+
 %description
 The Phoronix Test Suite is the most comprehensive testing and benchmarking 
 platform available for the Linux operating system. This software is designed to 
@@ -36,7 +39,6 @@ users only for confirmation of actions.
 %prep
 %setup -q -n %{name}
 %patch1
-%patch2
 cp -p %{SOURCE1} documentation/
 
 %build
@@ -47,17 +49,9 @@ rm -rf %{buildroot}
 
 export DESTDIR=%{buildroot}
 ./install-sh %{_prefix}
-mkdir -p %{buildroot}/%{_datadir}/mime/packages/
-mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/64x64/mimetypes/
-cp -p pts-core/openbenchmarking.org/*.xml %{buildroot}/%{_datadir}/mime/packages/
-cp -p pts-core/static/images/openbenchmarking.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-launcher.desktop
 
-#remove duplicate files
-rm -r %{buildroot}/%{_datadir}/%{name}/pts-core/openbenchmarking.org/openbenchmarking-mime.xml
-rm -r %{buildroot}/%{_datadir}/%{name}/pts-core/static/bash_completion
-rm -r %{buildroot}/%{_datadir}/%{name}/pts-core/static/images/openbenchmarking.png
-rm -r %{buildroot}/%{_datadir}/%{name}/pts-core/static/images/%{name}.png
 
 %clean
 rm -rf %{buildroot}
@@ -91,6 +85,11 @@ fi
 %{_datadir}/mime/packages/*
 
 %changelog
+* Mon Jan 02 2012 Markus Mayer <lotharlutz at gmx.de> 3.6.1-1
+- new upstream release
+- install test dependencies
+- fix openbenchmark launcher
+
 * Tue Nov 01 2011 Markus Mayer <lotharlutz at gmx.de> 3.4.0-3
 - requires hicolor-icon-theme
 
diff --git a/phoronix-test-suite_fix_install.patch b/phoronix-test-suite_fix_install.patch
new file mode 100644
index 0000000..e182921
--- /dev/null
+++ b/phoronix-test-suite_fix_install.patch
@@ -0,0 +1,91 @@
+--- install-sh	2011-05-17 20:00:59.000000000 +0200
++++ install-sh	2012-01-03 19:35:40.566002195 +0100
+@@ -19,6 +19,8 @@
+ 
+ # Generic Phoronix Test Suite installer
+ 
++# To install into a chroot, set $DESTDIR to the corresponding directory.
++
+ if [ "X$1" = "X" ]
+ then
+ 	INSTALL_PREFIX="/usr"
+@@ -67,12 +69,18 @@ rm -rf $DESTDIR$INSTALL_PREFIX/share/doc
+ cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/share/man/man1/
+ cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/../etc/bash_completion.d/phoronix-test-suite
+ cp pts-core/static/images/phoronix-test-suite.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/48x48/apps/phoronix-test-suite.png
+-cp pts-core/static/images/openbenchmarking.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/64x64/apps/openbenchmarking.png
+ cp pts-core/static/phoronix-test-suite.desktop $DESTDIR$INSTALL_PREFIX/share/applications/
++cp pts-core/static/phoronix-test-suite-launcher.desktop $DESTDIR$INSTALL_PREFIX/share/applications/
+ 
+ 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/
+ rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/phoronix-test-suite.desktop
++rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/phoronix-test-suite-launcher.desktop
++rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/openbenchmarking.org/openbenchmarking-mime.xml
++rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/bash_completion
++rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/images/openbenchmarking.png
++rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/images/%phoronix-test-suite.png
++
+ 
+ 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
+@@ -80,9 +88,19 @@ chmod +x $DESTDIR$INSTALL_PREFIX/bin/pho
+ # sed 's:\$url = PTS_PATH . \"documentation\/index.html\";:\$url = \"'"$INSTALL_PREFIX"'\/share\/doc\/packages\/phoronix-test-suite\/index.html\";:g' pts-core/commands/gui_gtk.php > $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/commands/gui_gtk.php
+ 
+ # XDG MIME OpenBenchmarking support
+-xdg-mime install pts-core/openbenchmarking.org/openbenchmarking-mime.xml
+-xdg-mime default phoronix-test-suite.desktop application/x-openbenchmarking
+-xdg-icon-resource install --context mimetypes --size 64 pts-core/static/images/openbenchmarking.png application-x-openbenchmarking
++if [ "X$DESTDIR" = "X" ]
++then
++	#No chroot
++	xdg-mime install pts-core/openbenchmarking.org/openbenchmarking-mime.xml
++	xdg-icon-resource install --context mimetypes --size 64 pts-core/static/images/openbenchmarking.png application-x-openbenchmarking
++else
++	#chroot
++	mkdir -p $DESTDIR$INSTALL_PREFIX/share/mime/packages/
++	mkdir -p $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/64x64/mimetypes/
++	cp pts-core/openbenchmarking.org/openbenchmarking-mime.xml $DESTDIR$INSTALL_PREFIX/share/mime/packages/
++	cp pts-core/static/images/openbenchmarking.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png
++
++fi
+ 
+ echo -e "\nPhoronix Test Suite Installation Completed\n
+ Executable File: $INSTALL_PREFIX/bin/phoronix-test-suite
+@@ -91,6 +109,7 @@ Phoronix Test Suite Files: $INSTALL_PREF
+ 
+ if [ "X$DESTDIR" != "X" ]
+ then
+-	echo "Installed to chroot: $DESTDIR";
++	echo "Installed to chroot: $DESTDIR"
++	echo "Please update your desktop and mime-database manually"
+ fi
+ 
+--- pts-core/static/phoronix-test-suite.desktop	2011-06-16 16:36:15.000000000 +0200
++++ pts-core/static/phoronix-test-suite.desktop	2012-01-03 19:33:26.358001089 +0100
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+ Name=Phoronix Test Suite
+ GenericName=Phoronix Test Suite Benchmarking Utility
+-Comment=Phoronix Test Suite Benchmarking Utility
++Comment=An Automated, Open-Source Testing Framework
+ Comment[fr]=Outil pour étalonner les performances de votre ordinateur
+ Exec=phoronix-test-suite interactive
+ StartupNotify=true
+ Icon=phoronix-test-suite
+-Terminal=1
++Terminal=true
+ Type=Application
+-Encoding=UTF-8
+ Categories=System;Monitor;
+--- pts-core/static/phoronix-test-suite-launcher.desktop	1970-01-01 01:00:00.000000000 +0100
++++ pts-core/static/phoronix-test-suite-launcher.desktop	2012-01-03 19:33:15.017987363 +0100
+@@ -0,0 +1,8 @@
++[Desktop Entry]
++Name=Phoronix Test Suite Launcher
++Exec=phoronix-test-suite openbenchmarking-launcher %f
++NoDisplay=true
++StartupNotify=true
++MimeType=application/x-openbenchmarking;
++Terminal=true
++Type=Application
diff --git a/sources b/sources
index 5e021bc..fe2be12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f075538fbe45bb69b3e9d7bfef63948  phoronix-test-suite-3.4.0.tar.gz
+97ca808b8aa4f5a47d48d7d2e627959a  phoronix-test-suite-3.6.1.tar.gz
