[freecol] New upstream release 0.11.0 (#1154287)
Hans de Goede
jwrdegoede at fedoraproject.org
Thu Oct 23 07:57:19 UTC 2014
commit e9ab4c030a9e3930b305ddc364d93167dd548c48
Author: Hans de Goede <hdegoede at redhat.com>
Date: Thu Oct 23 09:57:12 2014 +0200
New upstream release 0.11.0 (#1154287)
.gitignore | 1 +
...nd-Java-crash-when-stopping-opening-video.patch | 83 --------------------
freecol-fix-makeindex-invocation.patch | 12 ++--
freecol-no-classpath-in-MF.patch | 27 ++++---
freecol-source-encoding.patch | 11 +++
freecol.sh | 2 +-
freecol.spec | 17 +++--
sources | 2 +-
8 files changed, 47 insertions(+), 108 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96acd89..656d79b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ freecol-0.8.3-src-clean.tar.gz
/freecol-0.10.3-src.zip
/freecol-0.10.5-src.zip
/freecol-0.10.7-src.zip
+/freecol-0.11.0-src.zip
diff --git a/freecol-fix-makeindex-invocation.patch b/freecol-fix-makeindex-invocation.patch
index 190bb36..cbec902 100644
--- a/freecol-fix-makeindex-invocation.patch
+++ b/freecol-fix-makeindex-invocation.patch
@@ -1,7 +1,7 @@
diff -up freecol/build.xml~ freecol/build.xml
---- freecol/build.xml~ 2013-07-30 23:13:41.114938349 +0200
-+++ freecol/build.xml 2013-07-30 22:57:39.854750981 +0200
-@@ -661,13 +661,13 @@
+--- freecol/build.xml~ 2014-10-22 20:15:04.000000000 +0200
++++ freecol/build.xml 2014-10-22 20:15:55.700734671 +0200
+@@ -679,13 +679,13 @@
description="Creates the printable user guide.">
<delete file="doc/FreeCol.ind" />
<exec executable="pdflatex" dir="doc" >
@@ -16,9 +16,9 @@ diff -up freecol/build.xml~ freecol/build.xml
- <arg file="doc/FreeCol.tex"/>
+ <arg value="FreeCol.tex"/>
</exec>
+ <property name="print.manual.is.up.to.date" value="true" />
</target>
-
-@@ -675,16 +675,16 @@
+@@ -694,16 +694,16 @@
description="Creates the online user guide.">
<delete file="doc/FreeCol.ind" />
<exec executable="htlatex" dir="doc" >
@@ -36,5 +36,5 @@ diff -up freecol/build.xml~ freecol/build.xml
- <arg file="doc/FreeCol.tex"/>
+ <arg value="FreeCol.tex"/>
</exec>
+ <property name="online.manual.is.up.to.date" value="true" />
</target>
-
diff --git a/freecol-no-classpath-in-MF.patch b/freecol-no-classpath-in-MF.patch
index c187ceb..b8f0a79 100644
--- a/freecol-no-classpath-in-MF.patch
+++ b/freecol-no-classpath-in-MF.patch
@@ -1,11 +1,18 @@
diff -up freecol/build.xml~ freecol/build.xml
---- freecol/build.xml~ 2013-01-07 20:43:00.000000000 +0100
-+++ freecol/build.xml 2013-07-30 21:01:23.251461525 +0200
-@@ -163,7 +163,6 @@
- <manifest file="${basedir}/src/MANIFEST.MF">
- <attribute name="Created-By" value="FreeCol Team"/>
- <attribute name="Main-Class" value="net.sf.freecol.FreeCol"/>
-- <attribute name="Class-Path" value="${stax.jar} ${woodstox.jar} jars/jogg-0.0.7.jar jars/jorbis-0.0.15.jar jars/tritonus_share.jar jars/vorbisspi1.0.3.jar ${miglayout.jar} ${cli.jar} ${cortado.jar}"/>
- <attribute name="Product-Name" value="FreeCol"/>
- <attribute name="Package-Title" value="FreeCol"/>
- <attribute name="Package-Version" value="${svn.Revision}"/>
+--- freecol/build.xml~ 2014-10-22 20:20:50.000000000 +0200
++++ freecol/build.xml 2014-10-22 20:23:13.800029335 +0200
+@@ -161,14 +161,9 @@
+
+ <target name="manifest" depends="git-revision"
+ description="Creates the Manifest file.">
+- <manifestclasspath property="jar.classpath"
+- jarfile="Freecol.jar">
+- <classpath refid="libraries.classpath" />
+- </manifestclasspath>
+ <manifest file="${basedir}/src/MANIFEST.MF">
+ <attribute name="Created-By" value="FreeCol Team"/>
+ <attribute name="Main-Class" value="net.sf.freecol.FreeCol"/>
+- <attribute name="Class-Path" value="${jar.classpath}"/>
+ <attribute name="Product-Name" value="FreeCol"/>
+ <attribute name="Package-Title" value="FreeCol"/>
+ <attribute name="Package-Version" value="${FreeCol.Revision}"/>
diff --git a/freecol-source-encoding.patch b/freecol-source-encoding.patch
new file mode 100644
index 0000000..f86b9e3
--- /dev/null
+++ b/freecol-source-encoding.patch
@@ -0,0 +1,11 @@
+diff -up freecol/build.xml~ freecol/build.xml
+--- freecol/build.xml~ 2014-10-22 20:19:45.000000000 +0200
++++ freecol/build.xml 2014-10-22 20:19:55.891317238 +0200
+@@ -98,6 +98,7 @@
+ <mkdir dir="${freecol.build.dir}"/>
+ <javac srcdir="${freecol.src.dir}"
+ destdir="${freecol.build.dir}"
++ encoding="utf8"
+ classpathref="freecol.build.classpath"
+ debug="on"
+ optimize="on"
diff --git a/freecol.sh b/freecol.sh
index 21125e1..be0caa3 100644
--- a/freecol.sh
+++ b/freecol.sh
@@ -12,7 +12,7 @@ set_javacmd
check_java_env
set_jvm_dirs
-CLASSPATH=`build-classpath freecol commons-cli cortado jogg jorbis miglayout`
+CLASSPATH=`build-classpath freecol commons-cli cortado jogg jorbis miglayout-core miglayout-swing`
MAIN_CLASS="net.sf.freecol.FreeCol"
set_options "-Xmx512M -Xincgc -Dsun.java2d.pmoffscreen=false"
diff --git a/freecol.spec b/freecol.spec
index 5ad844e..1ff0c7f 100644
--- a/freecol.spec
+++ b/freecol.spec
@@ -1,13 +1,13 @@
# Copyright (c) 2007 oc2pus <toni at links2linux.de>
-# Copyright (c) 2007-2010 Hans de Goede <hdegoede at redhat.com>
+# Copyright (c) 2007-2014 Hans de Goede <hdegoede at redhat.com>
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments to us at the above email addresses
Name: freecol
-Version: 0.10.7
-Release: 5%{?dist}
+Version: 0.11.0
+Release: 1%{?dist}
Summary: Turn-based multi-player strategy game
Group: Amusements/Games
License: GPL+
@@ -20,11 +20,10 @@ Source4: %{name}-imperator.metainfo.xml
Patch0: freecol-no-classpath-in-MF.patch
# texlive makeindex disallows absolute paths, and file= gets turned into one
Patch1: freecol-fix-makeindex-invocation.patch
-# patch from upstream git
-Patch2: 0001-Work-around-Java-crash-when-stopping-opening-video.patch
+Patch2: freecol-source-encoding.patch
BuildRequires: ant xml-commons-apis xml-commons-resolver
BuildRequires: tetex-tex4ht desktop-file-utils fontpackages-devel
-BuildRequires: apache-commons-cli cortado jorbis miglayout
+BuildRequires: apache-commons-cli cortado jorbis miglayout >= 4.2
BuildRequires: tex(latex)
# Doesn't run with gcj, so better build it with icedtea/openjdk too
BuildRequires: java-devel >= 1:1.6.0
@@ -81,7 +80,8 @@ ln -s %{_javadir}/commons-cli.jar jars/commons-cli-1.1.jar
ln -s %{_javadir}/cortado.jar jars/cortado-0.6.0.jar
ln -s %{_javadir}/jogg.jar jars/jogg-0.0.7.jar
ln -s %{_javadir}/jorbis.jar jars/jorbis-0.0.15.jar
-ln -s %{_javadir}/miglayout.jar jars/miglayout-4.0-swing.jar
+ln -s %{_javadir}/miglayout-core.jar jars/miglayout-core-4.2.jar
+ln -s %{_javadir}/miglayout-swing.jar jars/miglayout-swing-4.2.jar
%build
@@ -166,6 +166,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Wed Oct 22 2014 Hans de Goede <hdegoede at redhat.com> - 0.11.0-1
+- New upstream release 0.11.0 (#1154287)
+
* Fri Oct 17 2014 Richard Hughes <richard at hughsie.com> - 0.10.7-5
- Add a MetaInfo file for the software center; this is a font we want to show.
diff --git a/sources b/sources
index 6cb48b3..602c6d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ec18d691807d682cea3c2f85e47ae03 freecol-0.10.7-src.zip
+c57397d2add345396f3a42192798ddeb freecol-0.11.0-src.zip
More information about the scm-commits
mailing list