rpms/freetennis/devel freetennis-0.4.8-build.patch, NONE, 1.1 freetennis.spec, 1.12, 1.13

[Hans de Goede]

Author: jwrdegoede

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

Modified Files:
	freetennis.spec 
Added Files:
	freetennis-0.4.8-build.patch 
Log Message:
* Sat Dec 20 2008 Hans de Goede <hdegoede at redhat.com> - 0.4.8-16
- Fix building with latest ocaml-images


freetennis-0.4.8-build.patch:

--- NEW FILE freetennis-0.4.8-build.patch ---
diff -up freetennis-0.4.8/Makefile~ freetennis-0.4.8/Makefile
--- freetennis-0.4.8/Makefile~	2008-12-20 11:14:27.000000000 +0100
+++ freetennis-0.4.8/Makefile	2008-12-20 11:14:27.000000000 +0100
@@ -1,3 +1,3 @@
 # add -noassert for speedup
 all: freetennis.ml 
-	ocamlopt   -I +camlimages  -I +lablGL -I +lablgtk2    -I +sdl -o freetennis  bigarray.cmxa sdl.cmxa lablgtk.cmxa lablgl.cmxa  ci_core.cmxa  sdlmixer.cmxa sdlttf.cmxa unix.cmxa freetennis.ml
+	ocamlopt   -I +camlimages  -I +lablGL -I +lablgtk2    -I +sdl -o freetennis  bigarray.cmxa sdl.cmxa lablgtk.cmxa lablgl.cmxa sdlmixer.cmxa sdlttf.cmxa unix.cmxa freetennis.ml


Index: freetennis.spec
===================================================================
RCS file: /cvs/extras/rpms/freetennis/devel/freetennis.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- freetennis.spec	24 Nov 2008 10:42:23 -0000	1.12
+++ freetennis.spec	20 Dec 2008 10:23:34 -0000	1.13
@@ -3,9 +3,8 @@
 
 Name:           freetennis
 Version:        0.4.8
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Tennis simulation game
-
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://freetennis.sourceforge.net/
@@ -13,8 +12,8 @@
 Source1:        freetennis.desktop
 Source2:        freetennis.png
 Patch0:         freetennis-0.4.8-pathfixes.patch
+Patch1:         freetennis-0.4.8-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  ocaml, SDL_gfx-devel, SDL_mixer-devel, gdk-pixbuf-devel 
 BuildRequires:  libXmu-devel, gtk2-devel, desktop-file-utils
 BuildRequires:  SDL_ttf-devel
@@ -27,14 +26,16 @@
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
-
 %description
 Free Tennis is a free software tennis simulation game.  The game can be 
 played against an A.I. or human-vs-human via LAN or internet.
 
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
 
 %build
 make %{?_smp_mflags}
@@ -57,9 +58,11 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -72,13 +75,15 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING CHANGES.txt AUTHORS TODO.txt web-site/
-
 %{_bindir}/freetennis
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-freetennis.desktop
 %{_datadir}/icons/hicolor/48x48/apps/freetennis.png
 
 %changelog
+* Sat Dec 20 2008 Hans de Goede <hdegoede at redhat.com> - 0.4.8-16
+- Fix building with latest ocaml-images
+
 * Thu Nov 20 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.8-15
 - Rebuild for OCaml 3.11.0+beta1.