Hello community, here is the log from the commit of package openclonk for openSUSE:Factory checked in at 2018-06-29 22:24:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openclonk (Old) and /work/SRC/openSUSE:Factory/.openclonk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openclonk" Fri Jun 29 22:24:16 2018 rev:4 rq:615721 version:8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/openclonk/openclonk.changes 2018-06-02 12:10:03.356594386 +0200 +++ /work/SRC/openSUSE:Factory/.openclonk.new/openclonk.changes 2018-06-29 22:24:40.978561240 +0200 @@ -1,0 +2,41 @@ +Sat Jun 2 07:22:07 UTC 2018 - [email protected] + +- Update to version 8.1: + * No changelog provided. +- Update to version 8.0: + * New editor. + * Improved networking: + + Added support for IPv6. + + Implemented UDP hole punching. + * New scenarios: + + I am rich: A competetive gold mine round, where the richest + player after a certain playing time wins. + + Aerobatics: A rather chaotic parkour, where you sky island + hopping skills are put to the test. + + Melting Castle: A team melee where you have to defend an ice + castle, but beware: it melts! + + King of the Hill: Defend the ruby mine hidden inside the hill + from enemy AI waves. + + Horrid Highway: A settlement world in which the players need + to create a rail road in the skies, while protecting against + heavy meteor rain. + + Rapid Refining: A laid-back settlement round where you need + to set up a large oil-pumping operation. + + Hot Ice: While not entirely new, Hot Ice now features games + with multiple rounds as well as two additional visual themes. + * Scripts improvements: + + New proplist prototype and effect syntax. + + Script-defined dynamic fragment shaders allow special effects + in scenarios. + + Regular expression-based functions for matching, splitting, + and replacing strings allow advanced text processing from + scripts. + + Additional warnings that can be disabled with a directive. +- Build against SDL2 instead of SDL1. +- Rebase fixCMakeLists.patch. +- Drop upstreamed patches: + * appdata.patch. + * reproducible.patch. +- Create data subpackage. + +------------------------------------------------------------------- Old: ---- appdata.patch openclonk-7.0-src.tar.bz2 reproducible.patch New: ---- openclonk-8.1-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openclonk.spec ++++++ --- /var/tmp/diff_new_pack.kRA5fK/_old 2018-06-29 22:24:43.238559541 +0200 +++ /var/tmp/diff_new_pack.kRA5fK/_new 2018-06-29 22:24:43.242559538 +0200 @@ -17,31 +17,25 @@ Name: openclonk -Version: 7.0 +Version: 8.1 Release: 0 Summary: Fast-paced 2D genre mix License: ISC AND CC-BY-3.0 Group: Amusements/Games/Action/Other Url: http://www.openclonk.org/ Source: http://www.openclonk.org/builds/release/%{version}/%{name}-%{version}-src.tar.bz2 -# PATCH-FEATURE-UPSTREAM https://github.com/openclonk/openclonk/pull/25 -Patch0: appdata.patch # PATCH-FIX-UPSTREAM Fix https://github.com/openclonk/openclonk/pull/26 Patch1: fix-CMakeLists.patch -# PATCH-FIX-UPSTREAM - make package build reproducible (boo#1047218) -Patch2: reproducible.patch -BuildRequires: boost-devel -BuildRequires: cmake >= 2.8.10 -BuildRequires: googletest-devel +BuildRequires: cmake >= 3.0.2 BuildRequires: hicolor-icon-theme BuildRequires: libjpeg-devel -BuildRequires: make BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: shared-mime-info BuildRequires: tinyxml-devel BuildRequires: update-desktop-files -BuildRequires: pkgconfig(SDL_mixer) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(SDL2_mixer) BuildRequires: pkgconfig(dri) BuildRequires: pkgconfig(freealut) BuildRequires: pkgconfig(freetype2) @@ -52,19 +46,19 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(ogg) -BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} == 1315 BuildRequires: gcc5-c++ %else BuildRequires: gcc-c++ >= 4.9 %endif +Requires: %{name}-data = %{version} %description Clonks are witty and nimble human-like creatures. @@ -72,11 +66,17 @@ real-time and in direct control, alone, with or versus other players. +%package data +Summary: Data files for %{name} +Group: Amusements/Games/Action/Other +BuildArch: noarch + +%description data +This package contains the data files for %{name}. + %prep -%setup -q -n %{name}-%{version}-src -%patch0 -p1 +%setup -q -n %{name}-release-%{version}-src %patch1 -p1 -%patch2 -p1 rm -rf planet/Tests.c4f chmod 644 COPYING TRADEMARK @@ -85,8 +85,9 @@ %cmake \ -DOC_SYSTEM_DATA_DIR=%{_datadir}/%{name} \ -DOC_SYSTEM_GAMES_DIR=%{_bindir} \ - -DUSE_STATIC_BOOST=OFF \ -DCMAKE_CONFIGURATION_TYPE=RelWithDebInfo \ + -DUSE_GCC_STYLE_LTCG:BOOL=OFF \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ %if 0%{?suse_version} == 1315 -DCMAKE_C_COMPILER=gcc-5 \ -DCMAKE_CXX_COMPILER=g++-5 @@ -97,6 +98,7 @@ %install %cmake_install +%if 0%{?suse_version} < 1330 %post %desktop_database_post %icon_theme_cache_post @@ -106,23 +108,24 @@ %desktop_database_postun %icon_theme_cache_postun %mime_database_postun +%endif %files -%defattr(-,root,root,-) %doc TRADEMARK +%license COPYING %{_bindir}/%{name} %{_bindir}/c4group %{_datadir}/appdata/openclonk.appdata.xml %{_datadir}/applications/openclonk.desktop %{_datadir}/icons/hicolor/*/apps/openclonk.png -%{_datadir}/%{name} %if 0%{?suse_version} <= 1320 -%doc COPYING %dir %{_datadir}/appdata/ %dir %{_datadir}/icons/hicolor/512x512 %dir %{_datadir}/icons/hicolor/512x512/apps -%else -%license COPYING %endif +%files data +%license COPYING +%{_datadir}/%{name} + %changelog ++++++ fix-CMakeLists.patch ++++++ --- /var/tmp/diff_new_pack.kRA5fK/_old 2018-06-29 22:24:43.254559529 +0200 +++ /var/tmp/diff_new_pack.kRA5fK/_new 2018-06-29 22:24:43.254559529 +0200 @@ -1,25 +1,25 @@ -diff -Nur oc/CMakeLists.txt new/CMakeLists.txt ---- oc/CMakeLists.txt 2016-08-28 11:12:19.530163468 +0200 -+++ new/CMakeLists.txt 2016-08-28 11:15:06.051516654 +0200 -@@ -38,6 +38,8 @@ - CMAKE_DEPENDENT_OPTION(USE_GTK "Use GTK for the developer mode" ON "USE_X11" OFF) - CMAKE_DEPENDENT_OPTION(USE_COCOA "Use Apple Cocoa for the developer mode and the windows." ON "APPLE" OFF) +diff -up openclonk-release-8.1-src/CMakeLists.txt.orig openclonk-release-8.1-src/CMakeLists.txt +--- openclonk-release-8.1-src/CMakeLists.txt.orig 2018-06-01 21:32:58.860958303 +0200 ++++ openclonk-release-8.1-src/CMakeLists.txt 2018-06-01 21:42:04.568980927 +0200 +@@ -48,6 +48,8 @@ CMAKE_DEPENDENT_OPTION(USE_WIN32_WINDOWS + CMAKE_DEPENDENT_OPTION(USE_SDL_MAINLOOP "Use SDL to create windows etc. Qt editor." ON "NOT USE_COCOA AND NOT USE_WIN32_WINDOWS AND NOT HEADLESS_ONLY" OFF) option(WITH_AUTOMATIC_UPDATE "Automatic updates are downloaded from the project website." OFF) + option(HEADLESS_ONLY "Only build headless parts. Somewhat reduces dependencies. (still needs libpng because that one's small and hard to remove.) Only tested with make/gcc/linux." OFF) +set(OC_SYSTEM_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/games/openclonk" CACHE PATH "Path to openclonk datafiles on system.") +set(OC_SYSTEM_GAMES_DIR "${CMAKE_INSTALL_PREFIX}/games" CACHE PATH "Path to where to install games on the system.") - ############################################################################ - # Assemble compiler flags -@@ -100,7 +102,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. + set_property(GLOBAL PROPERTY USE_FOLDERS ${PROJECT_FOLDERS}) + +@@ -167,7 +169,7 @@ if(WIN32 AND MINGW) + endif() + + if(UNIX) - add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"") + add_definitions("-DOC_SYSTEM_DATA_DIR=\"${OC_SYSTEM_DATA_DIR}\"") endif() if(APPLE) -@@ -143,8 +145,8 @@ +@@ -187,8 +189,8 @@ include(CheckCXXSourceCompiles) include(RequireCXXSourceCompiles) include(CheckCXXSymbolExists) @@ -30,16 +30,7 @@ REQUIRE_CXX_SOURCE_COMPILES("#include <memory>\nint main() { auto a = std::make_unique<int>(0); return !!a; }" HAVE_MAKE_UNIQUE) REQUIRE_CXX_SOURCE_COMPILES("#include <utility>\ntemplate<std::size_t... Is> int foo(std::index_sequence<Is...>) {return 0;} int main() { return foo(std::index_sequence_for<int,int>{}); }" HAVE_INDEX_SEQUENCE) REQUIRE_CXX_SOURCE_COMPILES("template<class... T> class C; int main() { return 0; }" HAVE_VARIADIC_TEMPLATES) -@@ -154,7 +156,7 @@ - # implementation for some things (like std::regex_iterator). - # This needs to test *linking*, not compilation; cmake does both at the same - # time, so the test below works. --REQUIRE_CXX_SOURCE_COMPILES("#include <regex>\nint main() { std::cregex_iterator ri; }" HAVE_WORKING_REGEX " If you are using gcc, please update to gcc 4.9.") -+REQUIRE_CXX_SOURCE_COMPILES("#include <regex>\nint main() { std::cregex_iterator ri; return 0;}" HAVE_WORKING_REGEX " If you are using gcc, please update to gcc 4.9.") - check_cxx_symbol_exists(vasprintf stdio.h HAVE_VASPRINTF) - check_cxx_symbol_exists(__mingw_vasprintf stdio.h HAVE___MINGW_VASPRINTF) - -@@ -1011,7 +1013,7 @@ +@@ -990,7 +992,7 @@ include_directories(SYSTEM ############################################################################ add_definitions(-DHAVE_CONFIG_H) @@ -48,16 +39,16 @@ src/C4Include.cpp src/c4group/C4Group.cpp src/c4group/C4Group.h -@@ -1060,7 +1062,7 @@ +@@ -1055,7 +1057,7 @@ if(UNIX AND NOT APPLE) target_link_libraries(libmisc rt) endif() -add_library(libc4script +add_library(libc4script STATIC src/C4Include.cpp - src/c4group/C4GroupSet.cpp - src/c4group/C4GroupSet.h -@@ -1461,7 +1463,7 @@ + src/c4group/C4ComponentHost.cpp + src/c4group/C4ComponentHost.h +@@ -1537,13 +1539,13 @@ foreach(group ${OC_C4GROUPS}) DEPENDS "${native_c4group}" VERBATIM ) @@ -66,15 +57,22 @@ endif() endforeach() -@@ -1478,7 +1480,7 @@ - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.appdata.xml DESTINATION share/appdata) - - # Install binaries -- install(TARGETS openclonk DESTINATION games) -+ install(TARGETS openclonk DESTINATION "${OC_SYSTEM_GAMES_DIR}") - install(TARGETS c4group DESTINATION bin) - else() - install(TARGETS openclonk + if(NOT APPLE) + if(NOT HEADLESS_ONLY) +- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/planet/Music.ocg DESTINATION share/games/openclonk) ++ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/planet/Music.ocg DESTINATION "${OC_SYSTEM_DATA_DIR}") + endif() + # group files (game data) + add_custom_target(groups DEPENDS ${OC_C4GROUPS}) +@@ -1563,7 +1565,7 @@ if(NOT HEADLESS_ONLY) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.appdata.xml DESTINATION share/appdata) + + # Install binaries +- install(TARGETS openclonk DESTINATION games) ++ install(TARGETS openclonk DESTINATION "${OC_SYSTEM_GAMES_DIR}") + else() + install(TARGETS openclonk + BUNDLE DESTINATION . diff -Nur oc/thirdparty/getopt/CMakeLists.txt new/thirdparty/getopt/CMakeLists.txt --- oc/thirdparty/getopt/CMakeLists.txt 2016-01-15 21:56:57.000000000 +0100 +++ new/thirdparty/getopt/CMakeLists.txt 2016-08-28 22:40:12.661794806 +0200 ++++++ openclonk-7.0-src.tar.bz2 -> openclonk-8.1-src.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/openclonk/openclonk-7.0-src.tar.bz2 /work/SRC/openSUSE:Factory/.openclonk.new/openclonk-8.1-src.tar.bz2 differ: char 11, line 1
