[spring/f21] - Upstream release: 98.0.^M- Drop 96.0 specific patches.^M- New BR: SDL2-devel.
Gilboa Davara
gilboa at fedoraproject.org
Sat Nov 15 09:08:09 UTC 2014
commit 2fbfc49e57fa1d97e17c04624d3232b0e6fddb67
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date: Sat Nov 15 11:07:59 2014 +0200
- Upstream release: 98.0.^M- Drop 96.0 specific patches.^M- New BR: SDL2-devel.
.gitignore | 1 +
sources | 2 +-
spring-95-dso.patch | 37 -----
spring-96-cmake.patch | 13 --
spring-96-prdownloader-7z.patch | 8 -
spring-96-prdownloader-link.patch | 167 --------------------
...p-remove.patch => spring-98-assimp-remove.patch | 6 +-
spring-98-dso.patch | 24 +++
spring.spec | 69 +++++----
9 files changed, 66 insertions(+), 261 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d96604b..272ea81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ spring_0.82.3_src.tar.lzma
/spring_94.1_src.tar.lzma
/spring_95.0_src.tar.lzma
/spring_96.0_src.tar.lzma
+/spring_98.0_src.tar.lzma
diff --git a/sources b/sources
index 978e234..80ac74f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2aeaaed4cf316ea22761efc0ef849a73 spring_96.0_src.tar.lzma
+fbe60dff4d39918157869f45738e0a8a spring_98.0_src.tar.lzma
diff --git a/spring-89-assimp-remove.patch b/spring-98-assimp-remove.patch
similarity index 52%
rename from spring-89-assimp-remove.patch
rename to spring-98-assimp-remove.patch
index 5b9ce8a..3749c03 100644
--- a/spring-89-assimp-remove.patch
+++ b/spring-98-assimp-remove.patch
@@ -1,5 +1,5 @@
---- rts/lib/CMakeLists.txt.old 2013-03-31 16:10:02.388476658 +0300
-+++ rts/lib/CMakeLists.txt 2013-03-31 16:11:06.465879922 +0300
+--- rts/lib/CMakeLists.txt.old 2014-11-01 07:06:24.302216709 +0200
++++ rts/lib/CMakeLists.txt 2014-11-01 07:06:30.389340273 +0200
@@ -7,7 +7,6 @@
ADD_SUBDIRECTORY(minizip)
ADD_SUBDIRECTORY(streflop)
@@ -7,4 +7,4 @@
-ADD_SUBDIRECTORY(assimp)
if (NOT HEADLESS_SYSTEM)
- Add_Subdirectory(gml)
+
diff --git a/spring-98-dso.patch b/spring-98-dso.patch
new file mode 100644
index 0000000..2b832ae
--- /dev/null
+++ b/spring-98-dso.patch
@@ -0,0 +1,24 @@
+--- ./rts/builds/headless/CMakeLists.txt.old 2014-11-01 06:56:26.170834065 +0200
++++ ./rts/builds/headless/CMakeLists.txt 2014-11-01 06:58:10.609775071 +0200
+@@ -41,8 +41,10 @@
+ LIST(APPEND engineHeadlessLibraries no-sound)
+ LIST(APPEND engineHeadlessLibraries engineSim)
+
+-INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/lib/assimp/include)
++FIND_PACKAGE(ZLIB REQUIRED)
++LIST(APPEND engineHeadlessLibraries ${ZLIB_LIBRARY})
+
++INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/lib/assimp/include)
+
+ ### Build the executable
+ ADD_EXECUTABLE(engine-headless ${engineSources} ${ENGINE_ICON})
+--- ./rts/builds/dedicated/CMakeLists.txt.old 2014-11-01 06:53:44.111822185 +0200
++++ ./rts/builds/dedicated/CMakeLists.txt 2014-11-01 06:55:12.579466363 +0200
+@@ -20,6 +20,7 @@
+
+
+ ### Assemble libraries
++FIND_PACKAGE(ZLIB REQUIRED)
+ LIST(APPEND engineDedicatedLibraries ${Boost_REGEX_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
+ LIST(APPEND engineDedicatedLibraries lua archives 7zip ${SPRING_MINIZIP_LIBRARY} ${ZLIB_LIBRARY})
+ LIST(APPEND engineDedicatedLibraries headlessStubs engineSystemNet)
diff --git a/spring.spec b/spring.spec
index 39f7922..435061a 100644
--- a/spring.spec
+++ b/spring.spec
@@ -5,8 +5,8 @@
# - License for some graphics is GFDL and (GFDL or CC-BY). See
# installer/builddata/bitmaps/README.txt.
Name: spring
-Version: 96.0
-Release: 6%{?dist}
+Version: 98.0
+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)
@@ -15,15 +15,12 @@ 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-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
+Patch0: spring-98-dso.patch
+Patch1: spring-98-assimp-remove.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: cmake SDL-devel openal-soft-devel boost-devel DevIL-devel
+BuildRequires: cmake SDL2-devel openal-soft-devel boost-devel DevIL-devel
BuildRequires: glew-devel libvorbis-devel DevIL-ILUT-devel
BuildRequires: freetype-devel python-devel allegro-devel zip
BuildRequires: java-devel-openjdk p7zip-plugins
@@ -50,11 +47,8 @@ great resource, read it here: http://spring.clan-sy.com/wiki/Main_Page
%prep
%setup -q -n %{name}_%{version}
-%patch0 -p0 -b .spring-95-dso-fix
-%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
+%patch0 -p0 -b .spring-98-dso-fix
+%patch1 -p0 -b .spring-98-assimp-remove
cp -p %{SOURCE1} README.Fedora
touch ./rts/build/cmake/FindAllegro.cmake
@@ -62,9 +56,8 @@ find rts/lib/7z -type f | xargs chmod -x
%build
-# Use boost filesystem 2 explicitly (bug 654807)
-export CFLAGS="%{optflags} -DBOOST_FILESYSTEM_VERSION=2"
-export CXXFLAGS="%{optflags} -DBOOST_FILESYSTEM_VERSION=2"
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
# BUILD_SHARED_LIBS = ON causes a build failure:
# http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
@@ -111,39 +104,41 @@ rm -f $RPM_BUILD_ROOT/usr/lib/libpr-downloader_static.a
# And move the dynamic pr-downloader to
# /usr/lib64 in x86_64.
-#find $RPM_BUILD_ROOT/usr/lib
-if [ "$(uname -m)" == "x86_64" ] ; then
- mkdir -p $RPM_BUILD_ROOT/%{_libdir}
- mv $RPM_BUILD_ROOT/usr/lib/libpr-downloader_shared.so $RPM_BUILD_ROOT/%{_libdir}/libpr-downloader_shared.so
-fi
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}
+mv tools/pr-downloader/src/libpr-downloader_shared.so $RPM_BUILD_ROOT/%{_libdir}/libpr-downloader_shared.so
%post
# Icons
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+
+# MIME package
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
# MimeType entry in the desktop file
update-desktop-database &> /dev/null || :
-# MIME package
-update-mime-database %{_datadir}/mime &> /dev/null || :
-
%postun
+if [ $1 -eq 0 ]; then
# Icons
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+# MIME package
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
fi
# MimeType entry in the desktop file
update-desktop-database &> /dev/null || :
+
+%posttrans
+# Icons
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
# MIME package
-update-mime-database %{_datadir}/mime &> /dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%clean
@@ -164,6 +159,16 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Nov 15 2014 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 98.0.2
+- New BR: SDL2-devel.
+
+* Fri Nov 07 2014 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 98.0.1
+- Upstream release: 98.0.
+- Drop 96.0 specific patches.
+
+* Thu Oct 02 2014 Rex Dieter <rdieter at fedoraproject.org> 96.0-7
+- update icon/mime scriptlets
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 96.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list