[spring] - Switch to Fedora build in assimp.

[Gilboa Davara]

commit d2ce3d2a2960c6f4c0015fcccf25440930a01470
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date:   Mon Jul 16 11:25:00 2012 +0300

    - Switch to Fedora build in assimp.

 spring-89-assimp-remove.patch |   10 ++++++++++
 spring.spec                   |   34 ++++++++++++++++++----------------
 2 files changed, 28 insertions(+), 16 deletions(-)
---
diff --git a/spring-89-assimp-remove.patch b/spring-89-assimp-remove.patch
new file mode 100644
index 0000000..4918c48
--- /dev/null
+++ b/spring-89-assimp-remove.patch
@@ -0,0 +1,10 @@
+--- rts/lib/CMakeLists.txt.old	2012-07-16 11:03:12.800511295 +0300
++++ rts/lib/CMakeLists.txt	2012-07-16 11:03:20.628441071 +0300
+@@ -10,7 +10,6 @@
+ ADD_SUBDIRECTORY(md5)
+ ADD_SUBDIRECTORY(lobby)
+ ADD_SUBDIRECTORY(headlessStubs)
+-ADD_SUBDIRECTORY(assimp)
+ 
+ if    (NOT HEADLESS_SYSTEM)
+ 	Add_Subdirectory(gml)
diff --git a/spring.spec b/spring.spec
index 13d767a..2492ac6 100644
--- a/spring.spec
+++ b/spring.spec
@@ -1,21 +1,22 @@
-Name:			spring
-Version:		89.0
-Release:		1%{?dist}
-Summary:		Multiplayer, 3D realtime strategy combat game
-
-Group:			Amusements/Games
 # Few notes about licensing:
 # The main game is GPLv2+
 # - AI/Global/RAI/README says that AI is licensed under GPLv3+
 # - License for some sounds is LGPLv2 as taken from bzflag.
 # - License for some graphics is GFDL and (GFDL or CC-BY). See
 #	installer/builddata/bitmaps/README.txt.
+Name:			spring
+Version:		89.0
+Release:		1%{?dist}
+Summary:		Multiplayer, 3D realtime strategy combat game
+Group:			Amusements/Games
 License:		GPLv2+ and GPLv3+ and LGPLv2 and GFDL and (GFDL or CC-BY)
-
 URL:			http://springrts.com
+
 Source0:		http://downloads.sourceforge.net/project/springrts/springrts/spring-%{version}/spring_%{version}_src.tar.lzma
 Source1:		spring-README.Fedora
+
 Patch0:			spring-89-dso.patch
+Patch1:			spring-89-assimp-remove.patch
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,17 +25,13 @@ BuildRequires:	glew-devel libvorbis-devel DevIL-ILUT-devel
 BuildRequires:	freetype-devel python-devel allegro-devel zip
 BuildRequires:	java-devel-openjdk p7zip-plugins
 BuildRequires:	desktop-file-utils
-# When assimp goes into Fedora, unbundle it here and use the system copy.
-#BuildRequires:	assimp-devel
-# Man page generation
+BuildRequires:	assimp-devel
 BuildRequires:	libxslt asciidoc docbook-style-xsl
-
 Requires:		spring-lobby spring-installer spring-maps-default
 
-# TODO: split the package
 Provides:		spring-dedicated = %{version}-%{release}
 Provides:		bundled(lua) = 5.1.4
-Provides:		bundled(md5-Aladdin)
+Provides:		bundled(md5-deutsch)
 
 # Spring PPC version is still experimental.
 # Exclude for now.
@@ -72,9 +69,8 @@ C-API files for the pr-downloader console game / map downloader for the Spring e
 
 %prep
 %setup -q -n %{name}_%{version}
-
-# Compile patches.
-%patch0 -p0 -b .spring-83-dso-fix
+%patch0 -p0 -b .spring-89-dso-fix
+%patch1 -p0 -b .spring-89-assimp-remove
 
 cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
@@ -85,6 +81,7 @@ find rts/lib/7z -type f | xargs chmod -x
 # Use boost filesystem 2 explicitly (bug 654807)
 export CFLAGS="$CFLAGS -DBOOST_FILESYSTEM_VERSION=2"
 export CXXFLAGS="$CXXFLAGS -DBOOST_FILESYSTEM_VERSION=2"
+
 # BUILD_SHARED_LIBS = ON causes a build failure:
 # http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
 #		-DBUILD_SHARED_LIBS:BOOL=OFF \
@@ -178,6 +175,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 16 2012 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 89.0-2
+- Switch to Fedora's built in assimp.
+- Per-#505636, bundled md5 implementation description is now deutsch instead of Aladdin.
+- Minor spec cleanup.
+
 * Mon Jul 16 2012 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 89.0-1
 - 89.0: Upstream bugfix release.
 - pr-downloader added, moved to a separate package.