Update oolite to 1.73.4; drop separate oolite-data

2 files changed, 62 insertions, 76 deletions

diff --git a/etoile/oolite-data.spec b/etoile/oolite-data.spec
deleted file mode 100644
index 36fe516..0000000
--- a/etoile/oolite-data.spec
+++ /dev/null
@@ -1,55 +0,0 @@
-%global debug_package %{nil}
-
-Name:           oolite-data
-Version:        1.65
-Release:        3%{?dist}
-Summary:        Data files for Oolite
-
-Group:          Amusements/Games
-License:        GPLv2+
-URL:            http://oolite.org/
-Source0:        http://download.berlios.de/oolite-linux/oolite-%{version}-data.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#BuildRequires:  
-Requires:       oolite = %{version}
-
-%description
-Data files for Oolite
-
-
-%prep
-%setup -q -n oolite-%{version}-src
-mv Resources/README.TXT .
-
-
-%build
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/GNUstep/Applications/oolite.app/Contents
-cp -pr Resources $RPM_BUILD_ROOT%{_libdir}/GNUstep/Applications/oolite.app/Contents/
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%doc README.TXT
-%{_libdir}/GNUstep/Applications/oolite.app/Contents/Resources/*
-
-
-
-%changelog
-* Thu Sep 24 2009 Michel Salim <salimma@fedoraproject.org> - 1.65-3
-- Package no longer noarch, since Fedora uses flattened layout
-
-* Thu Aug 14 2008 Michel Salim <salimma@fedoraproject.org> - 1.65-2
-- Package is now noarch
-
-* Mon Aug 11 2008 Michel Salim <salimma@fedoraproject.org> - 1.65-1
-- Initial package
-
diff --git a/etoile/oolite.spec b/etoile/oolite.spec
index 8b7ecdf..1bd9506 100644
--- a/etoile/oolite.spec
+++ b/etoile/oolite.spec
@@ -1,6 +1,6 @@
 Name:           oolite
-Version:        1.65
-Release:        2%{?dist}
+Version:        1.73.4
+Release:        1%{?dist}
 Summary:        A space sim game, inspired by Elite
 
 Group:          Amusements/Games
@@ -9,14 +9,16 @@ Group:          Amusements/Games
 # source tarball is incorrect
 License:        GPLv2+
 URL:            http://oolite.org/
-Source0:        http://download.berlios.de/oolite-linux/oolite-%{version}-src.tar.gz
-#Source1:        http://download.berlios.de/oolite-linux/oolite-%{version}-data.tar.gz
-Patch0:		oolite-1.65-src-sharedobj.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnustep-base-devel desktop-file-utils
-BuildRequires:	mesa-libGLU-devel SDL_image-devel SDL_mixer-devel
-Requires:       oolite-data = %{version}
+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
@@ -25,26 +27,54 @@ 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
+Summary:        Documentation for %{name}
+Group:          Documentation
+License:        GPLv2+
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+
+%description    doc
+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.
+
+This package contains documentation in PDF format.
+
+
 %prep
-%setup -q -n %{name}-%{version}-src
-#setup -q -b 1 -n %{name}-%{version}-src
-%patch0 -p1 -b .sharedobj
-# stub Resources directory; real one is in oolite-data
-mkdir Resources
+%setup -q -n %{name}-dev-source-%{version}
+%patch0 -p1 -b .rpmoptflags
+
+# Fix end-of-line encodings
+for f in contributors.txt Doc/CHANGELOG.TXT; do
+    touch -r $f _tstamp.txt
+    sed -i 's|\r||' $f
+    touch -r _tstamp.txt $f
+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|' \
-  -e 's|Terminal=true|Terminal=false|'
+    -e 's|Exec=oolite|Exec=openapp oolite|' \
+    -e 's|oolite-icon.png|oolite-icon|'
 
 
 %build
 . %{_libdir}/GNUstep/Makefiles/GNUstep.sh
+
+(
+  cd deps/Cross-platform-deps/SpiderMonkey/js/src &&
+  make -f Makefile.ref XCFLAGS="$RPM_OPT_FLAGS" &&
+  ln -s Linux_All_{DBG,OPT}.OBJ
+)
+
 # Not parallel-buildable
-make -e debug=no CP="cp -p" BINARY="-r obj/`uname -m`/linux-gnu/gnu-gnu-gnu/oolite"
-BINDIR=oolite.app/`uname -m`/linux-gnu/gnu-gnu-gnu
-mkdir -p $BINDIR
-mv oolite.app/oolite $BINDIR/
+make %{?_smp_mflags} messages=yes CP="cp -p"
+
+# GNUmakefile.postamble tags on the .dbg extension
+mv oolite.app/oolite{.dbg,}
 
 
 %install
@@ -59,6 +89,10 @@ desktop-file-install \
   --add-category=Simulation \
   FreeDesktop/oolite.desktop
 
+# remove docs that we don't want to package
+# to simplify %%files declaration
+rm Doc/{PORTING,README_LINUX}.TXT
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,16 +100,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt Doc/*.TXT
+%doc contributors.txt Doc/*.TXT
 %{_libdir}/GNUstep/Applications/oolite.app
 %{_datadir}/applications/oolite.desktop
 %{_datadir}/pixmaps/oolite-icon.png
 
 
+%files doc
+%defattr(-,root,root,-)
+%doc Doc/*.pdf
+
 
 %changelog
-* Thu Sep 24 2009 Michel Salim <salimma@fedoraproject.org> - 1.65-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
+- Use Fedora-specific compiler flags
+- Build with verbose output
 
 * Mon Aug 11 2008 Michel Salim <salimma@fedoraproject.org> - 1.65-1
 - Initial package