From c0cbb923cf4b49d518e52c784575043b2bcfa69e0046bd4732ab881eb9c428cc Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Dec 2015 13:33:10 +0000 Subject: [PATCH 01/15] update to (15.12.0) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=68 --- marble-15.08.3.tar.xz | 3 --- marble-15.12.0.tar.xz | 3 +++ marble.changes | 9 +++++++++ marble.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 marble-15.08.3.tar.xz create mode 100644 marble-15.12.0.tar.xz diff --git a/marble-15.08.3.tar.xz b/marble-15.08.3.tar.xz deleted file mode 100644 index fa0d7ba..0000000 --- a/marble-15.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:743131cd37e6c42b178497fa3cda012b926587b4ebc094bb7276e02fb4e62844 -size 23272964 diff --git a/marble-15.12.0.tar.xz b/marble-15.12.0.tar.xz new file mode 100644 index 0000000..d2ff035 --- /dev/null +++ b/marble-15.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6aa7f939a3221e2a40f62548d8af0718c10b6253a28472b233aeccc062b30d06 +size 23768584 diff --git a/marble.changes b/marble.changes index 2dfc4d7..3bb6b84 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Dec 13 13:32:37 UTC 2015 - tittiatcoke@gmail.com + +- 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 + + ------------------------------------------------------------------- Tue Nov 10 20:22:14 UTC 2015 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index c4b863c..d5948c8 100644 --- a/marble.spec +++ b/marble.spec @@ -18,7 +18,7 @@ %define _so -22 Name: marble -Version: 15.08.3 +Version: 15.12.0 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ From 87174fc01a8823543871f5e1967ae975d433f61a623bb3e58d0da12e14badc87 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Dec 2015 15:21:12 +0000 Subject: [PATCH 02/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=69 --- libmarblewidget.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmarblewidget.spec b/libmarblewidget.spec index cd57637..e2b5144 100644 --- a/libmarblewidget.spec +++ b/libmarblewidget.spec @@ -18,7 +18,7 @@ %define _so 22 Name: libmarblewidget -Version: 15.08.3 +Version: 15.12.0 Release: 0 Summary: Generic map viewer library for libkgeomapr License: LGPL-2.1+ From 000e5aecd41b5489245ccca5216bd554ccf5ad8133d82843c7d7b65a402713a6 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Dec 2015 15:22:23 +0000 Subject: [PATCH 03/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=70 --- libmarblewidget.changes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libmarblewidget.changes b/libmarblewidget.changes index 10dff70..1fe205f 100644 --- a/libmarblewidget.changes +++ b/libmarblewidget.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Dec 13 13:32:37 UTC 2015 - tittiatcoke@gmail.com + +- 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 + ------------------------------------------------------------------- Tue Nov 10 20:43:37 UTC 2015 - tittiatcoke@gmail.com From 39c57b545e273edaa6a0e19305c11bc704e7bcecc7c642a24e74c622c25a186e Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 14 Dec 2015 18:04:21 +0000 Subject: [PATCH 04/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=71 --- marble.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/marble.changes b/marble.changes index 3bb6b84..73b5016 100644 --- a/marble.changes +++ b/marble.changes @@ -5,7 +5,8 @@ Sun Dec 13 13:32:37 UTC 2015 - tittiatcoke@gmail.com * KDE Applications 15.12.0 * https://www.kde.org/announcements/announce-applications-15.12.0.php * boo#958887 - +- Drop upstreamed patch + * fix-libastro-version-tagging.diff ------------------------------------------------------------------- Tue Nov 10 20:22:14 UTC 2015 - tittiatcoke@gmail.com From 34eebf0b03b86ed583440bb1e5a6fb5d2123c3c2a1f81ce3647feaab93eb1897 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 14 Dec 2015 18:04:51 +0000 Subject: [PATCH 05/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=72 --- marble.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/marble.spec b/marble.spec index d5948c8..812df0d 100644 --- a/marble.spec +++ b/marble.spec @@ -25,8 +25,6 @@ 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 alarrosa@suse.com -- Declare QT_NO_VERSION_TAGGING -Patch0: fix-libastro-version-tagging.diff # PATCH-FIX-OPENSUSE make_astro_coinstall.diff tittiatcoke@gmail.com -- Make astro coinstallable with its Qt4 version Patch1: make_astro_coinstall.diff BuildRequires: fdupes @@ -135,7 +133,6 @@ The Astronomy shared library for the MarbleWidget shared library. %prep %setup -q -%patch0 -p1 %patch1 -p1 %build From e2dc5b859bb342b74842fa35f2ffa119c201c2d4230da1b286fee25a3724bf63 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 15 Dec 2015 15:43:43 +0000 Subject: [PATCH 06/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=73 --- make_astro_coinstall.diff | 196 +++++++++++++++++++------------------- 1 file changed, 96 insertions(+), 100 deletions(-) diff --git a/make_astro_coinstall.diff b/make_astro_coinstall.diff index 907f55f..1a6cd95 100644 --- a/make_astro_coinstall.diff +++ b/make_astro_coinstall.diff @@ -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) +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 @@ - 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 + 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 @@ diff -urB marble-15.08.2/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble- 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 @@ diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLis -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 @@ diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLis 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() From ee03a6071bb5ce3b7a81186de3a3002c43495039465821c5bfe132ecadf6497b Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 15 Dec 2015 18:53:13 +0000 Subject: [PATCH 07/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=74 --- marble.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marble.spec b/marble.spec index 812df0d..3b3ee7e 100644 --- a/marble.spec +++ b/marble.spec @@ -51,6 +51,7 @@ BuildRequires: kf5-filesystem BuildRequires: extra-cmake-modules BuildRequires: kwallet-devel BuildRequires: knewstuff-devel +BuildRequires: kcrash-devel BuildRequires: kparts-devel BuildRequires: kcoreaddons-devel BuildRequires: kdoctools-devel @@ -155,6 +156,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ -DECM_MKSPECS_INSTALL_DIR=%{_kf5_mkspecsdir} \ -DBUILD_TESTING=OFF \ -DBUILD_MARBLE_TESTS=NO \ + -DMOBILE=FALSE \ -DWITH_KF5=TRUE \ .. %make_jobs @@ -162,10 +164,8 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %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} From 74844ed6406ecf9457278bee2650c8c86bfdcadeb71aef213ee510c2841c85f0 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 15 Dec 2015 19:18:32 +0000 Subject: [PATCH 08/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=75 --- marble.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/marble.spec b/marble.spec index 3b3ee7e..92d75c6 100644 --- a/marble.spec +++ b/marble.spec @@ -192,6 +192,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_kf5_configkcfgdir}/ %{_kf5_iconsdir}/hicolor/*/apps/marble.* %{_kf5_kxmlguidir}/marble/ +%_libdir/libmarbledeclarative.so %{_kf5_libdir}/marble/ %{_kf5_libdir}/plugins/designer/ %{_kf5_plugindir}/libmarble*so From 6827bfdf56ab7224731e85750f3eb9f99c68c160b14201ac8c00e40a99fb2853 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 15 Dec 2015 19:43:12 +0000 Subject: [PATCH 09/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=76 --- marble.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marble.spec b/marble.spec index 92d75c6..bb50bf6 100644 --- a/marble.spec +++ b/marble.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define _so -22 +%define _so -23 Name: marble Version: 15.12.0 From d4f2322661a4070a698b3547b500e7d4a13e3a7e4a18178fe0ab34eec71202ca Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 21 Dec 2015 08:34:07 +0000 Subject: [PATCH 10/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=77 --- fix-libastro-version-tagging.diff | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 fix-libastro-version-tagging.diff diff --git a/fix-libastro-version-tagging.diff b/fix-libastro-version-tagging.diff deleted file mode 100644 index 274ea76..0000000 --- a/fix-libastro-version-tagging.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: marble-15.08.1/src/lib/astro/astrolib_export.h -=================================================================== ---- marble-15.08.1.orig/src/lib/astro/astrolib_export.h -+++ marble-15.08.1/src/lib/astro/astrolib_export.h -@@ -11,6 +11,8 @@ - #ifndef ASTROLIB_EXPORT_H - #define ASTROLIB_EXPORT_H - -+#define QT_NO_VERSION_TAGGING 1 -+ - #include - - #ifndef ASTROLIB_EXPORT From 56541708908c5f8a12d1b1e78c8e3da9d736d6b0373d52bb70b7c71d4c38367d Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 21 Dec 2015 08:34:33 +0000 Subject: [PATCH 11/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=78 --- libmarblewidget.spec | 117 ------------------------------------------- 1 file changed, 117 deletions(-) delete mode 100644 libmarblewidget.spec diff --git a/libmarblewidget.spec b/libmarblewidget.spec deleted file mode 100644 index e2b5144..0000000 --- a/libmarblewidget.spec +++ /dev/null @@ -1,117 +0,0 @@ -# -# spec file for package libmarblewidget -# -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -%define _so 22 - -Name: libmarblewidget -Version: 15.12.0 -Release: 0 -Summary: Generic map viewer library for libkgeomapr -License: LGPL-2.1+ -Group: Amusements/Teaching/Other -Url: http://edu.kde.org -Source0: marble-%{version}.tar.xz -BuildRequires: fdupes -BuildRequires: gpsd-devel -BuildRequires: perl -BuildRequires: libkde4-devel -BuildRequires: quazip-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -The shared library for the MarbleWidget shared library. - -%package devel -Summary: Generic map viewer: Build Environment -Group: Development/Libraries/KDE -Requires: libmarblewidget%{_so} = %{version} -Requires: libastro1 = %{version} -Conflicts: marble-devel - -%description devel -Development headers and libraries for Marble. - -%package -n libmarblewidget%{_so} -Summary: Generic map viewer: Shared Library -Group: Development/Libraries/KDE - -%description -n libmarblewidget%{_so} -The shared library for the MarbleWidget shared library. - -%package -n libastro1 -Summary: Astronomy: Shared Library -Group: Development/Libraries/KDE - -%description -n libastro1 -The Astronomy shared library for the MarbleWidget shared library. - -%prep -%setup -q -n marble-%{version} - -%build -%ifarch ppc ppc64 -export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" -%endif -%cmake_kde4 -d build -- -DQT5BUILD=OFF -pushd src/lib/marble -make -popd -pushd src/lib/astro -make - - -%install - pushd build/src/lib/marble - %kde4_makeinstall - popd - pushd build/src/lib/astro - %kde4_makeinstall - popd - mkdir -p %{buildroot}%{_kde4_appsdir}/cmake/modules - cp build/FindMarble.cmake %{buildroot}%{_kde4_appsdir}/cmake/modules/ - %fdupes -s %{buildroot} - -%post -n libmarblewidget%{_so} -p /sbin/ldconfig - -%postun -n libmarblewidget%{_so} -p /sbin/ldconfig - - -%post -n libastro1 -p /sbin/ldconfig - -%postun -n libastro1 -p /sbin/ldconfig - -%files devel -%defattr(-,root,root) -%doc BUGS CODING -%{_includedir}/marble/ -%{_includedir}/astro/ -%{_libdir}/libmarblewidget.so -%{_libdir}/libastro.so -%{_kde4_appsdir}/cmake/modules/FindMarble.cmake - -%files -n libmarblewidget%{_so} -%defattr(-,root,root) -%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt -%{_libdir}/libmarblewidget.so.* - -%files -n libastro1 -%defattr(-,root,root) -%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt -%{_libdir}/libastro.so.* - - -%changelog From 97bc5534cb568ea021d153c60dd634554e3fdeb1f6edd8a40127c40be36587fb Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 21 Dec 2015 08:34:36 +0000 Subject: [PATCH 12/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=79 --- libmarblewidget.changes | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 libmarblewidget.changes diff --git a/libmarblewidget.changes b/libmarblewidget.changes deleted file mode 100644 index 1fe205f..0000000 --- a/libmarblewidget.changes +++ /dev/null @@ -1,40 +0,0 @@ -------------------------------------------------------------------- -Sun Dec 13 13:32:37 UTC 2015 - tittiatcoke@gmail.com - -- 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 - -------------------------------------------------------------------- -Tue Nov 10 20:43:37 UTC 2015 - tittiatcoke@gmail.com - -- Update to KDE Applications 15.08.3 - * KDE Applications 15.08.3 - * https://www.kde.org/announcements/announce-applications-15.08.3.php - * boo#954531 - - -------------------------------------------------------------------- -Sun Oct 11 13:45:17 UTC 2015 - tittiatcoke@gmail.com - -- Update to KDE Applications 15.08.2 - * KDE Applications 15.08.2 - * https://www.kde.org/announcements/announce-applications-15.08.2.php - -- Include libastro due to dependencies - -------------------------------------------------------------------- -Sun Sep 13 19:43:47 UTC 2015 - tittiatcoke@gmail.com - -- Update to KDE Applications 15.08.1 - * KDE Applications 15.08.1 - * https://www.kde.org/announcements/announce-applications-15.08.1.php - -- Drop upstream patch marble_fix_ppc64_build.patch -------------------------------------------------------------------- -Sun Aug 30 18:20:17 UTC 2015 - tittiatcoke@gmail.com - -- Initial package to fullfil the buildrequirements for libkgeomap - as it is still based on Qt4 - From 7672431791a4d88dff15052fd9b791ed12ff0de01ab8d09f9cf3c6793ae06886 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 2 Jan 2016 15:50:35 +0000 Subject: [PATCH 13/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=80 --- marble.changes | 2 -- 1 file changed, 2 deletions(-) diff --git a/marble.changes b/marble.changes index 73b5016..816beb5 100644 --- a/marble.changes +++ b/marble.changes @@ -5,8 +5,6 @@ Sun Dec 13 13:32:37 UTC 2015 - tittiatcoke@gmail.com * KDE Applications 15.12.0 * https://www.kde.org/announcements/announce-applications-15.12.0.php * boo#958887 -- Drop upstreamed patch - * fix-libastro-version-tagging.diff ------------------------------------------------------------------- Tue Nov 10 20:22:14 UTC 2015 - tittiatcoke@gmail.com From 57d3509beecaab1ee4d0cc06d71d8cd841e949da85f7170da8bae77ef6d0f7ee Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 2 Jan 2016 15:57:24 +0000 Subject: [PATCH 14/15] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=81 --- marble.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/marble.changes b/marble.changes index 816beb5..a87fdaa 100644 --- a/marble.changes +++ b/marble.changes @@ -6,6 +6,8 @@ Sun Dec 13 13:32:37 UTC 2015 - tittiatcoke@gmail.com * https://www.kde.org/announcements/announce-applications-15.12.0.php * boo#958887 +- Drop upstreamed patches: + * fix-libastro-version-tagging.diff ------------------------------------------------------------------- Tue Nov 10 20:22:14 UTC 2015 - tittiatcoke@gmail.com From e2edefeb933912e4fbce7d7ab1c7e48647840f3d8cf1e99e8d8c6bf1c36cc9e8 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 9 Jan 2016 18:35:24 +0000 Subject: [PATCH 15/15] update to (15.12.1) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=82 --- marble-15.12.0.tar.xz | 3 --- marble-15.12.1.tar.xz | 3 +++ marble.changes | 9 +++++++++ marble.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 marble-15.12.0.tar.xz create mode 100644 marble-15.12.1.tar.xz diff --git a/marble-15.12.0.tar.xz b/marble-15.12.0.tar.xz deleted file mode 100644 index d2ff035..0000000 --- a/marble-15.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6aa7f939a3221e2a40f62548d8af0718c10b6253a28472b233aeccc062b30d06 -size 23768584 diff --git a/marble-15.12.1.tar.xz b/marble-15.12.1.tar.xz new file mode 100644 index 0000000..a64a9f3 --- /dev/null +++ b/marble-15.12.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:957297f5187f5e4f75d5a1379742bc4fd0d5c72b7e906d951d1828246a5bfe97 +size 23768028 diff --git a/marble.changes b/marble.changes index a87fdaa..412c549 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Jan 9 18:34:52 UTC 2016 - tittiatcoke@gmail.com + +- 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 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index bb50bf6..cc87c9a 100644 --- a/marble.spec +++ b/marble.spec @@ -18,7 +18,7 @@ %define _so -23 Name: marble -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: Generic map viewer License: LGPL-2.1+