rpms/freecol/devel .cvsignore, 1.4, 1.5 freecol.spec, 1.7, 1.8 sources, 1.4, 1.5

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/freecol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7218

Modified Files:
	.cvsignore freecol.spec sources 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/.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	27 Dec 2008 13:40:09 -0000	1.5
@@ -1 +1 @@
-freecol-0.7.4-src.tar.gz
+freecol-0.7.4-src-clean.tar.gz


Index: freecol.spec
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/freecol.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freecol.spec	24 Nov 2008 10:54:34 -0000	1.7
+++ freecol.spec	27 Dec 2008 13:40:09 -0000	1.8
@@ -5,25 +5,30 @@
 #
 # Please submit bugfixes or comments to us at the above email addresses
 
+%define fontname shadowedblack
+
 Name:           freecol
 Version:        0.7.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 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
 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
+BuildRequires:  higlayout ImageMagick desktop-file-utils fontpackages-devel
 # needed by netpbm-tools, which is required by latex2html
 BuildRequires:  xorg-x11-server-utils
 # 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}-%{fontname}-fonts
 
 %description
 FreeCol is a turn-based, multi-player, X based strategy game. FreeCol
@@ -39,9 +44,22 @@
 User Documentation for freecol.
 
 
+%package %{fontname}-fonts
+Summary:        Gothic font with drop shadows
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+
+%description %{fontname}-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.
+
+
 %prep
 %setup -q -n %{name}
 sed -i '/Class-Path:/d' src/MANIFEST.MF
+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
@@ -70,6 +88,12 @@
 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}
+ln -s ../../../fonts/shadowedblack/ShadowedBlack.ttf \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/ShadowedBlack.ttf
+
 convert packaging/icons/freecol.ico %{name}.png
 install -m 644 %{name}-0.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
@@ -117,7 +141,17 @@
 %doc doc/FreeCol.pdf doc/FreeCol.html doc/FreeCol.css doc/images
 
 
+%_font_pkg -n %{fontname}-fonts ShadowedBlack.ttf
+
+%doc data/fonts/README
+%dir %{_fontdir}
+
+
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/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	27 Dec 2008 13:40:09 -0000	1.5
@@ -1 +1 @@
-a0f176832f7bc9afe16c920bbfe623ec  freecol-0.7.4-src.tar.gz
+f0ea11a76d772947e72debc8f25d8b67  freecol-0.7.4-src-clean.tar.gz