rpms/foobillard/devel foobillard-3.0a-no-fonts.patch, NONE, 1.1 hobble-foobillard.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 foobillard.desktop, 1.1, 1.2 foobillard.spec, 1.12, 1.13 sources, 1.4, 1.5

Miloslav Trmac (mitr) fedora-extras-commits at redhat.com
Sat Jul 19 21:19:58 UTC 2008 

Author: mitr

Update of /cvs/extras/rpms/foobillard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8531

Modified Files:
	.cvsignore foobillard.desktop foobillard.spec sources 
Added Files:
	foobillard-3.0a-no-fonts.patch hobble-foobillard.sh 
Log Message:
* Sat Jul 19 2008 Miloslav Trmač <mitr at volny.cz> - 3.0a-7
- Don't ship the non-free fonts
- Update License:
- Fix foobillard.desktop
- Convert ChangeLog to UTF-8
- Don't ship empty NEWS


foobillard-3.0a-no-fonts.patch:

--- NEW FILE foobillard-3.0a-no-fonts.patch ---
diff -urN foobillard/data/Makefile.in foobillard-3.0a/data/Makefile.in
--- foobillard/data/Makefile.in	2004-04-24 03:30:26.000000000 +0200
+++ foobillard-3.0a/data/Makefile.in	2008-07-19 22:27:11.000000000 +0200
@@ -121,14 +121,12 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 pkgdata_DATA = blende.png \
-               bluebold.ttf \
                cue_shadow.png \
                foobillard.gif \
                foobillard.png \
                full_symbol.png \
                fullhalf_symbol.png \
                half_symbol.png \
-               iomanoid.ttf \
                lightflare.png \
                place_cue_ball.png \
                queue.png \
@@ -142,7 +140,6 @@
                table-frame.png \
                tabletex_fB_128x128.png \
                tabletex_fB_256x256.png \
-               youregon.ttf \
                ball_ball.raw \
                posx.png \
                posy.png \
diff -urN foobillard/src/options.h foobillard-3.0a/src/options.h
--- foobillard/src/options.h	2003-11-27 04:32:54.000000000 +0100
+++ foobillard-3.0a/src/options.h	2008-07-19 22:20:14.000000000 +0200
@@ -96,13 +96,13 @@
 //#define options_player_fontname  "/usr/X11/lib/X11/fonts/win-ttf/tahomabd.ttf"
 #define options_shared_data_path   "/usr/local/shared/foobillard"
 
-#define options_player_fontname    "iomanoid.ttf"
-#define options_help_fontname      "youregon.ttf"
-#define options_menu_fontname      "youregon.ttf"
-#define options_winner_fontname    "youregon.ttf"
-#define options_ball_fontname      "bluebold.ttf"
-#define options_score_fontname     "bluebold.ttf"
-#define options_roster_fontname    "bluebold.ttf"
+#define options_player_fontname    "/usr/share/fonts/dejavu/DejaVuSans.ttf"
+#define options_help_fontname      "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+#define options_menu_fontname      "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+#define options_winner_fontname    "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+#define options_ball_fontname      "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+#define options_score_fontname     "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+#define options_roster_fontname    "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
 
 #define options_snd_volume 1.0
 


--- NEW FILE hobble-foobillard.sh ---
#! /bin/sh
set -e
d=$(mktemp -d)
o=$(pwd)
cd "$d"
tar xzf "$o"/foobillard-3*.tar.gz
find \( -name '*.ttf' -o -name README.FONTS \) -print0 | xargs -0 rm
tar cjf "$o/foobillard-hobbled.tar.bz2" *
cd "$o"
rm -rf "$d"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/foobillard/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2004 04:19:59 -0000	1.4
+++ .cvsignore	19 Jul 2008 21:19:02 -0000	1.5
@@ -1 +1 @@
-foobillard-3.0a.tar.gz
+foobillard-3.0a-hobbled.tar.bz2


Index: foobillard.desktop
===================================================================
RCS file: /cvs/extras/rpms/foobillard/devel/foobillard.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foobillard.desktop	8 Nov 2004 04:19:47 -0000	1.1
+++ foobillard.desktop	19 Jul 2008 21:19:02 -0000	1.2
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=FooBillard
 GenericName=Billard
 Comment=OpenGL billard game
 Exec=foobillard
-Icon=foobillard.xpm
+Icon=foobillard
 Terminal=false
 Type=Application
-Categories=Application;Game;3DGame;X-Fedora;
+Categories=Game;X-Fedora;


Index: foobillard.spec
===================================================================
RCS file: /cvs/extras/rpms/foobillard/devel/foobillard.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- foobillard.spec	19 Feb 2008 13:51:01 -0000	1.12
+++ foobillard.spec	19 Jul 2008 21:19:02 -0000	1.13
@@ -1,15 +1,18 @@
 Name:           foobillard
 Version:        3.0a
-Release:        6
+Release:        7
 
 Summary:        OpenGL billard game
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2
 URL:            http://foobillard.sunsite.dk/
-Source0:        http://foobillard.sunsite.dk/dnl/foobillard-3.0a.tar.gz
+# Based on http://foobillard.sunsite.dk/dnl/foobillard-3.0a.tar.gz
+Source0:        foobillard-3.0a-hobbled.tar.bz2
 Source1:        foobillard.desktop
+Source2:        hobble-foobillard.sh
 Patch0:         foobillard-3.0a-nonv.patch
+Patch1:         foobillard-3.0a-no-fonts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  SDL-devel ImageMagick alsa-lib-devel
 BuildRequires:  freetype-devel libpng-devel perl zlib-devel
@@ -23,8 +26,11 @@
 %prep
 %setup -q -n foobillard-3.0a
 %patch0 -p1
+%patch1 -p1 -b .no-fonts
 
 %build
+iconv -f iso-8859-1 -t utf-8 < ChangeLog > _
+mv _ ChangeLog
 %configure --disable-nvidia CFLAGS="${RPM_OPT_FLAGS}"
 make %{?_smp_mflags}
 convert -resize 48 data/foobillard.png foobillard.png
@@ -34,7 +40,7 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-install -pm 644 %{_sourcedir}/foobillard.desktop \
+install -pm 644 %{SOURCE1} \
   $RPM_BUILD_ROOT%{_datadir}/applications/fedora-foobillard.desktop
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
 install -pm 644 foobillard.6 $RPM_BUILD_ROOT%{_mandir}/man6
@@ -48,7 +54,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO README.FONTS
+%doc AUTHORS COPYING ChangeLog README TODO
 %doc foobillardrc.example
 %{_bindir}/foobillard
 %{_datadir}/applications/fedora-foobillard.desktop
@@ -58,6 +64,13 @@
 
 
 %changelog
+* Sat Jul 19 2008 Miloslav Trmač <mitr at volny.cz> - 3.0a-7
+- Don't ship the non-free fonts
+- Update License:
+- Fix foobillard.desktop
+- Convert ChangeLog to UTF-8
+- Don't ship empty NEWS
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0a-6
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/foobillard/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2004 04:19:59 -0000	1.4
+++ sources	19 Jul 2008 21:19:02 -0000	1.5
@@ -1 +1 @@
-c2d92edeaaf8bfb18aa26f1c79931b7d  foobillard-3.0a.tar.gz
+965d0dc0a4f864f2f25682bd9881e9b1  foobillard-3.0a-hobbled.tar.bz2

More information about the fedora-extras-commits mailing list