rpms/openclonk/devel openclonk-6.0-target.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 openclonk.spec, 1.1, 1.2 sources, 1.2, 1.3 openclonk-5.5.1-git-Fix-extraction-of-language-names-and-Misc.patch, 1.1, NONE openclonk-5.5.1-tinyxml-shared.patch, 1.1, NONE openclonk-target.patch, 1.1, NONE

[Martin Gansser]

Author: martinkg

Update of /cvs/nonfree/rpms/openclonk/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10829/devel

Modified Files:
	.cvsignore openclonk.spec sources 
Added Files:
	openclonk-6.0-target.patch 
Removed Files:
	openclonk-5.5.1-git-Fix-extraction-of-language-names-and-Misc.patch 
	openclonk-5.5.1-tinyxml-shared.patch openclonk-target.patch 
Log Message:


openclonk-6.0-target.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openclonk-6.0-target.patch ---
--- openclonk-release-6.0-src/CMakeLists.txt.orig	2015-03-16 11:50:42.548192120 +0100
+++ openclonk-release-6.0-src/CMakeLists.txt	2015-03-16 11:50:59.858190337 +0100
@@ -1215,7 +1215,7 @@
 	# Don't put this into CMAKE_CXX_FLAGS because otherwise it is cached,
 	# and when the path is changed both the old and new definition appears
 	# in the list of flags.
-	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"")
+	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/openclonk\"")
 endif()
 if(OC_CXX_FLAGS)
 	list(REMOVE_DUPLICATES OC_CXX_FLAGS)
@@ -1537,7 +1537,7 @@
 			DEPENDS "${native_c4group}"
 			VERBATIM
 		)
-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/games/openclonk)
+		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/openclonk)
 	endif()
 endforeach()
 


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/openclonk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Mar 2015 22:29:35 -0000	1.2
+++ .cvsignore	16 Mar 2015 20:57:14 -0000	1.3
@@ -1 +1 @@
-openclonk-5.5.1-src.tar.bz2
+openclonk-6.0-src.tar.bz2


Index: openclonk.spec
===================================================================
RCS file: /cvs/nonfree/rpms/openclonk/devel/openclonk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openclonk.spec	7 Mar 2015 22:29:35 -0000	1.1
+++ openclonk.spec	16 Mar 2015 20:57:15 -0000	1.2
@@ -1,20 +1,17 @@
 %global develdocdir %{_docdir}/%{name}-devel/html
 
 Name:           openclonk
-Version:        5.5.1
-Release:        6%{?dist}
+Version:        6.0
+Release:        1%{?dist}
 Summary:        Fast-paced 2d genre mix
-License:        ISC and CC-BY-NC
+License:        ISC and CC-BY-SA
 Url:            http://www.openclonk.org/
 Source0:        http://www.openclonk.org/builds/release/%{version}/%{name}-%{version}-src.tar.bz2
 Source1:        %{name}.appdata.xml
 Source2:        %{name}-html-de.desktop
 Source3:        %{name}-html-en.desktop
 Source4:        %{name}-docs.png
-Patch0:         %{name}-target.patch
-Patch1:         %{name}-%{version}-git-Fix-extraction-of-language-names-and-Misc.patch
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-action/openclonk/files/openclonk-5.5.1-tinyxml-shared.patch?view=log
-Patch2:         %{name}-%{version}-tinyxml-shared.patch
+Patch0:         %{name}-%{version}-target.patch
 BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  gtest-devel
@@ -78,10 +75,8 @@
 %prep
 %setup -q -n %{name}-release-%{version}-src
 %patch0 -p1 -b .target
-%patch1 -p1 -b .Misc
-%patch2 -p1
 
-# remove bundled tinyyml
+# remove bundled tinyxml
 rm -rf thirdparty/tinyxml
 # remove bundled getopt
 rm -rf thirdparty/getopt
@@ -102,6 +97,7 @@
 
 %build
 %cmake -DUSE_STATIC_BOOST=OFF \
+       -DWITH_SYSTEM_TINYXML=ON \
        -DBUILD_SHARED_LIBS=OFF
 
 make %{?_smp_mflags}
@@ -180,6 +176,11 @@
 %{_datadir}/pixmaps/%{name}-docs.png
 
 %changelog
+* Mon Mar 16 2015 Martin Gansser <martinkg at fedoraproject.org> - 6.0-1
+- Update to 6.0
+- correct %%license tag
+- cleanup spec file
+
 * Tue Feb 24 2015 Martin Gansser <martinkg at fedoraproject.org> - 5.5.1-6
 - dropped CFLAGS and CXXFLAGS flags because already sets by %%cmake macro
 - dropped CMAKE_INSTALL_PREFIX because already sets by %%cmake macro


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/openclonk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Mar 2015 22:29:35 -0000	1.2
+++ sources	16 Mar 2015 20:57:15 -0000	1.3
@@ -1 +1 @@
-4a988b0e24f18ca46c23686b4fe1bca9  openclonk-5.5.1-src.tar.bz2
+3e0dd1c5f60df0d37dbbb12b7ef5c38b  openclonk-6.0-src.tar.bz2


--- openclonk-5.5.1-git-Fix-extraction-of-language-names-and-Misc.patch DELETED ---


--- openclonk-5.5.1-tinyxml-shared.patch DELETED ---


--- openclonk-target.patch DELETED ---