Author: martinkg Update of /cvs/nonfree/rpms/openclonk/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2554/devel Modified Files: .cvsignore openclonk.spec sources Added Files: openclonk-6.1-target.patch Removed Files: openclonk-6.0-target.patch Log Message: openclonk-6.1-target.patch: CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE openclonk-6.1-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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Mar 2015 20:57:14 -0000 1.3 +++ .cvsignore 29 Oct 2015 21:09:27 -0000 1.4 @@ -1 +1 @@ -openclonk-6.0-src.tar.bz2 +openclonk-6.1-src.tar.bz2 Index: openclonk.spec =================================================================== RCS file: /cvs/nonfree/rpms/openclonk/devel/openclonk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openclonk.spec 16 Mar 2015 20:57:15 -0000 1.2 +++ openclonk.spec 29 Oct 2015 21:09:27 -0000 1.3 @@ -1,7 +1,7 @@ %global develdocdir %{_docdir}/%{name}-devel/html Name: openclonk -Version: 6.0 +Version: 6.1 Release: 1%{?dist} Summary: Fast-paced 2d genre mix License: ISC and CC-BY-SA @@ -73,7 +73,7 @@ This package contains documentation needed for developing with %{name}. %prep -%setup -q -n %{name}-release-%{version}-src +%setup -q -n %{name}-%{version}-src %patch0 -p1 -b .target # remove bundled tinyxml @@ -97,7 +97,7 @@ %build %cmake -DUSE_STATIC_BOOST=OFF \ - -DWITH_SYSTEM_TINYXML=ON \ + -DUSE_SYSTEM_TINYXML=ON \ -DBUILD_SHARED_LIBS=OFF make %{?_smp_mflags} @@ -176,6 +176,9 @@ %{_datadir}/pixmaps/%{name}-docs.png %changelog +* Wed Oct 21 2015 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 6.1-1 +- Update to 6.1 + * Mon Mar 16 2015 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 6.0-1 - Update to 6.0 - correct %%license tag Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/openclonk/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Mar 2015 20:57:15 -0000 1.3 +++ sources 29 Oct 2015 21:09:27 -0000 1.4 @@ -1 +1 @@ -3e0dd1c5f60df0d37dbbb12b7ef5c38b openclonk-6.0-src.tar.bz2 +4d2b93bc4e0e5e97ee35b890838316b8 openclonk-6.1-src.tar.bz2 --- openclonk-6.0-target.patch DELETED ---