Update Oolite packaging to 1.74.2

1 files changed, 26 insertions, 22 deletions

diff --git a/etoile/oolite.spec b/etoile/oolite.spec
index 1bd9506..b60c7b7 100644
--- a/etoile/oolite.spec
+++ b/etoile/oolite.spec
@@ -1,30 +1,31 @@
+%global srcname oolite-dev-source
+
 Name:           oolite
-Version:        1.73.4
+Version:        1.74.2
 Release:        1%{?dist}
-Summary:        A space sim game, inspired by Elite
+Summary:        A space simulation game, inspired by Elite
 
 Group:          Amusements/Games
-# dual-licensed with CC-BY-NC-SA which is not Fedora-approved
-# see forum thread for license correction, version included in
-# source tarball is incorrect
 License:        GPLv2+
 URL:            http://oolite.org/
-Source0:        http://download2.berlios.de/oolite-linux/oolite-dev-source-%{version}.tar.bz2
-#Source1:        %{name}-jsautocfg.tar
-# Remove the build settings that will be overridden
-# by RPM_OPT_FLAGS anyway
-Patch0:         %{name}-1.73.4-rpmopts.patch
+Source0:        http://download.berlios.de/oolite-linux/%{srcname}-%{version}.tar.bz2
+# Use RPM_OPT_FLAGS instead of default compiler flags
+Patch0:         %{srcname}-1.74.2-rpmoptflags.patch
+# explicitly link against pthread instead of inheriting it
+Patch1:         %{srcname}-1.74.2-implicit-dso.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  gcc-objc
 BuildRequires:  gnustep-base-devel desktop-file-utils
 BuildRequires:  mesa-libGLU-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:  libpng-devel espeak-devel
 
 %description
-Oolite is a space sim game, inspired by Elite, powered by Objective-C
-and OpenGL, and designed as a small game that is easy for users to
-pick up, modify and expand upon. Almost every aspect of the game can
-be changed by using simple, free graphics packages and text editors.
+Oolite is a space simulation game, inspired by Elite, powered by
+Objective-C and OpenGL, and designed as a small game that is easy for
+users to pick up, modify and expand upon. Almost every aspect of the
+game can be changed by using simple, free graphics packages and text
+editors.
 
 
 %package        doc
@@ -46,9 +47,10 @@ This package contains documentation in PDF format.
 %prep
 %setup -q -n %{name}-dev-source-%{version}
 %patch0 -p1 -b .rpmoptflags
+%patch1 -p1 -b .implicit-dso
 
 # Fix end-of-line encodings
-for f in contributors.txt Doc/CHANGELOG.TXT; do
+for f in Doc/contributors.txt Doc/CHANGELOG.TXT; do
     touch -r $f _tstamp.txt
     sed -i 's|\r||' $f
     touch -r _tstamp.txt $f
@@ -56,9 +58,8 @@ done
 rm _tstamp.txt
 
 # Fix desktop file
-sed -i FreeDesktop/oolite.desktop \
-    -e 's|Exec=oolite|Exec=openapp oolite|' \
-    -e 's|oolite-icon.png|oolite-icon|'
+sed -i installers/FreeDesktop/oolite.desktop \
+    -e 's|Exec=oolite|Exec=openapp oolite|'
 
 
 %build
@@ -71,7 +72,7 @@ sed -i FreeDesktop/oolite.desktop \
 )
 
 # Not parallel-buildable
-make %{?_smp_mflags} messages=yes CP="cp -p"
+make %{?_smp_mflags} debug=yes messages=yes CP="cp -p"
 
 # GNUmakefile.postamble tags on the .dbg extension
 mv oolite.app/oolite{.dbg,}
@@ -82,12 +83,12 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/GNUstep/Applications
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp -pr oolite.app $RPM_BUILD_ROOT%{_libdir}/GNUstep/Applications/
-cp -p FreeDesktop/oolite-icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+cp -p installers/FreeDesktop/oolite-icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --remove-category=Application \
   --add-category=Simulation \
-  FreeDesktop/oolite.desktop
+  installers/FreeDesktop/oolite.desktop
 
 # remove docs that we don't want to package
 # to simplify %%files declaration
@@ -100,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc contributors.txt Doc/*.TXT
+%doc Doc/contributors.txt Doc/*.TXT
 %{_libdir}/GNUstep/Applications/oolite.app
 %{_datadir}/applications/oolite.desktop
 %{_datadir}/pixmaps/oolite-icon.png
@@ -112,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 10 2010 Michel Salim <salimma@fedoraproject.org> - 1.74.2-1
+- Update to 1.74.2
+
 * Thu Sep 24 2009 Michel Salim <salimma@fedoraproject.org> - 1.73.4-1
 - Update to 1.73.4
 - Adjust file locations to use flattened layout