rpms/freecol/devel freecol-no-classpath-in-MF.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 freecol.spec, 1.11, 1.12 sources, 1.6, 1.7

[Hans de Goede]

Author: jwrdegoede

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

Modified Files:
	.cvsignore freecol.spec sources 
Added Files:
	freecol-no-classpath-in-MF.patch 
Log Message:
* Sun Feb 22 2009 Hans de Goede <hdegoede at redhat.com> 0.8.1-1
- New upstream release 0.8.1


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/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Jan 2009 10:03:14 -0000	1.6
+++ .cvsignore	22 Feb 2009 11:26:21 -0000	1.7
@@ -1 +1 @@
-freecol-0.8.0-src-clean.tar.gz
+freecol-0.8.1-src-clean.tar.gz


Index: freecol.spec
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/freecol.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- freecol.spec	30 Jan 2009 08:35:31 -0000	1.11
+++ freecol.spec	22 Feb 2009 11:26:23 -0000	1.12
@@ -5,11 +5,9 @@
 #
 # Please submit bugfixes or comments to us at the above email addresses
 
-%define fontname shadowedblack
-
 Name:           freecol
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        Turn-based multi-player strategy game
 Group:          Amusements/Games
 License:        GPL+
@@ -19,6 +17,7 @@
 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 fontpackages-devel
@@ -26,7 +25,7 @@
 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
+Requires:       %{name}-shadowedblack-fonts %{name}-imperator-fonts
 
 %description
 FreeCol is a turn-based, multi-player, X based strategy game. FreeCol
@@ -41,19 +40,29 @@
 User Documentation for freecol.
 
 
-%package %{fontname}-fonts
+%package shadowedblack-fonts
 Summary:        Gothic font with drop shadows
 Group:          User Interface/X
 Requires:       fontpackages-filesystem
 
-%description %{fontname}-fonts
+%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
@@ -87,8 +96,12 @@
 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 \
+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 \
@@ -136,14 +149,18 @@
 %defattr(-,root,root,-)
 %doc doc/FreeCol.pdf doc/FreeCol.html doc/FreeCol.css doc/images
 
-
-%_font_pkg -n %{fontname} ShadowedBlack.ttf
-
+%_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
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Jan 2009 10:03:15 -0000	1.6
+++ sources	22 Feb 2009 11:26:23 -0000	1.7
@@ -1 +1 @@
-4dea50045993f59e21e3196e274fc5bd  freecol-0.8.0-src-clean.tar.gz
+6fd533d146c7a4ba7ae3ed9849939445  freecol-0.8.1-src-clean.tar.gz