diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index d40d3eb..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -foobillard-3.0a.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..de904c6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +foobillard-3.0a-hobbled.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 1d4c78d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: foobillard -# $Id$ -NAME := foobillard -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/foobillard-3.0a-no-fonts.patch b/foobillard-3.0a-no-fonts.patch new file mode 100644 index 0000000..36e2934 --- /dev/null +++ b/foobillard-3.0a-no-fonts.patch @@ -0,0 +1,50 @@ +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 + diff --git a/foobillard.desktop b/foobillard.desktop index af9ff86..1dcf0b4 100644 --- a/foobillard.desktop +++ b/foobillard.desktop @@ -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; diff --git a/foobillard.spec b/foobillard.spec index 76f0b5b..6471b23 100644 --- a/foobillard.spec +++ b/foobillard.spec @@ -1,16 +1,20 @@ Name: foobillard Version: 3.0a -Release: 5 +Release: 8%{?dist} 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 +Requires: dejavu-fonts BuildRequires: SDL-devel ImageMagick alsa-lib-devel BuildRequires: freetype-devel libpng-devel perl zlib-devel BuildRequires: libGL-devel libGLU-devel libX11-devel libXaw-devel libXi-devel @@ -23,8 +27,11 @@ FooBillard is still under development but the main physics is implemented. %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 +41,7 @@ convert -resize 48 data/foobillard.png foobillard.png 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 +55,7 @@ rm -rf $RPM_BUILD_ROOT %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 +65,20 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 15 2008 Miloslav Trmač - 3.0a-8 +- Add missing Requires: dejavu-fonts + Resolves: #462168 + +* Sat Jul 19 2008 Miloslav Trmač - 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 - 3.0a-6 +- Autorebuild for GCC 4.3 + * Wed Sep 13 2006 Miloslav Trmac - 3.0a-5 - Rebuild for Fedora Extras 6 diff --git a/hobble-foobillard.sh b/hobble-foobillard.sh new file mode 100755 index 0000000..fbb2eed --- /dev/null +++ b/hobble-foobillard.sh @@ -0,0 +1,10 @@ +#! /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" diff --git a/sources b/sources index 0ddde7f..138b7e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2d92edeaaf8bfb18aa26f1c79931b7d foobillard-3.0a.tar.gz +965d0dc0a4f864f2f25682bd9881e9b1 foobillard-3.0a-hobbled.tar.bz2