From 52fe8b6be949aac84a4a11ab2c0470e477116a33cd0a711710a104ce998dd87c Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 11 Apr 2016 06:55:12 +0000 Subject: [PATCH 01/10] update to (16.03.90) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=88 --- marble-15.12.3.tar.xz | 3 --- marble-16.03.90.tar.xz | 3 +++ marble.changes | 8 ++++++++ marble.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 marble-15.12.3.tar.xz create mode 100644 marble-16.03.90.tar.xz diff --git a/marble-15.12.3.tar.xz b/marble-15.12.3.tar.xz deleted file mode 100644 index 40f1d0a..0000000 --- a/marble-15.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55a5476ada37e6367d4ebdda165eaad745f72c1b3b8b96e3bae7612581b4e7bf -size 23771368 diff --git a/marble-16.03.90.tar.xz b/marble-16.03.90.tar.xz new file mode 100644 index 0000000..6bc1797 --- /dev/null +++ b/marble-16.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfb3a69c5084088b412b784ab09e2a62fc98f607a5d0c5628d7f2c9b7d1afb4e +size 23767280 diff --git a/marble.changes b/marble.changes index aecf06a..f71c88c 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 11 06:54:40 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + ------------------------------------------------------------------- Sun Mar 13 15:56:21 UTC 2016 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 46e277e..e418fee 100644 --- a/marble.spec +++ b/marble.spec @@ -18,7 +18,7 @@ %define _so -23 Name: marble -Version: 15.12.3 +Version: 16.03.90 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ From dc3aac2b113cd9df4c0307cccea10a86bc5134dec9c0b44398ae845896959779 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 12 Apr 2016 14:28:22 +0000 Subject: [PATCH 02/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=89 --- make_astro_coinstall.diff | 66 +++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/make_astro_coinstall.diff b/make_astro_coinstall.diff index 1a6cd95..cb69a64 100644 --- a/make_astro_coinstall.diff +++ b/make_astro_coinstall.diff @@ -1,6 +1,6 @@ -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 +diff -urNB marble/CMakeLists.txt new/CMakeLists.txt +--- marble/CMakeLists.txt 2016-04-02 08:57:40.301310654 +0200 ++++ new/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200 @@ -94,6 +94,7 @@ cmake_minimum_required(VERSION 2.8.12) @@ -9,9 +9,9 @@ diff -urB marble/CMakeLists.txt new/CMakeLists.txt 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 +diff -urNB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt +--- marble/src/apps/behaim/CMakeLists.txt 2016-04-02 08:57:40.593305808 +0200 ++++ new/src/apps/behaim/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200 @@ -29,7 +29,7 @@ ${Qt5Positioning_LIBRARIES} ${Qt5AndroidExtras_LIBRARIES} @@ -30,21 +30,21 @@ diff -urB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.t 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 @@ +diff -urNB marble/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt +--- marble/src/apps/marble-kde/CMakeLists.txt 2016-04-02 08:57:40.593305808 +0200 ++++ new/src/apps/marble-kde/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200 +@@ -53,7 +53,7 @@ marble marbleui ${MARBLEWIDGET} - astro + ${ASTRO} KF5::NewStuff - KF5::Wallet KF5::Parts -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 + KF5::Crash +diff -urNB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt +--- marble/src/apps/marble-maps/CMakeLists.txt 2016-04-02 08:57:40.593305808 +0200 ++++ new/src/apps/marble-maps/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200 @@ -29,7 +29,7 @@ ${Qt5Positioning_LIBRARIES} ${Qt5AndroidExtras_LIBRARIES} @@ -63,9 +63,9 @@ diff -urB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CM 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 +diff -urNB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt +--- marble/src/apps/marble-qt/CMakeLists.txt 2016-04-02 08:57:40.593305808 +0200 ++++ new/src/apps/marble-qt/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200 @@ -34,7 +34,7 @@ ${Qt5WebKit_LIBRARIES} marbleui @@ -75,9 +75,9 @@ diff -urB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeL if(WIN32) 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 +diff -urNB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt +--- marble/src/lib/astro/CMakeLists.txt 2016-04-02 08:57:40.633305144 +0200 ++++ new/src/lib/astro/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200 @@ -21,27 +21,27 @@ solarsystem.cpp ) @@ -127,10 +127,10 @@ diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt endif() ########### install files ############### -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 @@ +diff -urNB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt +--- marble/src/lib/marble/CMakeLists.txt 2016-04-02 08:57:40.637305078 +0200 ++++ new/src/lib/marble/CMakeLists.txt 2016-04-02 08:57:58.365012968 +0200 +@@ -361,7 +361,7 @@ ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS}) # link with libastro @@ -139,27 +139,27 @@ diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt # 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 +diff -urNB marble/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt +--- marble/src/plugins/render/eclipses/CMakeLists.txt 2016-04-02 08:57:40.693304148 +0200 ++++ new/src/plugins/render/eclipses/CMakeLists.txt 2016-04-02 08:57:58.369012904 +0200 @@ -22,4 +22,4 @@ marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} ) -target_link_libraries( EclipsesPlugin astro ) +target_link_libraries( EclipsesPlugin ${ASTRO} ) -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 +diff -urNB marble/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt +--- marble/src/plugins/render/satellites/CMakeLists.txt 2016-04-02 08:57:40.701304015 +0200 ++++ new/src/plugins/render/satellites/CMakeLists.txt 2016-04-02 08:57:58.369012904 +0200 @@ -30,4 +30,4 @@ ${satellites_SRCS} ${sgp4_SRCS} ) -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 +diff -urNB marble/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt +--- marble/src/plugins/render/stars/CMakeLists.txt 2016-04-02 08:57:40.701304015 +0200 ++++ new/src/plugins/render/stars/CMakeLists.txt 2016-04-02 08:57:58.369012904 +0200 @@ -13,4 +13,4 @@ qt_wrap_ui(stars_SRCS ${stars_UI}) From 10e8277a4a91fa59244912adbe846c9b6a0285d577842dc37c1e2b65d98a13fe Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 12 Apr 2016 14:36:44 +0000 Subject: [PATCH 03/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=90 --- marble.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/marble.changes b/marble.changes index f71c88c..334ad70 100644 --- a/marble.changes +++ b/marble.changes @@ -5,6 +5,7 @@ Mon Apr 11 06:54:40 UTC 2016 - tittiatcoke@gmail.com * KDE Applications 16.04.0 RC * https://www.kde.org/announcements/announce-applications-16.04-rc.php +- Drop marble-glibc-2.23.patch as this is fixed upstream ------------------------------------------------------------------- Sun Mar 13 15:56:21 UTC 2016 - tittiatcoke@gmail.com From d65dc3ebc5ce2370faed789e0591567edb8933f41f1ba3fbfd3b8ef8705e1a88 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 12 Apr 2016 14:36:51 +0000 Subject: [PATCH 04/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=91 --- marble-glibc-2.23.patch | 57 ----------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 marble-glibc-2.23.patch diff --git a/marble-glibc-2.23.patch b/marble-glibc-2.23.patch deleted file mode 100644 index 8abd679..0000000 --- a/marble-glibc-2.23.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -urB marble-15.12.2/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp new/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp ---- marble-15.12.2/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 2016-01-31 20:57:21.000000000 +0100 -+++ new/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 2016-03-05 08:28:57.888629725 +0100 -@@ -12,7 +12,7 @@ - - #include "GpsdThread.h" - #include "MarbleDebug.h" --#include -+#include - - using namespace Marble; - /* TRANSLATOR Marble::GpsdPositionProviderPlugin */ -@@ -76,7 +76,7 @@ - { - PositionProviderStatus oldStatus = m_status; - GeoDataCoordinates oldPosition = m_position; -- if ( data.status == STATUS_NO_FIX || isnan( data.fix.longitude ) || isnan( data.fix.latitude ) ) -+ if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) - m_status = PositionProviderStatusAcquiring; - else { - m_status = PositionProviderStatusAvailable; -@@ -88,29 +88,29 @@ - - m_accuracy.level = GeoDataAccuracy::Detailed; - #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) -- if ( !isnan( data.fix.epx ) && !isnan( data.fix.epy ) ) { -+ if ( !std::isnan( data.fix.epx ) && !std::isnan( data.fix.epy ) ) { - m_accuracy.horizontal = qMax( data.fix.epx, data.fix.epy ); - } - #else -- if ( !isnan( data.fix.eph ) ) { -+ if ( !std::isnan( data.fix.eph ) ) { - m_accuracy.horizontal = data.fix.eph; - } - #endif -- if ( !isnan( data.fix.epv ) ) { -+ if ( !std::isnan( data.fix.epv ) ) { - m_accuracy.vertical = data.fix.epv; - } - -- if( !isnan(data.fix.speed ) ) -+ if( !std::isnan(data.fix.speed ) ) - { - m_speed = data.fix.speed; - } - -- if( !isnan( data.fix.track ) ) -+ if( !std::isnan( data.fix.track ) ) - { - m_track = data.fix.track; - } - -- if ( !isnan( data.fix.time ) ) -+ if ( !std::isnan( data.fix.time ) ) - { - m_timestamp = QDateTime::fromMSecsSinceEpoch( data.fix.time * 1000 ); - } From 01a9d69b99dae4e36ca975db225a53b0ffb85f78651dd9acb1ed7690e5e5af17 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 12 Apr 2016 14:37:08 +0000 Subject: [PATCH 05/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=92 --- marble.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/marble.spec b/marble.spec index e418fee..db26b83 100644 --- a/marble.spec +++ b/marble.spec @@ -27,8 +27,6 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE make_astro_coinstall.diff tittiatcoke@gmail.com -- Make astro coinstallable with its Qt4 version Patch1: make_astro_coinstall.diff -# PATCH-FIX-OPENSUSE marble-glibc-2.23.patch -- Make it build with glibc 2.23 -Patch2: marble-glibc-2.23.patch BuildRequires: fdupes BuildRequires: gpsd-devel BuildRequires: perl @@ -137,7 +135,6 @@ The Astronomy shared library for the MarbleWidget shared library. %prep %setup -q %patch1 -p1 -%patch2 -p1 %build %ifarch ppc ppc64 From 5647d4c36c431ad41b438b9e70aacabcfd8462f84780f6627d08b73e7c10e045 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 12 Apr 2016 15:12:36 +0000 Subject: [PATCH 06/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=93 --- marble.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marble.spec b/marble.spec index db26b83..9a84a8a 100644 --- a/marble.spec +++ b/marble.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define _so -23 +%define _so -24 Name: marble Version: 16.03.90 From 6cfb4800ebaa821c18dc67de4f19cb9d213b564b460ea5ab149d8b0d289ea291 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 17 Apr 2016 06:20:13 +0000 Subject: [PATCH 07/10] update to (16.04.0) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=94 --- marble-16.03.90.tar.xz | 3 --- marble-16.04.0.tar.xz | 3 +++ marble.changes | 8 ++++++++ marble.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 marble-16.03.90.tar.xz create mode 100644 marble-16.04.0.tar.xz diff --git a/marble-16.03.90.tar.xz b/marble-16.03.90.tar.xz deleted file mode 100644 index 6bc1797..0000000 --- a/marble-16.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bfb3a69c5084088b412b784ab09e2a62fc98f607a5d0c5628d7f2c9b7d1afb4e -size 23767280 diff --git a/marble-16.04.0.tar.xz b/marble-16.04.0.tar.xz new file mode 100644 index 0000000..bbddb83 --- /dev/null +++ b/marble-16.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9751db6b2407467d5506b631c9c02e21c104d684c642272d74ada1040802d16 +size 23769296 diff --git a/marble.changes b/marble.changes index 334ad70..f1a7273 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Apr 17 06:19:39 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + ------------------------------------------------------------------- Mon Apr 11 06:54:40 UTC 2016 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 9a84a8a..8aed470 100644 --- a/marble.spec +++ b/marble.spec @@ -18,7 +18,7 @@ %define _so -24 Name: marble -Version: 16.03.90 +Version: 16.04.0 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ From 2f3455289bb49098cc4e14e8a0ae6195755a6649d1c5f87ba25eac0fb1152d59 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 7 May 2016 10:44:04 +0000 Subject: [PATCH 08/10] update to (16.04.1) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=95 --- marble-16.04.0.tar.xz | 3 --- marble-16.04.1.tar.xz | 3 +++ marble.changes | 8 ++++++++ marble.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 marble-16.04.0.tar.xz create mode 100644 marble-16.04.1.tar.xz diff --git a/marble-16.04.0.tar.xz b/marble-16.04.0.tar.xz deleted file mode 100644 index bbddb83..0000000 --- a/marble-16.04.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9751db6b2407467d5506b631c9c02e21c104d684c642272d74ada1040802d16 -size 23769296 diff --git a/marble-16.04.1.tar.xz b/marble-16.04.1.tar.xz new file mode 100644 index 0000000..c208032 --- /dev/null +++ b/marble-16.04.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477ba9bae3642d7e17b7b4564136ec8ab9f9af18ed8a3363a50ba4e70c65b0a0 +size 23769660 diff --git a/marble.changes b/marble.changes index f1a7273..e0c08e2 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat May 7 10:43:32 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + ------------------------------------------------------------------- Sun Apr 17 06:19:39 UTC 2016 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 8aed470..64c4eb7 100644 --- a/marble.spec +++ b/marble.spec @@ -18,7 +18,7 @@ %define _so -24 Name: marble -Version: 16.04.0 +Version: 16.04.1 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ From 1b235cb5a667c6622dac8f5c85e9c1d7afdb460bb777057d8690e219fb3c3d5f Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Mon, 9 May 2016 13:15:38 +0000 Subject: [PATCH 09/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=96 --- marble.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/marble.spec b/marble.spec index 64c4eb7..aeb1677 100644 --- a/marble.spec +++ b/marble.spec @@ -200,6 +200,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_kf5_servicesdir}/*desktop %{_kf5_sharedir}/appdata/ %{_kf5_sharedir}/marble/ +%{_kf5_sharedir}/mime/packages/geo.xml %files devel %defattr(-,root,root) From 246bbbc9e65d4cbd56d70b63ff77ba9205d31f0c91ea085a43d1df34748cd1da Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 17 May 2016 15:26:55 +0000 Subject: [PATCH 10/10] Accepting request 395068 from home:dimstar:Factory - Move marble.appdata.xml to the -kde package where the corresponding marble.desktop is shipped too. OBS-URL: https://build.opensuse.org/request/show/395068 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=97 --- marble.changes | 6 ++++++ marble.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/marble.changes b/marble.changes index e0c08e2..41a5b70 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 12 14:45:46 UTC 2016 - dimstar@opensuse.org + +- Move marble.appdata.xml to the -kde package where the + corresponding marble.desktop is shipped too. + ------------------------------------------------------------------- Sat May 7 10:43:32 UTC 2016 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index aeb1677..16c25eb 100644 --- a/marble.spec +++ b/marble.spec @@ -198,7 +198,6 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_kf5_plugindir}/libmarble*so %{_kf5_plugindir}/plasma_runner_marble.so %{_kf5_servicesdir}/*desktop -%{_kf5_sharedir}/appdata/ %{_kf5_sharedir}/marble/ %{_kf5_sharedir}/mime/packages/geo.xml @@ -236,5 +235,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %defattr(-,root,root) %{_kf5_applicationsdir}/marble.desktop %{_kf5_bindir}/marble +%dir %{_kf5_sharedir}/appdata +%{_kf5_sharedir}/appdata/marble.appdata.xml %changelog