[spring] - Rawhide build fix.
Gilboa Davara
gilboa at fedoraproject.org
Mon Jun 16 06:39:46 UTC 2014
commit fa698e07a0acbcd7dc03f5d08773f8d1283f8b49
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date: Mon Jun 16 09:39:36 2014 +0300
- Rawhide build fix.
spring-96-cmake.patch | 13 +++++++++++++
spring.spec | 7 ++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/spring-96-cmake.patch b/spring-96-cmake.patch
new file mode 100644
index 0000000..ae778cb
--- /dev/null
+++ b/spring-96-cmake.patch
@@ -0,0 +1,13 @@
+--- ./tools/unitsync/test/CMakeLists.txt.old 2014-06-15 19:27:20.555231126 +0300
++++ ./tools/unitsync/test/CMakeLists.txt 2014-06-15 19:27:37.161550974 +0300
+@@ -11,8 +11,8 @@
+ REMOVE_DEFINITIONS(-DUNITSYNC)
+
+ # To allow linking to MODULE_LIBRARY targets
+-CMAKE_POLICY(SET CMP0001 OLD)
+-SET(CMAKE_BACKWARDS_COMPATIBILITY "2.2")
++#CMAKE_POLICY(SET CMP0001 OLD)
++#SET(CMAKE_BACKWARDS_COMPATIBILITY "2.2")
+
+ ADD_EXECUTABLE(lua2php EXCLUDE_FROM_ALL lua2php.cpp)
+ TARGET_LINK_LIBRARIES(lua2php unitsync ${CMAKE_DL_LIBS})
diff --git a/spring.spec b/spring.spec
index 3020a32..78baedc 100644
--- a/spring.spec
+++ b/spring.spec
@@ -6,7 +6,7 @@
# installer/builddata/bitmaps/README.txt.
Name: spring
Version: 96.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Multiplayer, 3D realtime strategy combat game
Group: Amusements/Games
License: GPLv2+ and GPLv3+ and LGPLv2 and GFDL and (GFDL or CC-BY)
@@ -19,6 +19,7 @@ Patch0: spring-95-dso.patch
Patch1: spring-89-assimp-remove.patch
Patch2: spring-96-prdownloader-link.patch
Patch3: spring-96-prdownloader-7z.patch
+Patch4: spring-96-cmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +54,7 @@ great resource, read it here: http://spring.clan-sy.com/wiki/Main_Page
%patch1 -p0 -b .spring-89-assimp-remove
%patch2 -p1 -b .spring-96-pr-downloader-link-fix
%patch3 -p1 -b .spring-96-pr-downloader-7zlink-fix
+%patch4 -p1 -b .spring-96-cmake-fix
cp -p %{SOURCE1} README.Fedora
touch ./rts/build/cmake/FindAllegro.cmake
@@ -162,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jun 15 2014 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 96.0-3
+- Rawhide build fix.
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 96.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list