[spring/f18] - Switch to ExclusiveArch.

[Gilboa Davara]

commit 925e7897f88c9394e2657248f748567c9573578f
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date:   Thu Nov 21 08:06:18 2013 +0200

    - Switch to ExclusiveArch.

 spring-95-disable-pr-downloader.patch |   25 ++++++++++++++++++++++
 spring-95-dso.patch                   |   37 +++++++++++++++++++++++++++++++++
 spring.spec                           |    9 ++++---
 3 files changed, 67 insertions(+), 4 deletions(-)
---
diff --git a/spring-95-disable-pr-downloader.patch b/spring-95-disable-pr-downloader.patch
new file mode 100644
index 0000000..f2dd66f
--- /dev/null
+++ b/spring-95-disable-pr-downloader.patch
@@ -0,0 +1,25 @@
+--- tools/CMakeLists.txt.old	2013-11-18 08:29:25.035269717 +0200
++++ tools/CMakeLists.txt	2013-11-18 08:29:32.816210782 +0200
+@@ -2,22 +2,6 @@
+ Add_Subdirectory(unitsync)
+ Add_Subdirectory(DemoTool)
+ 
+-If    (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/pr-downloader/CMakeLists.txt")
+-	# only add this if the submodule is present
+-	find_package(CURL)
+-	If (CURL_FOUND)
+-		set(CMAKE_BUILD_TYPE "RELEASE")
+-		set(CLEAR_COMPILER_FLAGS true)
+-		Add_Subdirectory(pr-downloader)
+-		# add install-pr-downloader target
+-		Set(myInstallDeps pr-downloader)
+-		Set(myInstallDirs "tools/pr-downloader")
+-		CreateInstallTarget("pr-downloader" myInstallDeps myInstallDirs)
+-	Else(CURL_FOUND)
+-		MESSAGE(STATUS "pr-downloader will NOT be generated/installed; libcurl not found")
+-	EndIf(CURL_FOUND)
+-EndIf (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/pr-downloader/CMakeLists.txt")
+-
+ # This is not part of the official source package
+ if    (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dirchange)
+ 	Add_Subdirectory(dirchange)
diff --git a/spring-95-dso.patch b/spring-95-dso.patch
new file mode 100644
index 0000000..8ce6642
--- /dev/null
+++ b/spring-95-dso.patch
@@ -0,0 +1,37 @@
+--- rts/builds/dedicated/CMakeLists.txt.old	2013-11-18 08:15:57.830264049 +0200
++++ rts/builds/dedicated/CMakeLists.txt	2013-11-18 08:17:30.275483453 +0200
+@@ -53,8 +53,10 @@
+ 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL)
+ ENDIF (MINGW OR APPLE)
+ 
++FIND_PACKAGE(ZLIB REQUIRED)
++LIST(APPEND engineDedicatedLibraries ${ZLIB_LIBRARY})
+ 
+-### Assemble the incude dirs
++### Assemble the include dirs
+ INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/)
+ INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/lib/lua/include/)
+ INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/lib/7zip)
+--- rts/builds/headless/CMakeLists.txt.old	2013-11-18 08:18:22.427040995 +0200
++++ rts/builds/headless/CMakeLists.txt	2013-11-18 08:19:41.701365926 +0200
+@@ -30,6 +30,8 @@
+ 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL)
+ ENDIF (MINGW OR APPLE)
+ 
++FIND_PACKAGE(ZLIB REQUIRED)
++LIST(APPEND engineHeadlessLibraries ${ZLIB_LIBRARY})
+ 
+ # headlessstubs are our stubs that replace libGL, libGLU, libGLEW, libSDL (yes really!)
+ LIST(APPEND engineHeadlessLibraries headlessStubs)
+--- rts/builds/multithreaded/CMakeLists.txt.old	2013-11-18 08:20:37.708887380 +0200
++++ rts/builds/multithreaded/CMakeLists.txt	2013-11-18 08:21:36.567383204 +0200
+@@ -53,6 +53,9 @@
+ 	LIST(APPEND engineLibraries squish rgetc1)
+ endif (USE_LIBSQUISH)
+ 
++FIND_PACKAGE(ZLIB REQUIRED)
++LIST(APPEND engineLibraries ${ZLIB_LIBRARY})
++
+ LIST(APPEND engineLibraries ${sound-impl})
+ LIST(APPEND engineLibraries ${Boost_THREAD_LIBRARY})
+ LIST(APPEND engineLibraries engineSystemNet)
diff --git a/spring.spec b/spring.spec
index 0d44cc8..77a025e 100644
--- a/spring.spec
+++ b/spring.spec
@@ -8,7 +8,7 @@
 #	installer/builddata/bitmaps/README.txt.
 Name:			spring
 Version:		95.0
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Multiplayer, 3D realtime strategy combat game
 Group:			Amusements/Games
 License:		GPLv2+ and GPLv3+ and LGPLv2 and GFDL and (GFDL or CC-BY)
@@ -36,9 +36,7 @@ Provides:		spring-dedicated = %{version}-%{release}
 Provides:		bundled(lua) = 5.1.4
 Provides:		bundled(md5-deutsch)
 
-# Spring PPC version is still experimental.
-# Exclude for now.
-ExcludeArch:	ppc ppc64 %{arm}
+ExclusiveArch:	i386 x86_64
 
 
 %description
@@ -148,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 20 2013 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 95.0-1
+- Switch to ExclusiveArch.
+
 * Mon Nov 18 2013 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 95.0-1
 - Version 95.0, major spring/springlobby upstream release.
 - Remove EFX patch - applied upstream.