[freecol] New upstream release 0.10.3 (#711737) upstream sources are now clean, use them directly instead of g
Hans de Goede
jwrdegoede at fedoraproject.org
Sun Oct 16 18:04:58 UTC 2011
commit 83f1cec496d3677da3b2d84e1832816a74b012b6
Author: Hans de Goede <hdegoede at redhat.com>
Date: Sun Oct 16 20:05:07 2011 +0200
New upstream release 0.10.3 (#711737)
upstream sources are now clean, use them directly instead of generating
a -clean.tar.gz file
vorbisspi is now packaged, use it instead of converting all the .ogg files
to .wav files
.gitignore | 1 +
freecol-disable-listener.patch | 42 ---------------
freecol-no-classpath-in-MF.patch | 8 ++--
freecol.sh | 2 +-
freecol.spec | 108 ++++++++++++++-----------------------
sources | 2 +-
6 files changed, 48 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eff2f3d..ccb2a48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
freecol-0.8.3-src-clean.tar.gz
/freecol-0.9.5-src-clean.tar.gz
+/freecol-0.10.3-src.zip
diff --git a/freecol-no-classpath-in-MF.patch b/freecol-no-classpath-in-MF.patch
index 8a17486..c333044 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~ 2010-10-04 08:50:15.000000000 +0200
-+++ freecol/build.xml 2010-11-03 16:08:44.080564004 +0100
-@@ -142,7 +142,6 @@
+--- 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 @@
<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="jars/jsr173_1.0_api.jar jars/wstx-lgpl-4.0pr1.jar jars/jogg-0.0.7.jar jars/jorbis-0.0.15.jar jars/tritonus_share.jar jars/vorbisspi1.0.3.jar jars/miglayout-3.7-swing.jar jars/commons-cli-1.1.jar jars/cortado-fc-1.0.jar"/>
+- <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>
diff --git a/freecol.sh b/freecol.sh
index 21125e1..791b8f4 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 vorbisspi tritonus/tritonus_share`
MAIN_CLASS="net.sf.freecol.FreeCol"
set_options "-Xmx512M -Xincgc -Dsun.java2d.pmoffscreen=false"
diff --git a/freecol.spec b/freecol.spec
index e4e8854..71ddf97 100644
--- a/freecol.spec
+++ b/freecol.spec
@@ -6,33 +6,25 @@
# Please submit bugfixes or comments to us at the above email addresses
Name: freecol
-Version: 0.9.5
-Release: 2%{?dist}
+Version: 0.10.3
+Release: 1%{?dist}
Summary: Turn-based multi-player strategy game
Group: Amusements/Games
License: GPL+
URL: http://www.freecol.org/
-# This is http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
-# With the following removed
-# - The unclearly licensed Plakat-Fraktur.ttf font
-# - Prebuild jars of various used java bits (although all FOSS licensed, Fedora
-# may ship a different version, so we need to remove these as we may not be
-# shipping the correct sources to satisfy the GPL).
-Source0: %{name}-%{version}-src-clean.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.zip
Source1: %{name}.sh
Source2: %{name}.desktop
Patch0: freecol-no-classpath-in-MF.patch
-# Patch taken from Debian, so that freecol will work with the stock cortado
-Patch1: freecol-disable-listener.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ant ant-nodeps xml-commons-apis xml-commons-resolver tetex-tex4ht
-BuildRequires: ImageMagick desktop-file-utils fontpackages-devel vorbis-tools
-BuildRequires: jakarta-commons-cli cortado jorbis miglayout
+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
# 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.6.0-openjdk jpackage-utils hicolor-icon-theme
-Requires: jakarta-commons-cli cortado jorbis miglayout
+Requires: apache-commons-cli cortado jorbis miglayout
+Requires: vorbisspi tritonus
Requires: %{name}-shadowedblack-fonts %{name}-imperator-fonts
%description
@@ -74,25 +66,14 @@ project to include most accented latin characters.
%prep
%setup -q -n %{name}
%patch0 -p1
-%patch1 -p1
-sed -i 's/Plakat-Fraktur/ShadowedBlack/g' \
- src/net/sf/freecol/client/gui/i18n/FreeColMessages_*.properties \
- data/strings/FreeColMessages_*.properties
-
-# freecol normally builds against copies shipped with the source, which we've
-# removed. Symlink to the system versions of these.
+# 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-fc-1.0.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-swing.jar
-
-# until vorbisspi gets packaged we cannot play back ogg files, convert to wav
-for i in data/audio/*/*.ogg; do
- wavname=$(echo "$i"|sed 's/.ogg/.wav/')
- oggdec "$i" -o "$wavname"
- rm "$i"
-done
+ln -s %{_javadir}/miglayout.jar jars/miglayout-3.7.3.1-swing.jar
%build
@@ -100,16 +81,12 @@ ant clean package manual
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
install -p -m 644 FreeCol.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install -p -m 644 packaging/debian/%{name}.6 $RPM_BUILD_ROOT%{_mandir}/man6
@@ -118,46 +95,35 @@ install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
cp -a data $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_fontdir}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/ShadowedBlack.ttf \
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/data/base/resources/fonts/ShadowedBlack.ttf \
$RPM_BUILD_ROOT%{_fontdir}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/Imperator.ttf \
+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/fonts/ShadowedBlack.ttf
-ln -s ../../../fonts/freecol/Imperator.ttf \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/Imperator.ttf
-
-convert packaging/icons/freecol.ico %{name}.png
-install -m 644 %{name}-0.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -m 644 %{name}-1.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -m 644 %{name}-2.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -m 644 %{name}-3.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+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
+
+install -p -m 644 packaging/common/freecol.svg \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%defattr(-,root,root,-)
@@ -167,21 +133,29 @@ fi
%{_javadir}/%{name}.jar
%{_mandir}/man6/%{name}.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%files manual
%defattr(-,root,root,-)
%doc doc/FreeCol.pdf doc/FreeCol.html doc/FreeCol.css doc/images
%_font_pkg -n shadowedblack ShadowedBlack.ttf
-%doc COPYING data/fonts/README
+%doc COPYING data/base/resources/fonts/README
%dir %{_fontdir}
%_font_pkg -n imperator Imperator.ttf
-%doc COPYING data/fonts/README
+%doc COPYING data/base/resources/fonts/README
%dir %{_fontdir}
+
%changelog
+* Sun Oct 16 2011 Hans de Goede <hdegoede at redhat.com> 0.10.3-1
+- New upstream release 0.10.3 (#711737)
+- upstream sources are now clean, use them directly instead of generating
+ a -clean.tar.gz file
+- vorbisspi is now packaged, use it instead of converting all the .ogg files
+ to .wav files
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index b404259..f312598 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39e6aa481bc8cf12368f488738dddd67 freecol-0.9.5-src-clean.tar.gz
+e98a1584b3430b1536640aaf6eb3c100 freecol-0.10.3-src.zip
More information about the scm-commits
mailing list