From e54e633b3da765afa6e096cf9d1f467780e5f066 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Oct 17 2015 13:37:17 +0000 Subject: New upstream release 0.11.6 (#1272625) - Fix crash with commons-cli >= 1.3 (#1271823) --- diff --git a/.gitignore b/.gitignore index 914aa3d..a46583e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ freecol-0.8.3-src-clean.tar.gz /freecol-0.11.2-src.zip /freecol-0.11.3-src.zip /freecol-0.11.5-src.zip +/Imperator.ttf +/freecol-0.11.6-src.zip diff --git a/commons-cli-1.3.patch b/commons-cli-1.3.patch new file mode 100644 index 0000000..512bfb3 --- /dev/null +++ b/commons-cli-1.3.patch @@ -0,0 +1,13 @@ +diff -up freecol/src/net/sf/freecol/FreeCol.java.orig freecol/src/net/sf/freecol/FreeCol.java +--- freecol/src/net/sf/freecol/FreeCol.java.orig 2015-10-17 15:28:05.641962462 +0200 ++++ freecol/src/net/sf/freecol/FreeCol.java 2015-10-17 15:30:55.722110493 +0200 +@@ -426,8 +426,8 @@ public final class FreeCol { + private static void handleArgs(String[] args) { + Options options = new Options(); + final String help = Messages.message("cli.help"); +- final File dummy = new File("dummy"); + final String argDirectory = Messages.message("cli.arg.directory"); ++ final Class dummy = null; + + // Help options. + options.addOption(OptionBuilder.withLongOpt("usage") diff --git a/freecol.spec b/freecol.spec index b773ad9..b056886 100644 --- a/freecol.spec +++ b/freecol.spec @@ -1,12 +1,12 @@ # Copyright (c) 2007 oc2pus -# Copyright (c) 2007-2014 Hans de Goede +# Copyright (c) 2007-2015 Hans de Goede # 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.11.5 +Version: 0.11.6 Release: 1%{?dist} Summary: Turn-based multi-player strategy game Group: Amusements/Games @@ -17,23 +17,26 @@ Source1: %{name}.sh Source2: %{name}.desktop Source3: freecol.appdata.xml Source4: %{name}-imperator.metainfo.xml +# From freecol 0.11.5, upstream freecol is no longer using this, +# we keep it around for non freecol users +Source5: Imperator.ttf # manpage courtesy of Debian -Source5: %{name}.6 +Source6: %{name}.6 Patch0: freecol-no-classpath-in-MF.patch # texlive makeindex disallows absolute paths, and file= gets turned into one Patch1: freecol-fix-makeindex-invocation.patch Patch2: freecol-source-encoding.patch +# rhbz#1271823, patch from Debian, forward ported to 0.11.6 +Patch3: commons-cli-1.3.patch BuildRequires: ant xml-commons-apis xml-commons-resolver BuildRequires: tetex-tex4ht desktop-file-utils fontpackages-devel 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 +BuildRequires: java-devel >= 1:1.8.0 BuildArch: noarch -Requires: java >= 1:1.6.0 jpackage-utils hicolor-icon-theme +Requires: java >= 1:1.8.0 jpackage-utils hicolor-icon-theme Requires: apache-commons-cli cortado jorbis miglayout >= 4.2 -Requires: %{name}-shadowedblack-fonts %{name}-imperator-fonts -Requires: liberation-serif-fonts +Requires: %{name}-shadowedblack-fonts %description FreeCol is a turn-based, multi-player, X based strategy game. FreeCol @@ -76,13 +79,14 @@ project to include most accented latin characters. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # freecol normally builds against copies shipped with the source. Remove these # and symlink to the system versions of these. rm jars/* 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}/jogg.jar jars/jogg-0.0.17.jar +ln -s %{_javadir}/jorbis.jar jars/jorbis-0.0.17.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 @@ -99,39 +103,26 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps +mkdir -p $RPM_BUILD_ROOT%{_fontdir} install -p -m 644 FreeCol.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man6 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name} +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2} +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/appdata +install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/appdata +install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_fontdir} +install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man6 cp -a data $RPM_BUILD_ROOT%{_datadir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_fontdir} mv $RPM_BUILD_ROOT%{_datadir}/%{name}/data/base/resources/fonts/ShadowedBlack.ttf \ $RPM_BUILD_ROOT%{_fontdir} -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/data/base/resources/fonts/Imperator.ttf \ - $RPM_BUILD_ROOT%{_fontdir} ln -s ../../../../../fonts/freecol/ShadowedBlack.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/data/base/resources/fonts/ShadowedBlack.ttf -ln -s ../../../../../fonts/freecol/Imperator.ttf \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/data/base/resources/fonts/Imperator.ttf - -for i in LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf \ - LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf; do - rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/base/resources/fonts/$i - ln -s ../../../../../fonts/liberation/$i \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/data/base/resources/fonts/$i -done install -p -m 644 packaging/common/freecol.svg \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps -desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2} -install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/appdata - -# Add AppStream metadata -install -Dm 0644 -p %{SOURCE4} \ - %{buildroot}%{_datadir}/appdata/%{name}-imperator.metainfo.xml %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -170,6 +161,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Oct 17 2015 Hans de Goede - 0.11.6-1 +- New upstream release 0.11.6 (#1272625) +- Fix crash with commons-cli >= 1.3 (#1271823) + * Tue Aug 4 2015 Hans de Goede - 0.11.5-1 - New upstream release 0.11.5 (#1249256) diff --git a/sources b/sources index 94621b1..d07c54b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -dcdd32ed6b4299e80a179cbf28894055 freecol-0.11.5-src.zip +44937e2faa06d9cb5dc50d05568b529d Imperator.ttf +cd2ad41c4af5e6245421ac49abe4cde5 freecol-0.11.6-src.zip