rpms/bolzplatz2006/devel bolzplatz2006-settings.sh, 1.1, 1.2 bolzplatz2006.sh, 1.1, 1.2 bolzplatz2006.spec, 1.2, 1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/bolzplatz2006/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13927

Modified Files:
	bolzplatz2006-settings.sh bolzplatz2006.sh bolzplatz2006.spec 
Log Message:
* Fri Mar 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.3-5
- Adapt launch script and (Build)Requires for icedtea -> openjdk rename
- Drop ExclusiveArch now that openjdk also is available for ppc



Index: bolzplatz2006-settings.sh
===================================================================
RCS file: /cvs/extras/rpms/bolzplatz2006/devel/bolzplatz2006-settings.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bolzplatz2006-settings.sh	30 Nov 2007 18:54:37 -0000	1.1
+++ bolzplatz2006-settings.sh	14 Mar 2008 15:53:04 -0000	1.2
@@ -29,6 +29,9 @@
 
 cd $myHomeDir
 
+# bolzplatz2006 does not work with gcj
+JAVA_HOME=/usr/lib/jvm/jre-openjdk
+
 # source the jpackage helpers
 VERBOSE=1
 . /usr/share/java-utils/java-functions


Index: bolzplatz2006.sh
===================================================================
RCS file: /cvs/extras/rpms/bolzplatz2006/devel/bolzplatz2006.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bolzplatz2006.sh	30 Nov 2007 18:54:37 -0000	1.1
+++ bolzplatz2006.sh	14 Mar 2008 15:53:04 -0000	1.2
@@ -29,6 +29,9 @@
 
 cd $myHomeDir
 
+# bolzplatz2006 does not work with gcj
+JAVA_HOME=/usr/lib/jvm/jre-openjdk
+
 # source the jpackage helpers
 VERBOSE=1
 . /usr/share/java-utils/java-functions


Index: bolzplatz2006.spec
===================================================================
RCS file: /cvs/extras/rpms/bolzplatz2006/devel/bolzplatz2006.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bolzplatz2006.spec	19 Feb 2008 08:07:49 -0000	1.2
+++ bolzplatz2006.spec	14 Mar 2008 15:53:04 -0000	1.3
@@ -7,7 +7,7 @@
 
 Name:           bolzplatz2006
 Version:        1.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Slam Soccer 2006 is a funny football game in 3D-comic-style
 Summary(fr):    Coup de Foot 2006 est un jeu comique en 3D
 Summary(de):    Bolzplatz 2006 ist ein spaßiges Fußballspiel im 3D-Comic-Stil
@@ -36,11 +36,10 @@
 BuildRequires:  libGLU-devel DevIL-devel libXxf86vm-devel libjpeg-devel
 BuildRequires:  libpng-devel libXext-devel libXrandr-devel libXcursor-devel
 BuildRequires:  libXt-devel libXrender-devel libvorbis-devel desktop-file-utils
-# Building ( & running) only works with icedtea (which is i386 and x86_64 only)
-BuildRequires:  java-1.7.0-icedtea-devel
-Requires:       sdljava dom4j vecmath1.2 java-1.7.0-icedtea jpackage-utils
+# Building ( & running) only works with openjdk
+BuildRequires:  java-1.6.0-openjdk-devel
+Requires:       sdljava dom4j vecmath1.2 java-1.6.0-openjdk jpackage-utils
 Requires:       hicolor-icon-theme autodownloader
-ExclusiveArch:  %{ix86} x86_64
 
 %description
 Slam Soccer 2006 is a funny football game in
@@ -128,14 +127,20 @@
 
 %build
 export RPM_OPT_FLAGS
-export JAVA_HOME=/usr/lib/jvm/java-icedtea
+export JAVA_HOME=/usr/lib/jvm/java-openjdk
 
+# special case ix86 as all of ix86 should look in the i386 jre lib subdir
 %ifarch %{ix86}
 export JAVA_ARCH=i386
 %endif
+# special case x86_64 as it should be mapped to amd64
 %ifarch x86_64
 export JAVA_ARCH=amd64
 %endif
+# All other archs
+if [ -z "$JAVA_ARCH" ]; then
+  export JAVA_ARCH=%{_arch}
+fi
 
 # jbolzplatz ships with copies of several libraries, as these are heavily
 # patched we use the bolzplatz versions and not the system ones
@@ -232,6 +237,10 @@
 
 
 %changelog
+* Fri Mar 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.3-5
+- Adapt launch script and (Build)Requires for icedtea -> openjdk rename
+- Drop ExclusiveArch now that openjdk also is available for ppc
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.3-4
 - Autorebuild for GCC 4.3