[freecol] New upstream release 0.10.7 (#889436)

Tue Jul 30 21:40:46 UTC 2013

commit 7786419f10fd135943faec2ed1615279ac6db351
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Jul 30 23:40:25 2013 +0200

    New upstream release 0.10.7 (#889436)
    
    - Temporary drop html version from -manual sub-package as it fails to
      build due to a texlive bug (#959696)

 .gitignore                             |    1 +
 freecol-fix-makeindex-invocation.patch |   40 ++++++++++++++++++++++++++++++++
 freecol-no-classpath-in-MF.patch       |   12 ++++----
 freecol.spec                           |   24 +++++++++++++-----
 sources                                |    2 +-
 5 files changed, 65 insertions(+), 14 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 0498a68..96acd89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ freecol-0.8.3-src-clean.tar.gz
 /freecol-0.9.5-src-clean.tar.gz
 /freecol-0.10.3-src.zip
 /freecol-0.10.5-src.zip
+/freecol-0.10.7-src.zip
diff --git a/freecol-fix-makeindex-invocation.patch b/freecol-fix-makeindex-invocation.patch
new file mode 100644
index 0000000..190bb36
--- /dev/null
+++ b/freecol-fix-makeindex-invocation.patch
@@ -0,0 +1,40 @@
+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 @@
+             description="Creates the printable user guide.">
+         <delete file="doc/FreeCol.ind" />
+         <exec executable="pdflatex" dir="doc" >
+-            <arg file="doc/FreeCol.tex"/>
++            <arg value="FreeCol.tex"/>
+         </exec>
+         <exec executable="makeindex" dir="doc" >
+-            <arg file="doc/FreeCol.idx"/>
++            <arg value="FreeCol.idx"/>
+         </exec>
+         <exec executable="pdflatex" dir="doc" >
+-            <arg file="doc/FreeCol.tex"/>
++            <arg value="FreeCol.tex"/>
+         </exec>
+     </target>
+ 
+@@ -675,16 +675,16 @@
+             description="Creates the online user guide.">
+         <delete file="doc/FreeCol.ind" />
+         <exec executable="htlatex" dir="doc" >
+-            <arg file="doc/FreeCol.tex"/>
++            <arg value="FreeCol.tex"/>
+         </exec>
+         <exec executable="tex" dir="doc">
+             <arg line="\def\filename{{FreeCol}{idx}{4dx}{ind}} \input  idxmake.4ht" />
+         </exec>
+         <exec executable="makeindex" dir="doc" >
+-            <arg file="doc/FreeCol.4dx"/>
++            <arg value="FreeCol.4dx"/>
+         </exec>
+         <exec executable="htlatex" dir="doc" >
+-            <arg file="doc/FreeCol.tex"/>
++            <arg value="FreeCol.tex"/>
+         </exec>
+     </target>
+ 
diff --git a/freecol-no-classpath-in-MF.patch b/freecol-no-classpath-in-MF.patch
index c333044..c187ceb 100644
--- a/freecol-no-classpath-in-MF.patch
+++ b/freecol-no-classpath-in-MF.patch
@@ -1,11 +1,11 @@
 diff -up freecol/build.xml~ freecol/build.xml
---- freecol/build.xml~	2011-09-27 14:34:32.000000000 +0200
-+++ freecol/build.xml	2011-10-16 17:23:39.127796002 +0200
-@@ -151,7 +151,6 @@
+--- 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="Revision" value="${svn.Revision}"/>
-       </manifest>
-     </target>
+         <attribute name="Product-Name" value="FreeCol"/>
+         <attribute name="Package-Title" value="FreeCol"/>
+         <attribute name="Package-Version" value="${svn.Revision}"/>
diff --git a/freecol.spec b/freecol.spec
index 0dbfc55..72ddff3 100644
--- a/freecol.spec
+++ b/freecol.spec
@@ -6,8 +6,8 @@
 # Please submit bugfixes or comments to us at the above email addresses
 
 Name:           freecol
-Version:        0.10.5
-Release:        5%{?dist}
+Version:        0.10.7
+Release:        1%{?dist}
 Summary:        Turn-based multi-player strategy game
 Group:          Amusements/Games
 License:        GPL+
@@ -16,6 +16,8 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.
 Source1:        %{name}.sh
 Source2:        %{name}.desktop
 Patch0:         freecol-no-classpath-in-MF.patch
+# texlive makeindex disallows absolute paths, and file= gets turned into one
+Patch1:         freecol-fix-makeindex-invocation.patch
 BuildRequires:  ant ant-nodeps xml-commons-apis xml-commons-resolver
 BuildRequires:  tetex-tex4ht desktop-file-utils fontpackages-devel
 BuildRequires:  apache-commons-cli cortado jorbis miglayout
@@ -67,6 +69,7 @@ project to include most accented latin characters.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 # freecol normally builds against copies shipped with the source. Remove these
 # and symlink to the system versions of these.
 rm jars/*
@@ -74,11 +77,11 @@ 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-3.7.3.1-swing.jar
+ln -s %{_javadir}/miglayout.jar jars/miglayout-4.0-swing.jar
 
 
 %build
-ant clean package manual
+ant clean package print-manual
 
 
 %install
@@ -109,6 +112,9 @@ install -p -m 644 packaging/common/freecol.svg \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
 
 desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+  --vendor fedora \
+%endif
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE2}
 
@@ -127,7 +133,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
-%defattr(-,root,root,-)
 %doc README COPYING
 %{_bindir}/%{name}
 %{_datadir}/%{name}
@@ -137,8 +142,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %files manual
-%defattr(-,root,root,-)
-%doc doc/FreeCol.pdf doc/FreeCol.html doc/FreeCol.css doc/images
+%doc doc/FreeCol.pdf
+# doc/FreeCol.html doc/FreeCol.css doc/images
 
 %_font_pkg -n shadowedblack ShadowedBlack.ttf
 %doc COPYING data/base/resources/fonts/README
@@ -150,6 +155,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Jul 30 2013 Hans de Goede <hdegoede at redhat.com> - 0.10.7-1
+- New upstream release 0.10.7 (#889436)
+- Temporary drop html version from -manual sub-package as it fails to
+  build due to a texlive bug (#959696)
+
 * Fri Mar 15 2013 Jon Ciesla <limburgher at gmail.com> - 0.10.5-5
 - Drop desktop vendor tag.
 
diff --git a/sources b/sources
index 878e1f0..6cb48b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96948b3e2d764dfd78ed7c3e456d972b  freecol-0.10.5-src.zip
+4ec18d691807d682cea3c2f85e47ae03  freecol-0.10.7-src.zip
