From ad00811a57ef9f1f21072a4e8015543b73101a2b289aee24780bc2446ab0a6ff Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 8 Aug 2016 15:49:15 +0000 Subject: [PATCH 1/7] update to (16.07.90) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=102 --- marble-16.04.3.tar.xz | 3 --- marble-16.07.90.tar.xz | 3 +++ marble.changes | 8 ++++++++ marble.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 marble-16.04.3.tar.xz create mode 100644 marble-16.07.90.tar.xz diff --git a/marble-16.04.3.tar.xz b/marble-16.04.3.tar.xz deleted file mode 100644 index 679fa9c..0000000 --- a/marble-16.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a3dabcf0a28b5446030ab1831be13f0d0d4589d57da9f3a2e71e53629f331cb -size 23768036 diff --git a/marble-16.07.90.tar.xz b/marble-16.07.90.tar.xz new file mode 100644 index 0000000..1ba9712 --- /dev/null +++ b/marble-16.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eea457339edc6aa47267f1f1a1764c3914b92e5a27d721aac8c770b7f820d9dd +size 23261016 diff --git a/marble.changes b/marble.changes index 82c407f..99e6ade 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Aug 8 15:48:49 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + ------------------------------------------------------------------- Sat Jul 23 05:52:44 UTC 2016 - jengelh@inai.de diff --git a/marble.spec b/marble.spec index 52f0068..ae61233 100644 --- a/marble.spec +++ b/marble.spec @@ -18,7 +18,7 @@ %define _so -24 Name: marble -Version: 16.04.3 +Version: 16.07.90 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ From 7a72c94674f0a5f6ca46d92e8eeee37b8cc4268b6318a7d4e20db7be83e478b4 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 8 Aug 2016 18:36:03 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=103 --- marble.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/marble.spec b/marble.spec index ae61233..d3c6e36 100644 --- a/marble.spec +++ b/marble.spec @@ -186,6 +186,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_kf5_applicationsdir}/marble_kmz.desktop %{_kf5_applicationsdir}/marble_osm.desktop %{_kf5_applicationsdir}/marble_worldwind.desktop +%{_kf5_applicationsdir}/marble_geojson.desktop %{_kf5_configkcfgdir}/ %{_kf5_iconsdir}/hicolor/*/apps/marble.* %{_kf5_kxmlguidir}/marble/ From 2a915641a80148f4102ef2efda8bcb54024ac3b0e7cc2e68ed50f27d85f6aa80 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Mon, 8 Aug 2016 18:56:19 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=104 --- marble.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marble.spec b/marble.spec index d3c6e36..9ba8577 100644 --- a/marble.spec +++ b/marble.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define _so -24 +%define _so -25 Name: marble Version: 16.07.90 From 30b55dccca17f1f0cf674ba82c4344cb1c7d211f76f28bfddb5fbb25778baa2c Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 12 Aug 2016 10:31:05 +0000 Subject: [PATCH 4/7] update to (16.08.0) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=105 --- marble-16.07.90.tar.xz | 3 --- marble-16.08.0.tar.xz | 3 +++ marble.changes | 8 ++++++++ marble.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 marble-16.07.90.tar.xz create mode 100644 marble-16.08.0.tar.xz diff --git a/marble-16.07.90.tar.xz b/marble-16.07.90.tar.xz deleted file mode 100644 index 1ba9712..0000000 --- a/marble-16.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eea457339edc6aa47267f1f1a1764c3914b92e5a27d721aac8c770b7f820d9dd -size 23261016 diff --git a/marble-16.08.0.tar.xz b/marble-16.08.0.tar.xz new file mode 100644 index 0000000..e7ee7cf --- /dev/null +++ b/marble-16.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce309c827f60f389a012fb8ea8ccccf5d5925e0c5de8ae41f2ac981c1fe1c5a8 +size 23251888 diff --git a/marble.changes b/marble.changes index 99e6ade..8088249 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 12 10:30:42 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + ------------------------------------------------------------------- Mon Aug 8 15:48:49 UTC 2016 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 9ba8577..33689f5 100644 --- a/marble.spec +++ b/marble.spec @@ -18,7 +18,7 @@ %define _so -25 Name: marble -Version: 16.07.90 +Version: 16.08.0 Release: 0 Summary: Generic map viewer License: LGPL-2.1+ From 57188e49f6c458fc844ce8469d842ed17471a031d31cb440af006cd834903e98 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 12 Aug 2016 11:01:58 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=106 --- marble.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/marble.spec b/marble.spec index 33689f5..a5689bd 100644 --- a/marble.spec +++ b/marble.spec @@ -206,7 +206,6 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_includedir}/astro/ %{_kf5_libdir}/libmarblewidget-qt5.so %{_kf5_libdir}/libastro.so -%{_kf5_sharedir}/marble/cmake/ %files data %defattr(-,root,root) @@ -233,7 +232,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 +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/marble.appdata.xml %changelog From de23e36892895ee3b2b43e93ca09be9d0f2838b997639d8bcb9ce8448e8a94a0 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 12 Aug 2016 11:23:16 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=107 --- marble.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/marble.spec b/marble.spec index a5689bd..00e1dc1 100644 --- a/marble.spec +++ b/marble.spec @@ -206,6 +206,8 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_includedir}/astro/ %{_kf5_libdir}/libmarblewidget-qt5.so %{_kf5_libdir}/libastro.so +%{_libdir}/cmake/Astro/ +%{_libdir}/cmake/Marble/ %files data %defattr(-,root,root) From 2475ed197b8fe02e0e6be7ca35eecf78d484cb849d6927a88a4f17518186e882 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 13 Aug 2016 18:59:51 +0000 Subject: [PATCH 7/7] Accepting request 419158 from home:wolfi323:branches:KDE:Applications I think we shouldn't use %{_kf5_appstreamdir} in marble yet. 16.08.0 does not use the appropriate cmake variables and installs the appdata files explicitly to ${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata/ This is "fixed" in master, but not in 16.08. OBS-URL: https://build.opensuse.org/request/show/419158 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=108 --- marble.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marble.spec b/marble.spec index 00e1dc1..413fbcb 100644 --- a/marble.spec +++ b/marble.spec @@ -234,7 +234,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %defattr(-,root,root) %{_kf5_applicationsdir}/marble.desktop %{_kf5_bindir}/marble -%dir %{_kf5_appstreamdir} -%{_kf5_appstreamdir}/marble.appdata.xml +%dir %{_kf5_sharedir}/appdata +%{_kf5_sharedir}/appdata/marble.appdata.xml %changelog