rpms/freecol/devel freecol.sh,1.1,1.2 freecol.spec,1.3,1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	freecol.sh freecol.spec 
Log Message:
* Fri Mar 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.3-2
- Adapt launch script and (Build)Requires for icedtea -> openjdk rename



Index: freecol.sh
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/freecol.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freecol.sh	4 Oct 2007 09:46:41 -0000	1.1
+++ freecol.sh	14 Mar 2008 12:17:06 -0000	1.2
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # freecol does not work with gcj
-JAVA_HOME=/usr/lib/jvm/java-icedtea
+JAVA_HOME=/usr/lib/jvm/jre-openjdk
 
 # source the jpackage helpers
 VERBOSE=1
@@ -17,7 +17,9 @@
 set_options "-Xmx256M"
 
 # so that FreeCol.log doesn't get dropped in the cwd
-mkdir -p ~/.freecol
-cd ~/.freecol
+# I would rather use ~/.freecol, but freecol itself uses ~/freecol for
+# savegames so we use that here too
+mkdir -p ~/freecol
+cd ~/freecol
 
 run --freecol-data /usr/share/freecol/data "$@"


Index: freecol.spec
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/freecol.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- freecol.spec	9 Feb 2008 14:10:23 -0000	1.3
+++ freecol.spec	14 Mar 2008 12:17:06 -0000	1.4
@@ -7,7 +7,7 @@
 
 Name:           freecol
 Version:        0.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The FreeCol multi-player strategy game
 Group:          Amusements/Games
 License:        GPL+
@@ -20,11 +20,10 @@
 BuildRequires:  higlayout ImageMagick desktop-file-utils
 # needed by netpbm-tools, which is required by latex2html
 BuildRequires:  xorg-x11-server-utils
-# Doesn't run with gcj, so better build it with icedtea too
-BuildRequires:  java-1.7.0-icedtea-devel
+# Doesn't run with gcj, so better build it with icedtea/openjdk too
+BuildRequires:  java-1.6.0-openjdk-devel
 BuildArch:      noarch
-Requires:       java-1.7.0-icedtea jpackage-utils hicolor-icon-theme
-Requires:       higlayout
+Requires:       java-1.6.0-openjdk jpackage-utils hicolor-icon-theme higlayout
 
 %description
 FreeCol is a turn-based, multi-player, X based strategy game. FreeCol
@@ -120,6 +119,9 @@
 
 
 %changelog
+* Fri Mar 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.3-2
+- Adapt launch script and (Build)Requires for icedtea -> openjdk rename
+
 * Sat Feb  9 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.3-1
 - New upstream release 0.7.3
 - Drop ExcludeArch ppc ppc64 now that icedtea is available for ppc too