rpms/freecol/F-10 freecol-no-classpath-in-MF.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 freecol.sh, 1.2, 1.3 freecol.spec, 1.6, 1.7 sources, 1.4, 1.5
Hans de Goede
jwrdegoede at fedoraproject.org
Thu Feb 26 19:08:28 UTC 2009
Author: jwrdegoede
Update of /cvs/extras/rpms/freecol/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15677
Modified Files:
.cvsignore freecol.sh freecol.spec sources
Added Files:
freecol-no-classpath-in-MF.patch
Log Message:
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
freecol-no-classpath-in-MF.patch:
--- NEW FILE freecol-no-classpath-in-MF.patch ---
diff -up freecol/build.xml~ freecol/build.xml
--- freecol/build.xml~ 2009-02-21 12:06:46.000000000 +0100
+++ freecol/build.xml 2009-02-22 11:51:40.000000000 +0100
@@ -137,7 +137,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/higlayout.jar 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"/>
<attribute name="Revision" value="${svn.Revision}"/>
</manifest>
</target>
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freecol/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 16 Jun 2008 20:16:42 -0000 1.4
+++ .cvsignore 26 Feb 2009 19:07:58 -0000 1.5
@@ -1 +1 @@
-freecol-0.7.4-src.tar.gz
+freecol-0.8.1-src-clean.tar.gz
Index: freecol.sh
===================================================================
RCS file: /cvs/extras/rpms/freecol/F-10/freecol.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freecol.sh 14 Mar 2008 12:17:06 -0000 1.2
+++ freecol.sh 26 Feb 2009 19:07:58 -0000 1.3
@@ -16,10 +16,4 @@
MAIN_CLASS="net.sf.freecol.FreeCol"
set_options "-Xmx256M"
-# so that FreeCol.log doesn't get dropped in the cwd
-# 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/F-10/freecol.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freecol.spec 11 Sep 2008 22:31:39 -0000 1.6
+++ freecol.spec 26 Feb 2009 19:07:58 -0000 1.7
@@ -6,29 +6,30 @@
# Please submit bugfixes or comments to us at the above email addresses
Name: freecol
-Version: 0.7.4
+Version: 0.8.1
Release: 2%{?dist}
-Summary: The FreeCol multi-player strategy game
+Summary: Turn-based multi-player strategy game
Group: Amusements/Games
License: GPL+
URL: http://www.freecol.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
+# This is http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
+# With the unclearly licensed Plakat-Fraktur.ttf font removed
+Source0: %{name}-%{version}-src-clean.tar.gz
Source1: %{name}.sh
Source2: %{name}.desktop
+Patch0: freecol-no-classpath-in-MF.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant ant-nodeps xml-commons-apis xml-commons-resolver tetex-tex4ht
-BuildRequires: higlayout ImageMagick desktop-file-utils
-# needed by netpbm-tools, which is required by latex2html
-BuildRequires: xorg-x11-server-utils
+BuildRequires: higlayout ImageMagick desktop-file-utils fontpackages-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.6.0-openjdk jpackage-utils hicolor-icon-theme higlayout
+Requires: %{name}-shadowedblack-fonts %{name}-imperator-fonts
%description
FreeCol is a turn-based, multi-player, X based strategy game. FreeCol
-is generally comparable to, and has compatible rules with, the
-Colonization(R) game by Microprose(R).
+has compatible rules with the Colonization game.
%package manual
@@ -39,9 +40,32 @@
User Documentation for freecol.
+%package shadowedblack-fonts
+Summary: Gothic font with drop shadows
+Group: User Interface/X
+Requires: fontpackages-filesystem
+
+%description shadowedblack-fonts
+A gothic font with drop shadows originally created by Paul Lloyd in 2002,
+extended by the freecol project to include most accented latin characters.
+
+
+%package imperator-fonts
+Summary: Gothic font
+Group: User Interface/X
+Requires: fontpackages-filesystem
+
+%description imperator-fonts
+A gothic font originally created by Paul Lloyd in 2002, extended by the freecol
+project to include most accented latin characters.
+
+
%prep
%setup -q -n %{name}
-sed -i '/Class-Path:/d' src/MANIFEST.MF
+%patch0 -p1
+sed -i 's/Plakat-Fraktur/ShadowedBlack/g' \
+ src/net/sf/freecol/client/gui/i18n/FreeColMessages_*.properties \
+ data/strings/FreeColMessages_*.properties
# build against the system version of higlayout and StAX
rm jars/*
ln -s %{_javadir}/higlayout.jar jars
@@ -68,7 +92,16 @@
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
cp -a data $RPM_BUILD_ROOT%{_datadir}/%{name}
-(cd $RPM_BUILD_ROOT%{_datadir}/%{name}/data/audio && ln -s sfx music)
+
+mkdir -p $RPM_BUILD_ROOT%{_fontdir}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/ShadowedBlack.ttf \
+ $RPM_BUILD_ROOT%{_fontdir}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/data/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 \
@@ -116,8 +149,34 @@
%defattr(-,root,root,-)
%doc doc/FreeCol.pdf doc/FreeCol.html doc/FreeCol.css doc/images
+%_font_pkg -n shadowedblack ShadowedBlack.ttf
+%doc data/fonts/README
+%dir %{_fontdir}
+
+%_font_pkg -n imperator Imperator.ttf
+%doc data/fonts/README
+%dir %{_fontdir}
%changelog
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb 22 2009 Hans de Goede <hdegoede at redhat.com> 0.8.1-1
+- New upstream release 0.8.1
+
+* Thu Jan 15 2009 Hans de Goede <hdegoede at redhat.com> 0.8.0-2
+- Update description for new trademark guidelines
+
+* Thu Jan 15 2009 Hans de Goede <hdegoede at redhat.com> 0.8.0-1
+- New upstream release 0.8.0
+
+* Sat Dec 27 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.4-4
+- Drop unclearly licensed Plakat-Fraktur font (and stop using it)
+- Put ShadowedBlack font in its own shadowedblack-fonts subpackage (rh 477388)
+
+* Mon Nov 24 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.4-3
+- Fixup Summary
+
* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.7.4-2
- use tetex-tex4ht instead of latex2html
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freecol/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 16 Jun 2008 20:16:42 -0000 1.4
+++ sources 26 Feb 2009 19:07:58 -0000 1.5
@@ -1 +1 @@
-a0f176832f7bc9afe16c920bbfe623ec freecol-0.7.4-src.tar.gz
+6fd533d146c7a4ba7ae3ed9849939445 freecol-0.8.1-src-clean.tar.gz
More information about the fedora-extras-commits
mailing list