Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at 2016-01-23 01:10:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marble (Old) and /work/SRC/openSUSE:Factory/.marble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "marble" Changes: -------- --- /work/SRC/openSUSE:Factory/marble/marble.changes 2015-11-15 12:43:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.marble.new/marble.changes 2016-01-23 01:10:09.000000000 +0100 @@ -1,0 +2,19 @@ +Sat Jan 9 18:34:52 UTC 2016 - [email protected] + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- +Sun Dec 13 13:32:37 UTC 2015 - [email protected] + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + +- Drop upstreamed patches: + * fix-libastro-version-tagging.diff +------------------------------------------------------------------- Old: ---- fix-libastro-version-tagging.diff libmarblewidget.changes libmarblewidget.spec marble-15.08.3.tar.xz New: ---- marble-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.LtITXt/_old 2016-01-23 01:10:11.000000000 +0100 +++ /var/tmp/diff_new_pack.LtITXt/_new 2016-01-23 01:10:11.000000000 +0100 @@ -15,18 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define _so -22 +%define _so -23 Name: marble -Version: 15.08.3 +Version: 15.12.1 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE fix-libastro-version-tagging.diff [email protected] -- Declare QT_NO_VERSION_TAGGING -Patch0: fix-libastro-version-tagging.diff # PATCH-FIX-OPENSUSE make_astro_coinstall.diff [email protected] -- Make astro coinstallable with its Qt4 version Patch1: make_astro_coinstall.diff BuildRequires: fdupes @@ -53,6 +51,7 @@ BuildRequires: extra-cmake-modules BuildRequires: kwallet-devel BuildRequires: knewstuff-devel +BuildRequires: kcrash-devel BuildRequires: kparts-devel BuildRequires: kcoreaddons-devel BuildRequires: kdoctools-devel @@ -135,7 +134,6 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %build @@ -158,6 +156,7 @@ -DECM_MKSPECS_INSTALL_DIR=%{_kf5_mkspecsdir} \ -DBUILD_TESTING=OFF \ -DBUILD_MARBLE_TESTS=NO \ + -DMOBILE=FALSE \ -DWITH_KF5=TRUE \ .. %make_jobs @@ -165,10 +164,8 @@ %install %kf5_makeinstall -C build %fdupes -s %{buildroot} - rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop rm -rf %{buildroot}/designer - rm -rf %{buildroot}%{_kf5_bindir}/marble-mobile rm -rf %{buildroot}%{_kf5_bindir}/marble-touch %fdupes -s %{buildroot} @@ -195,6 +192,7 @@ %{_kf5_configkcfgdir}/ %{_kf5_iconsdir}/hicolor/*/apps/marble.* %{_kf5_kxmlguidir}/marble/ +%_libdir/libmarbledeclarative.so %{_kf5_libdir}/marble/ %{_kf5_libdir}/plugins/designer/ %{_kf5_plugindir}/libmarble*so ++++++ make_astro_coinstall.diff ++++++ --- /var/tmp/diff_new_pack.LtITXt/_old 2016-01-23 01:10:11.000000000 +0100 +++ /var/tmp/diff_new_pack.LtITXt/_new 2016-01-23 01:10:11.000000000 +0100 @@ -1,25 +1,38 @@ -diff -urB marble-15.08.2/CMakeLists.txt new/CMakeLists.txt ---- marble-15.08.2/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -121,6 +121,7 @@ - cmake_minimum_required(VERSION 2.8.12) - set(QT4BUILD FALSE) - set(MARBLEWIDGET marblewidget-qt5) -+ set(ASTRO astro-qt5) - - include_directories( ${Qt5Svg_INCLUDE_DIRS} ) - include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} ) -@@ -135,6 +136,7 @@ - set(WITH_KF5 FALSE) - set(QT4BUILD TRUE) - set(MARBLEWIDGET marblewidget) -+ set(ASTRO astro) - find_package(Qt4 REQUIRED) - set( QT_USE_QTXML ON ) - set( QT_USE_QTNETWORK ON ) -diff -urB marble-15.08.2/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt ---- marble-15.08.2/src/apps/marble-kde/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/apps/marble-kde/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 +diff -urB marble/CMakeLists.txt new/CMakeLists.txt +--- marble/CMakeLists.txt 2015-10-23 19:36:58.656015667 +0200 ++++ new/CMakeLists.txt 2015-10-23 19:39:18.128704325 +0200 +@@ -94,6 +94,7 @@ + + cmake_minimum_required(VERSION 2.8.12) + set(MARBLEWIDGET marblewidget-qt5) ++set(ASTRO astro-qt5) + + include_directories( ${Qt5Svg_INCLUDE_DIRS} ) + include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} ) +diff -urB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt +--- marble/src/apps/behaim/CMakeLists.txt 2015-10-23 19:36:58.892016832 +0200 ++++ new/src/apps/behaim/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +@@ -29,7 +29,7 @@ + ${Qt5Positioning_LIBRARIES} + ${Qt5AndroidExtras_LIBRARIES} + ${Qt5Multimedia_LIBRARIES} +- astro ++ ${ASTRO} + ${MARBLEWIDGET} + marbledeclarative) + +@@ -47,7 +47,7 @@ + set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK}) + set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK}) + set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarbleBehaim.so") +- set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") ++ set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") + set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package") + set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.behaim") + set(QT_ANDROID_APP_NAME "Marble Globe: Behaim's Erdapfel") +diff -urB marble/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt +--- marble/src/apps/marble-kde/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200 ++++ new/src/apps/marble-kde/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 @@ -54,7 +54,7 @@ marble marbleui @@ -29,52 +42,43 @@ KF5::NewStuff KF5::Wallet KF5::Parts -diff -urB marble-15.08.2/src/apps/marble_maps/CMakeLists.txt new/src/apps/marble_maps/CMakeLists.txt ---- marble-15.08.2/src/apps/marble_maps/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/apps/marble_maps/CMakeLists.txt 2015-10-11 18:06:50.981995015 +0200 -@@ -14,7 +14,7 @@ - ${Qt5WebKitWidgets_LIBRARIES} - ${Qt5WebKit_LIBRARIES} +diff -urB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt +--- marble/src/apps/marble-maps/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200 ++++ new/src/apps/marble-maps/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +@@ -29,7 +29,7 @@ + ${Qt5Positioning_LIBRARIES} + ${Qt5AndroidExtras_LIBRARIES} + ${Qt5Multimedia_LIBRARIES} +- astro ++ ${ASTRO} ${MARBLEWIDGET} -- astro) -+ ${ASTRO}) - - file(COPY "../../../data" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/assets") - file(COPY "../../../data/android/drawable-ldpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res") -@@ -32,7 +32,7 @@ - PACKAGE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/package" - PACKAGE_NAME org.kde.marble.maps - ${KEYSTORE_OPTIONS} -- DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro.so" -+ DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro-qt5.so" - ) + marbledeclarative) - # Move target from default build to install phase so we can create everything in one go -diff -urB marble-15.08.2/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt ---- marble-15.08.2/src/apps/marble-qt/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/apps/marble-qt/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -40,7 +40,7 @@ - ${QT_QTDBUS_LIBRARY} - marbleui - ${MARBLEWIDGET} -- astro) -+ ${ASTRO}) - else() - target_link_libraries ( - marble-qt -@@ -53,7 +53,7 @@ - ${Qt5WebKit_LIBRARIES} - marbleui - ${MARBLEWIDGET} -- astro) -+ ${ASTRO}) - endif() +@@ -47,7 +47,7 @@ + set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK}) + set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK}) + set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarble.so") +- set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") ++ set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so") + set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package") + set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.maps") + set(QT_ANDROID_APP_NAME "Marble Maps") +diff -urB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt +--- marble/src/apps/marble-qt/CMakeLists.txt 2015-10-23 19:36:58.896016851 +0200 ++++ new/src/apps/marble-qt/CMakeLists.txt 2015-10-23 19:40:22.905024163 +0200 +@@ -34,7 +34,7 @@ + ${Qt5WebKit_LIBRARIES} + marbleui + ${MARBLEWIDGET} +-astro) ++${ASTRO}) if(WIN32) -diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt ---- marble-15.08.2/src/lib/astro/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/lib/astro/CMakeLists.txt 2015-10-11 18:08:05.239677950 +0200 -@@ -20,23 +20,23 @@ + target_link_libraries( +diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt +--- marble/src/lib/astro/CMakeLists.txt 2015-10-23 19:36:58.908016911 +0200 ++++ new/src/lib/astro/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +@@ -21,27 +21,27 @@ solarsystem.cpp ) @@ -100,10 +104,15 @@ -SET_TARGET_PROPERTIES(astro PROPERTIES +SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES - VERSION ${GENERIC_LIB_VERSION} - SOVERSION ${GENERIC_LIB_SOVERSION} - DEFINE_SYMBOL MAKE_ASTRO_LIB # needed for astrolib_export.h -@@ -44,11 +44,11 @@ + DEFINE_SYMBOL MAKE_ASTRO_LIB # needed for astrolib_export.h + ) + if(NOT CMAKE_SYSTEM_NAME STREQUAL Android) +- SET_TARGET_PROPERTIES(astro PROPERTIES ++ SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES + VERSION ${GENERIC_LIB_VERSION} + SOVERSION ${GENERIC_LIB_SOVERSION} + ) +@@ -49,11 +49,11 @@ # choose the correct target install library path if(WIN32) @@ -118,55 +127,42 @@ endif() ########### install files ############### -diff -urB marble-15.08.2/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt ---- marble-15.08.2/src/lib/marble/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/lib/marble/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -372,7 +372,7 @@ +diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt +--- marble/src/lib/marble/CMakeLists.txt 2015-10-23 19:36:58.912016931 +0200 ++++ new/src/lib/marble/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +@@ -364,7 +364,7 @@ ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS}) # link with libastro -TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro) +TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ASTRO}) - # link with release version of Qt libs - if( QT4BUILD ) -diff -urB marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt ---- marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/plugins/render/eclipses/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -26,4 +26,4 @@ + # link against zlib + TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ZLIB_LIBRARIES}) +diff -urB marble/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt +--- marble/src/plugins/render/eclipses/CMakeLists.txt 2015-10-23 19:36:58.964017187 +0200 ++++ new/src/plugins/render/eclipses/CMakeLists.txt 2015-10-23 19:37:28.732164170 +0200 +@@ -22,4 +22,4 @@ marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} ) -target_link_libraries( EclipsesPlugin astro ) +target_link_libraries( EclipsesPlugin ${ASTRO} ) -diff -urB marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt ---- marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/plugins/render/satellites/CMakeLists.txt 2015-10-11 18:08:39.680458497 +0200 -@@ -37,4 +37,4 @@ +diff -urB marble/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt +--- marble/src/plugins/render/satellites/CMakeLists.txt 2015-10-23 19:36:58.972017228 +0200 ++++ new/src/plugins/render/satellites/CMakeLists.txt 2015-10-23 19:37:28.736164190 +0200 +@@ -30,4 +30,4 @@ ${satellites_SRCS} ${sgp4_SRCS} ) --target_link_libraries( SatellitesPlugin astro ) -+target_link_libraries( SatellitesPlugin ${ASTRO} ) -diff -urB marble-15.08.2/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt ---- marble-15.08.2/src/plugins/render/stars/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/src/plugins/render/stars/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -16,4 +16,4 @@ +-target_link_libraries( SatellitesPlugin astro sgp4 ) ++target_link_libraries( SatellitesPlugin ${ASTRO} sgp4 ) +diff -urB marble/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt +--- marble/src/plugins/render/stars/CMakeLists.txt 2015-10-23 19:36:58.976017247 +0200 ++++ new/src/plugins/render/stars/CMakeLists.txt 2015-10-23 19:37:28.736164190 +0200 +@@ -13,4 +13,4 @@ qt_wrap_ui(stars_SRCS ${stars_UI}) marble_add_plugin( StarsPlugin ${stars_SRCS} ) -target_link_libraries( StarsPlugin astro ) +target_link_libraries( StarsPlugin ${ASTRO} ) -diff -urB marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt new/tools/osm-sisyphus/CMakeLists.txt ---- marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt 2015-10-02 14:41:37.000000000 +0200 -+++ new/tools/osm-sisyphus/CMakeLists.txt 2015-10-11 18:05:32.988227408 +0200 -@@ -24,7 +24,7 @@ - add_executable( ${TARGET} ${${TARGET}_SRC} ) - - if(QT4BUILD) -- target_link_libraries( ${TARGET} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTSQL_LIBRARY} marblewidget ) -+ target_link_libraries( ${TARGET} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTSQL_LIBRARY} ${MARBLEWIDGET} ) - else() -- target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} marblewidget-qt5 ) -+ target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} ${MARBLEWIDGET} ) - endif() ++++++ marble-15.08.3.tar.xz -> marble-15.12.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/marble/marble-15.08.3.tar.xz /work/SRC/openSUSE:Factory/.marble.new/marble-15.12.1.tar.xz differ: char 26, line 1
