From 7e5052e991cd9dc36ba530779f4910c9e5388a23e36e19de7b612604d4631696 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 26 Mar 2017 07:25:35 +0000 Subject: [PATCH 01/11] KDE Applications 17.08.80 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=124 --- marble-16.12.3.tar.xz | 3 -- marble-17.03.80.tar.xz | 3 ++ marble.changes | 92 +++++++++++++++++++++++------------------- marble.spec | 6 +-- 4 files changed, 57 insertions(+), 47 deletions(-) delete mode 100644 marble-16.12.3.tar.xz create mode 100644 marble-17.03.80.tar.xz diff --git a/marble-16.12.3.tar.xz b/marble-16.12.3.tar.xz deleted file mode 100644 index 6f9caf0..0000000 --- a/marble-16.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:522006e0042fb4bf405a7bc90e015fa6e8fb863652ea81b64f53061c6b9ebe21 -size 24403808 diff --git a/marble-17.03.80.tar.xz b/marble-17.03.80.tar.xz new file mode 100644 index 0000000..c6418ac --- /dev/null +++ b/marble-17.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbbd40057585697a3f03c0e567ca80fd8de8ad0b1aa3b3e74ab22095754e0f18 +size 24476644 diff --git a/marble.changes b/marble.changes index 74fc1ce..45cebc0 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Mar 25 23:10:51 CET 2017 - lbeltrame@kde.org + +- Update to 17.03.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.03.80.php +- Changes since 16.12.3: + * Too many changes to list here + ------------------------------------------------------------------- Thu Mar 9 12:43:52 CET 2017 - lbeltrame@kde.org @@ -20,14 +30,14 @@ Thu Feb 9 07:18:44 UTC 2017 - lbeltrame@kde.org Sat Jan 14 09:06:48 UTC 2017 - lbeltrame@kde.org - - Update to KDE Applications 16.12.1 - * KDE Applications 16.12.1 + * KDE Applications 16.12.1 * https://www.kde.org/announcements/announce-applications-16.12.1.php ------------------------------------------------------------------- Tue Dec 13 20:02:40 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 16.12.0 - * KDE Applications 16.12.0 + * KDE Applications 16.12.0 * https://www.kde.org/announcements/announce-applications-16.12.0.php @@ -113,7 +123,7 @@ Fri Jul 8 09:19:55 UTC 2016 - tittiatcoke@gmail.com * KDE Applications 16.04.3 * https://www.kde.org/announcements/announce-applications-16.04.3.php -- Drop patch make_astro_coinstall.diff. Coinstallability is no +- Drop patch make_astro_coinstall.diff. Coinstallability is no longer required as that Digikam v5 (KF5 based) has been released ------------------------------------------------------------------- @@ -159,7 +169,7 @@ Mon Apr 11 06:54:40 UTC 2016 - tittiatcoke@gmail.com Sun Mar 13 15:56:21 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.3 - * KDE Applications 15.12.3 + * KDE Applications 15.12.3 * https://www.kde.org/announcements/announce-applications-15.12.3.php * boo#970855 @@ -173,7 +183,7 @@ Sat Mar 5 07:30:59 UTC 2016 - tittiatcoke@gmail.com Sat Feb 13 08:24:54 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.2 - * KDE Applications 15.12.2 + * KDE Applications 15.12.2 * https://www.kde.org/announcements/announce-applications-15.12.2.php * boo#966605 @@ -182,7 +192,7 @@ Sat Feb 13 08:24:54 UTC 2016 - tittiatcoke@gmail.com Sat Jan 9 18:34:52 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.1 - * KDE Applications 15.12.1 + * KDE Applications 15.12.1 * https://www.kde.org/announcements/announce-applications-15.12.1.php * boo#961265 @@ -191,7 +201,7 @@ Sat Jan 9 18:34:52 UTC 2016 - tittiatcoke@gmail.com Sun Dec 13 13:32:37 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.0 - * KDE Applications 15.12.0 + * KDE Applications 15.12.0 * https://www.kde.org/announcements/announce-applications-15.12.0.php * boo#958887 @@ -201,7 +211,7 @@ Sun Dec 13 13:32:37 UTC 2015 - tittiatcoke@gmail.com Tue Nov 10 20:22:14 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.3 - * KDE Applications 15.08.3 + * KDE Applications 15.08.3 * https://www.kde.org/announcements/announce-applications-15.08.3.php * boo#954531 @@ -210,9 +220,9 @@ Tue Nov 10 20:22:14 UTC 2015 - tittiatcoke@gmail.com Sun Oct 11 13:45:17 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.2 - * KDE Applications 15.08.2 + * KDE Applications 15.08.2 * https://www.kde.org/announcements/announce-applications-15.08.2.php -- Add patch make_astro_coinstall.diff to make libastro coinstallable +- Add patch make_astro_coinstall.diff to make libastro coinstallable ------------------------------------------------------------------- Fri Oct 9 13:39:41 UTC 2015 - alarrosa@suse.com @@ -224,14 +234,14 @@ Fri Oct 9 13:39:41 UTC 2015 - alarrosa@suse.com Sun Sep 13 19:43:47 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.1 - * 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 ------------------------------------------------------------------- Sat Aug 29 18:27:03 UTC 2015 - tittiatcoke@gmail.com -- Switch back to Qt4 build for Marble so that other dependencies +- Switch back to Qt4 build for Marble so that other dependencies can be build too ------------------------------------------------------------------- @@ -256,7 +266,7 @@ Fri Aug 7 07:04:33 UTC 2015 - tittiatcoke@gmail.com * https://www.kde.org/announcements/announce-applications-15.07.90.php * Marble is now Qt5/KF5 based -- Drop patch do_not_build_qtonly_and_mobile.diff which is no +- Drop patch do_not_build_qtonly_and_mobile.diff which is no longer required @@ -399,7 +409,7 @@ Fri May 9 16:48:06 UTC 2014 - tittiatcoke@gmail.com ------------------------------------------------------------------- Wed Apr 23 20:51:12 UTC 2014 - ctrippe@opensuse.org -- remove additional desktop files as they cause multiple non +- remove additional desktop files as they cause multiple non distinguishable entries in the menu (kde#327405) Do not build qt only version and mobile version (added patch do_not_build_qtonly_and_mobile.diff) @@ -480,7 +490,7 @@ Sat Nov 16 17:57:55 UTC 2013 - tittiatcoke@gmail.com - Update to 4.11.90 * KDE 4.12 Beta 2 release * See http://www.kde.org/announcements/announce-4.12-beta2.php -- Dropped patch marble-designer-plugin.diff due to +- Dropped patch marble-designer-plugin.diff due to upstream change to activate that particular plugin. ------------------------------------------------------------------- @@ -572,14 +582,14 @@ Mon Apr 1 19:19:28 UTC 2013 - tittiatcoke@gmail.com Sat Mar 2 15:41:39 UTC 2013 - tittiatcoke@gmail.com - Update to 4.10.1 - * Contains bug fixes. See http://www.kde.org/announcements/ - for more information + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information ------------------------------------------------------------------- Thu Jan 31 17:53:16 UTC 2013 - tittiatcoke@gmail.com - Update to 4.10.0 - * This is the final release for 4.10. Contains bugfixes + * This is the final release for 4.10. Contains bugfixes ------------------------------------------------------------------- Mon Jan 21 13:56:26 UTC 2013 - wstephenson@suse.com @@ -590,13 +600,13 @@ Mon Jan 21 13:56:26 UTC 2013 - wstephenson@suse.com Thu Jan 17 08:10:41 UTC 2013 - tittiatcoke@gmail.com - Update to 4.9.98 - * This is the third RC release for 4.10. Contains bugfixes + * This is the third RC release for 4.10. Contains bugfixes ------------------------------------------------------------------- Thu Jan 3 21:16:14 UTC 2013 - tittiatcoke@gmail.com - Update to 4.9.97 - * This is the second RC release for 4.10. Contains bugfixes + * This is the second RC release for 4.10. Contains bugfixes ------------------------------------------------------------------- Wed Jan 2 22:49:42 UTC 2013 - asterios.dramis@gmail.com @@ -612,13 +622,13 @@ Wed Jan 2 22:49:42 UTC 2013 - asterios.dramis@gmail.com Wed Dec 19 18:43:05 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.95 - * This is the first RC release for 4.10. Contains bugfixes + * This is the first RC release for 4.10. Contains bugfixes ------------------------------------------------------------------- Sat Dec 1 20:09:17 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.90 - * This is the second Beta release for 4.10. Contains bugfixes + * This is the second Beta release for 4.10. Contains bugfixes ------------------------------------------------------------------- Sat Nov 24 12:56:31 UTC 2012 - tittiatcoke@gmail.com @@ -643,7 +653,7 @@ Wed Sep 5 12:06:04 UTC 2012 - dmueller@suse.com - update to 4.9.1 * see http://kde.org/announcements/4.9.1/ for details - + ------------------------------------------------------------------- Mon Jul 30 16:59:10 UTC 2012 - dmueller@suse.com @@ -688,7 +698,7 @@ Fri Mar 2 23:24:45 CET 2012 - dmueller@suse.de ------------------------------------------------------------------- Thu Feb 9 12:10:48 UTC 2012 - idonmez@suse.com -- Add upstream commits b89ff577 and 79c39f45 for Qt 4.8 fixes +- Add upstream commits b89ff577 and 79c39f45 for Qt 4.8 fixes ------------------------------------------------------------------- Wed Jan 18 21:00:12 CET 2012 - dmueller@suse.de @@ -696,7 +706,7 @@ Wed Jan 18 21:00:12 CET 2012 - dmueller@suse.de - update to 4.8.0 * first stable release of KDE 4.8 (only critical fixes over 4.7.98) * see http://kde.org/announcements/4.8/ for details - + ------------------------------------------------------------------- Tue Jan 10 18:47:16 CET 2012 - dmueller@suse.de @@ -704,7 +714,7 @@ Tue Jan 10 18:47:16 CET 2012 - dmueller@suse.de - update to 4.7.98 * RC2+ milestone release of KDE 4.8 * see http://kde.org/announcements/4.8/ for details - + ------------------------------------------------------------------- Fri Dec 2 02:01:35 CET 2011 - dmueller@suse.de @@ -746,7 +756,7 @@ Mon Aug 29 18:20:41 UTC 2011 - tittiatcoke@gmail.com ------------------------------------------------------------------- Mon Aug 1 14:15:36 UTC 2011 - idonmez@novell.com -- Provide marble-data subpackage again +- Provide marble-data subpackage again ------------------------------------------------------------------- Fri Jul 22 20:28:42 CEST 2011 - dmueller@suse.de @@ -754,7 +764,7 @@ Fri Jul 22 20:28:42 CEST 2011 - dmueller@suse.de - update to 4.7.0 * Small fixes over KDE 4.7 RC2 * see http://kde.org/announcements/4.7 for details - + ------------------------------------------------------------------- Sat Jul 9 10:02:08 CEST 2011 - dmueller@suse.de @@ -1185,12 +1195,12 @@ Sun Jan 30 12:14:43 UTC 2011 - tittiatcoke@gmail.com ------------------------------------------------------------------- Tue Jan 25 11:33:25 CET 2011 - ro@suse.de -- split off cantor devel to silence some rpmlint warnings +- split off cantor devel to silence some rpmlint warnings ------------------------------------------------------------------- Tue Jan 25 00:24:32 CET 2011 - ro@suse.de -- fix filelist to fix build again +- fix filelist to fix build again ------------------------------------------------------------------- Wed Jan 5 23:00:17 CET 2011 - dmueller@suse.de @@ -1228,7 +1238,7 @@ Fri Nov 19 17:12:16 CET 2010 - dmueller@suse.de - update to 4.5.80 * KDE 4.6 Beta1 * no upstream changelog available. - + ------------------------------------------------------------------- Thu Oct 28 22:10:32 CEST 2010 - dmueller@suse.de @@ -1258,7 +1268,7 @@ Thu Jul 29 13:52:45 CEST 2010 - dmueller@suse.de - update to 4.5.0 * KDE 4.5.0 final (version bump over RC3) - + ------------------------------------------------------------------- Sat Jul 24 00:01:46 CEST 2010 - dmueller@suse.de @@ -1266,7 +1276,7 @@ Sat Jul 24 00:01:46 CEST 2010 - dmueller@suse.de - update to 4.4.95 * KDE 4.5 RC3 (not announced) * critical fixes for 4.5.0 release - + ------------------------------------------------------------------- Fri Jul 16 18:18:14 CEST 2010 - dmueller@suse.de @@ -1336,7 +1346,7 @@ Wed Jan 20 02:08:06 CET 2010 - dmueller@suse.de ------------------------------------------------------------------- Sun Jan 10 14:55:39 CET 2010 - ro@suse.de -- rediff patches to apply without fuzz +- rediff patches to apply without fuzz ------------------------------------------------------------------- Wed Jan 6 19:01:58 CET 2010 - dmueller@suse.de @@ -1364,7 +1374,7 @@ Fri Dec 4 18:58:36 CET 2009 - dmueller@suse.de ------------------------------------------------------------------- Thu Nov 19 00:35:20 CET 2009 - ro@suse.de -- rediff desktop-files.diff for fuzz=0 +- rediff desktop-files.diff for fuzz=0 ------------------------------------------------------------------- Mon Nov 2 22:00:39 CET 2009 - dmueller@suse.de @@ -1520,7 +1530,7 @@ Sun Jan 11 19:05:03 CET 2009 - stbinner@suse.de ------------------------------------------------------------------- Mon Dec 1 17:27:07 CET 2008 - ro@suse.de -- no ocaml on s390 and s390x (as on ppc ppc64) +- no ocaml on s390 and s390x (as on ppc ppc64) ------------------------------------------------------------------- Thu Nov 6 11:25:36 CET 2008 - dmueller@suse.de @@ -1742,7 +1752,7 @@ Wed Nov 7 10:39:02 CET 2007 - dmueller@suse.de ------------------------------------------------------------------- Mon Nov 5 18:18:55 CET 2007 - dmueller@suse.de -- fix build on ppc +- fix build on ppc ------------------------------------------------------------------- Thu Nov 1 12:19:25 CET 2007 - dmueller@suse.de @@ -1752,17 +1762,17 @@ Thu Nov 1 12:19:25 CET 2007 - dmueller@suse.de ------------------------------------------------------------------- Wed Oct 31 16:49:20 CET 2007 - dmueller@suse.de -- update to KDE 4.0 Beta4 +- update to KDE 4.0 Beta4 ------------------------------------------------------------------- Sat Oct 20 17:39:33 CEST 2007 - dmueller@suse.de -- update to 3.94.1 +- update to 3.94.1 ------------------------------------------------------------------- Tue Oct 9 01:29:56 CEST 2007 - dmueller@suse.de -- update to KDE 4.0 Beta 3 +- update to KDE 4.0 Beta 3 ------------------------------------------------------------------- Tue Oct 2 15:49:41 CEST 2007 - stbinner@suse.de @@ -1853,7 +1863,7 @@ Wed May 23 11:52:54 CEST 2007 - stbinner@suse.de ------------------------------------------------------------------- Fri May 18 15:24:40 CEST 2007 - dmueller@suse.de -- remove facile requirement from Factory +- remove facile requirement from Factory ------------------------------------------------------------------- Sun May 13 21:59:19 CEST 2007 - schwab@suse.de diff --git a/marble.spec b/marble.spec index c651424..0bed5c6 100644 --- a/marble.spec +++ b/marble.spec @@ -16,13 +16,13 @@ # -%define _so -26 +%define _so -27 %define _so_astro 1 Name: marble -Version: 16.12.3 +Version: 17.03.80 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Generic map viewer License: LGPL-2.1+ From cafc752f665ceff39223e2ca94bcacc3aa374d4b9ad16afd052cb05e6c012350 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 12 Apr 2017 14:55:53 +0000 Subject: [PATCH 02/11] RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=125 --- marble-17.03.80.tar.xz | 3 --- marble-17.03.90.tar.xz | 3 +++ marble.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 marble-17.03.80.tar.xz create mode 100644 marble-17.03.90.tar.xz diff --git a/marble-17.03.80.tar.xz b/marble-17.03.80.tar.xz deleted file mode 100644 index c6418ac..0000000 --- a/marble-17.03.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbbd40057585697a3f03c0e567ca80fd8de8ad0b1aa3b3e74ab22095754e0f18 -size 24476644 diff --git a/marble-17.03.90.tar.xz b/marble-17.03.90.tar.xz new file mode 100644 index 0000000..a3f186f --- /dev/null +++ b/marble-17.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e682009bca9f3f263013c63cb721ae5aea24d0703284a6d61d8cfb70b04588ac +size 52284384 diff --git a/marble.spec b/marble.spec index 0bed5c6..c14dc33 100644 --- a/marble.spec +++ b/marble.spec @@ -19,7 +19,7 @@ %define _so -27 %define _so_astro 1 Name: marble -Version: 17.03.80 +Version: 17.03.90 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From 74b09019986b5501643e12497c45784e020a883aa4eaf499f67ac86a945355c9 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 12 Apr 2017 18:48:48 +0000 Subject: [PATCH 03/11] Update changes file - Automated commit, please verify contents OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=126 --- marble.changes | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/marble.changes b/marble.changes index 45cebc0..e99ec9b 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Apr 12 20:26:07 CEST 2017 - lbeltrame@kde.org + +- Update to 17.03.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04-rc.php +- Changes since 17.03.80: + * None + ------------------------------------------------------------------- Sat Mar 25 23:10:51 CET 2017 - lbeltrame@kde.org From f257aa8c06be5e265d1e14d4ba5f4ddd0f53faaea094ce5503a14b825f2467d5 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 13:29:04 +0000 Subject: [PATCH 04/11] Make a merry car great again OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=127 --- marble.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/marble.spec b/marble.spec index c14dc33..7c1d86d 100644 --- a/marble.spec +++ b/marble.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%bcond_without lang %define _so -27 %define _so_astro 1 @@ -147,6 +148,10 @@ Provides: libastro-qt5%{_so_astro} = %{version} %description -n libastro%{_so_astro} The astronomy library for the satellites plugin. +%if %{with lang} +%lang_package +%endif + %prep %setup -q -n marble-%{version} @@ -160,6 +165,10 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %install %kf5_makeinstall -C build + %if %{with lang} + %find_lang %{name} --with-man --all-name --with-qt + %kf5_find_htmldocs + %endif %fdupes -s %{buildroot} %post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig @@ -232,4 +241,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_datadir}/plasma/plasmoids/ %{_datadir}/plasma/wallpapers/ +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING* +%endif + %changelog From 4254e31ffdd49ff5c5d87de0b09ad9beb56b63b6122ca949e30f30a6820ff4d9 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 14:06:04 +0000 Subject: [PATCH 05/11] KDE Applications 17.04 final OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=128 --- marble-17.03.90.tar.xz | 3 --- marble-17.04.0.tar.xz | 3 +++ marble.changes | 10 ++++++++++ marble.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 marble-17.03.90.tar.xz create mode 100644 marble-17.04.0.tar.xz diff --git a/marble-17.03.90.tar.xz b/marble-17.03.90.tar.xz deleted file mode 100644 index a3f186f..0000000 --- a/marble-17.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e682009bca9f3f263013c63cb721ae5aea24d0703284a6d61d8cfb70b04588ac -size 52284384 diff --git a/marble-17.04.0.tar.xz b/marble-17.04.0.tar.xz new file mode 100644 index 0000000..a43e835 --- /dev/null +++ b/marble-17.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74e05efa3734cbe4624a03a1fd08a7d6c38cec902a4fb001b13386a2f52bbcc0 +size 52286300 diff --git a/marble.changes b/marble.changes index e99ec9b..ddaa551 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Apr 16 10:45:19 CEST 2017 - lbeltrame@kde.org + +- Update to 17.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.0.php +- Changes since 17.03.90: + * None + ------------------------------------------------------------------- Wed Apr 12 20:26:07 CEST 2017 - lbeltrame@kde.org diff --git a/marble.spec b/marble.spec index 7c1d86d..a16673f 100644 --- a/marble.spec +++ b/marble.spec @@ -20,7 +20,7 @@ %define _so -27 %define _so_astro 1 Name: marble -Version: 17.03.90 +Version: 17.04.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From dabaa7e7e232944a76eed057f2e36a6697ac5fd2808bb1a9bcc9b4525eafee3d Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 19:29:09 +0000 Subject: [PATCH 06/11] Temporarily remove URLs to bypass validation OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=129 --- marble.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marble.spec b/marble.spec index a16673f..fd16fa5 100644 --- a/marble.spec +++ b/marble.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via # %bcond_without lang From e39a6ec07d2363d10b3d41d85f6c449ae2f83492617dc62cd943ce5cb07acfb6 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 18 Apr 2017 04:57:07 +0000 Subject: [PATCH 07/11] Updated tarball OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=130 --- marble-17.04.0.tar.xz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marble-17.04.0.tar.xz b/marble-17.04.0.tar.xz index a43e835..52f58d3 100644 --- a/marble-17.04.0.tar.xz +++ b/marble-17.04.0.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74e05efa3734cbe4624a03a1fd08a7d6c38cec902a4fb001b13386a2f52bbcc0 -size 52286300 +oid sha256:6a8ab776e239fa67f23b7aed1db02b1a9a8fb3abb8ab61b47828c8bc0ada8770 +size 52287344 From fefc735211c322d2d6084512447a9379849134166fec5dc75a5aa97f2b458992 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 20 Apr 2017 08:36:20 +0000 Subject: [PATCH 08/11] Add bug urls back OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=131 --- marble.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marble.spec b/marble.spec index fd16fa5..a16673f 100644 --- a/marble.spec +++ b/marble.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %bcond_without lang From 24648c97cef3d9a8c5a06969c37062cc9f74863a94ed089a005c3843891dda8e Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 20 Apr 2017 08:51:07 +0000 Subject: [PATCH 09/11] Add Recommends: %{name}-lang OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=132 --- marble.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/marble.spec b/marble.spec index a16673f..cfc93fe 100644 --- a/marble.spec +++ b/marble.spec @@ -72,6 +72,7 @@ Requires: marble-frontend = %{version} Recommends: %{name}-doc = %{version} Obsoletes: marble5 < %{version} Provides: marble5 < %{version} +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description From c9d0f7a3b6994405386d7d7c167d086988e2c0f06be75d7dfcfba1e9a2c1c721 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 15 May 2017 10:59:50 +0000 Subject: [PATCH 10/11] Comment to ease legal review OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=133 --- marble.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/marble.spec b/marble.spec index cfc93fe..c64aa0b 100644 --- a/marble.spec +++ b/marble.spec @@ -26,6 +26,7 @@ Release: 0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Generic map viewer +# License note: the tools directory contains GPL-3 tools, but they are neither built nor installed by the package License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org From 8308d4903b932f6a46fd39c1e4b45cfc16fc43b7b491b1cecb390e5a17ae70ea Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 17 May 2017 20:08:11 +0000 Subject: [PATCH 11/11] KDE Applications 17.04.1 checkin OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=134 --- marble-17.04.0.tar.xz | 3 --- marble-17.04.1.tar.xz | 3 +++ marble.changes | 25 +++++++++++++++++++++++++ marble.spec | 2 +- 4 files changed, 29 insertions(+), 4 deletions(-) delete mode 100644 marble-17.04.0.tar.xz create mode 100644 marble-17.04.1.tar.xz diff --git a/marble-17.04.0.tar.xz b/marble-17.04.0.tar.xz deleted file mode 100644 index 52f58d3..0000000 --- a/marble-17.04.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a8ab776e239fa67f23b7aed1db02b1a9a8fb3abb8ab61b47828c8bc0ada8770 -size 52287344 diff --git a/marble-17.04.1.tar.xz b/marble-17.04.1.tar.xz new file mode 100644 index 0000000..ab99387 --- /dev/null +++ b/marble-17.04.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5ee0005a9aa416f5545077a241fe138864d7495085a91a25af4d421d8a328c3 +size 52299556 diff --git a/marble.changes b/marble.changes index ddaa551..c57d8c6 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed May 17 20:37:32 CEST 2017 - lbeltrame@kde.org + +- Update to 17.04.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.1.php +- Changes since 17.04.0: + * Fix installation folder for qm files in KDE Apps release settings + * Support also translated doc added in the KDE Application tarball + * let releaseme know to skip po install in it's builds, (used by KDE neon) + * Update update-version-number to include install/windows/marble-common.iss + * Add missing include of CMakeFindDependencyMacro + * Version bump to 0.27.1 (stable release) + * Support translation catalogs added in KDE Application release tarball + * Use windeployqt instead of manual Qt dependency hunting + * Update version number for latest stable release + * Move win/mac installation files to common dir. Split iss files. + * Use a Marble start menu folder, install website link + * Sync windows installer version + * Switch from NSIS to Inno Setup + * Fix MSVC compilation (fails with C2308, concatenating mismatched strings) + * No need for fabs (fixes MSVC compilation) + * Remove extra qualification + ------------------------------------------------------------------- Sun Apr 16 10:45:19 CEST 2017 - lbeltrame@kde.org diff --git a/marble.spec b/marble.spec index c64aa0b..889f67a 100644 --- a/marble.spec +++ b/marble.spec @@ -20,7 +20,7 @@ %define _so -27 %define _so_astro 1 Name: marble -Version: 17.04.0 +Version: 17.04.1 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)