From a81dbe6c79b8248f4c41d2590ccf2d37b93a4b61b7cc5d67dbd90848253ad9a8 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 11 Oct 2016 15:06:26 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=112 --- marble.changes | 6 ++++++ marble.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/marble.changes b/marble.changes index a4a69a1..1caa527 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 11 15:05:55 UTC 2016 - hrvoje.senjan@gmail.com + +- Pass KDE_INSTALL_METAINFODIR to cmake in order to fix build on + Leap 42.1 with newer KF5 + ------------------------------------------------------------------- Fri Sep 9 08:42:02 UTC 2016 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 8beb5c0..2963da1 100644 --- a/marble.spec +++ b/marble.spec @@ -155,6 +155,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ -DBUILD_MARBLE_TESTS=NO \ -DMOBILE=FALSE \ -DWITH_KF5=TRUE \ + -DKDE_INSTALL_METAINFODIR=%{_kf5_appstreamdir} \ .. %make_jobs From b86c9f29e87378640def8455a872eb60659ad7a4a3995678ff906e8a894fb847 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 11 Oct 2016 21:07:59 +0000 Subject: [PATCH 2/2] update to (16.08.2) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=113 --- marble-16.08.1.tar.xz | 3 --- marble-16.08.2.tar.xz | 3 +++ marble.changes | 6 ++++++ marble.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 marble-16.08.1.tar.xz create mode 100644 marble-16.08.2.tar.xz diff --git a/marble-16.08.1.tar.xz b/marble-16.08.1.tar.xz deleted file mode 100644 index 05b552b..0000000 --- a/marble-16.08.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a27d001ebff534df1b70b7efe531ecb3373b3fc01d9bc5727eea1c6643c7af3a -size 23147580 diff --git a/marble-16.08.2.tar.xz b/marble-16.08.2.tar.xz new file mode 100644 index 0000000..e3a14ac --- /dev/null +++ b/marble-16.08.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7b070225c4ebaf163e0db64147f8e3b2e86f37aed46c502469992289dc215f9 +size 23148072 diff --git a/marble.changes b/marble.changes index 1caa527..a49e789 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 11 21:07:50 UTC 2016 - lbeltrame@kde.org + +- KDE Applications 16.08.2 +https://www.kde.org/announcements/announce-applications-16.08.2.php + ------------------------------------------------------------------- Tue Oct 11 15:05:55 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/marble.spec b/marble.spec index 2963da1..d72ada2 100644 --- a/marble.spec +++ b/marble.spec @@ -18,7 +18,7 @@ %define _so -25 Name: marble -Version: 16.08.1 +Version: 16.08.2 Release: 0 Summary: Generic map viewer License: LGPL-2.1+