[spring] - 89.0: Upstream bugfix release.

Mon Jul 16 07:41:13 UTC 2012

commit eb205456a198a9b01d6af76d2d5062abb96c6f37
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date:   Mon Jul 16 10:40:55 2012 +0300

    - 89.0: Upstream bugfix release.

 .gitignore          |    1 +
 sources             |    2 +-
 spring-89-dso.patch |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 spring.spec         |   46 ++++++++++++++++++++++++++++++++++++------
 4 files changed, 95 insertions(+), 8 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index d4a6ab9..609e036 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ spring_0.82.3_src.tar.lzma
 /spring_0.82.7.1_src.tar.lzma
 /spring_83.0_src.tar.lzma
 /spring_84.0_src.tar.lzma
+/spring_89.0_src.tar.lzma
diff --git a/sources b/sources
index 91cd9de..6bd0329 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-151bf483f1c3b801b4cede6f02d79ea9  spring_88.0_src.tar.lzma
+36fc266e925bc3790a68bf1bc7ebb315  spring_89.0_src.tar.lzma
diff --git a/spring-89-dso.patch b/spring-89-dso.patch
new file mode 100644
index 0000000..dc876d3
--- /dev/null
+++ b/spring-89-dso.patch
@@ -0,0 +1,54 @@
+--- rts/builds/dedicated/CMakeLists.txt.old	2012-07-16 09:03:54.652059698 +0300
++++ rts/builds/dedicated/CMakeLists.txt	2012-07-16 09:04:24.368792712 +0300
+@@ -43,6 +43,8 @@
+ 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL)
+ ENDIF (MINGW OR APPLE)
+ 
++FIND_PACKAGE(ZLIB REQUIRED)
++LIST(APPEND engineDedicatedLibraries ${ZLIB_LIBRARY})
+ 
+ ### Assemble the incude dirs
+ INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/)
+--- rts/builds/default/CMakeLists.txt.old	2012-07-16 09:00:29.266904434 +0300
++++ rts/builds/default/CMakeLists.txt	2012-07-16 09:02:33.093792356 +0300
+@@ -19,6 +19,8 @@
+ FIND_PACKAGE_STATIC(GLEW 1.5.1 REQUIRED)
+ LIST(APPEND engineLibraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES})
+ 
++FIND_PACKAGE(ZLIB REQUIRED)
++LIST(APPEND engineLibraries ${ZLIB_LIBRARY})
+ 
+ FIND_PACKAGE_STATIC(Freetype REQUIRED)
+ INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
+--- rts/builds/headless/CMakeLists.txt.old	2012-07-16 09:04:37.071678580 +0300
++++ rts/builds/headless/CMakeLists.txt	2012-07-16 09:05:16.974320042 +0300
+@@ -31,7 +31,6 @@
+ 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL)
+ ENDIF (MINGW OR APPLE)
+ 
+-
+ # headlessstubs are our stubs that replace libGL, libGLU, libGLEW, libSDL (yes really!)
+ LIST(APPEND engineHeadlessLibraries headlessStubs)
+ 
+@@ -39,6 +38,9 @@
+ 
+ LIST(APPEND engineHeadlessLibraries ${engineCommonLibraries})
+ 
++FIND_PACKAGE(ZLIB REQUIRED)
++LIST(APPEND engineHeadlessLibraries ${ZLIB_LIBRARY})
++
+ INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/lib/assimp/include)
+ 
+ 
+--- rts/builds/multithreaded/CMakeLists.txt.old	2012-07-16 09:03:08.063478233 +0300
++++ rts/builds/multithreaded/CMakeLists.txt	2012-07-16 09:03:34.077244540 +0300
+@@ -31,6 +31,9 @@
+ FIND_PACKAGE(GLEW 1.5.1 REQUIRED)
+ LIST(APPEND engineLibraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES})
+ 
++FIND_PACKAGE(ZLIB REQUIRED)
++LIST(APPEND engineLibraries ${ZLIB_LIBRARY})
++
+ FIND_PACKAGE_STATIC(Freetype REQUIRED)
+ LIST(APPEND engineLibraries ${FREETYPE_LIBRARIES})
+ 
diff --git a/spring.spec b/spring.spec
index 751d6da..13d767a 100644
--- a/spring.spec
+++ b/spring.spec
@@ -1,6 +1,6 @@
 Name:			spring
-Version:		88.0
-Release:		2%{?dist}
+Version:		89.0
+Release:		1%{?dist}
 Summary:		Multiplayer, 3D realtime strategy combat game
 
 Group:			Amusements/Games
@@ -15,8 +15,7 @@ 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-83-dso.patch
-Patch1:			spring_88.0-gcc47.patch
+Patch0:			spring-89-dso.patch
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,20 +44,37 @@ ExcludeArch:	ppc ppc64
 %description
 Spring is a project aiming to create a new, versatile, full 3D Real Time
 Strategy Engine.
-
 Spring is designed to be played as online multiplayer matches, but some AI are
 also available to play against the computer.
-
 Please read the README.Fedora file to get started. The Spring wiki is also a
 great resource, read it here: http://spring.clan-sy.com/wiki/Main_Page
 
 
+%package pr-downloader
+Summary:		Console game / map downloader for the Spring engine.
+Group:			Amusements/Games
+
+
+%description pr-downloader
+pr-downloader is a console cross-platform download tool for spring.
+It can download games and maps supporting currently all main download systems,
+including rapid, plasma and upq. 
+
+
+%package pr-downloader-devel
+Summary:		Development files for the console game / map downloader for the Spring engine.
+Group:			Amusements/Games
+
+
+%description pr-downloader-devel
+C-API files for the pr-downloader console game / map downloader for the Spring engine.
+
+
 %prep
 %setup -q -n %{name}_%{version}
 
 # Compile patches.
 %patch0 -p0 -b .spring-83-dso-fix
-%patch1 -p1 -b .gcc47
 
 cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
@@ -151,7 +167,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man6/*
 
 
+%files pr-downloader
+%{_libdir}/libpr-downloader_shared.so
+
+
+%files pr-downloader-devel
+%{_libdir}/pkgconfig/libspringdownloader.pc
+%{_libdir}/libpr-downloader_static.a
+%{_includedir}/spring/Downloader/pr-downloader.h
+
+
 %changelog
+* 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.
+- Updated dso patch.
+- Drop the gcc 4.7 patch (fixed upstream).
+
 * Wed Apr  4 2012 Tom Callaway <spot at fedoraproject.org> - 88.0-2
 - fix compile with gcc 4.7
 
