From 802a4ae3547d2a10dd80f8be68b63b720589f6fabc47214cd578ac2daaa2c56a Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 26 Mar 2017 07:21:09 +0000 Subject: [PATCH 1/7] KDE Applications 17.08.80 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kolf?expand=0&rev=42 --- kolf-16.12.3.tar.xz | 3 --- kolf-17.03.80.tar.xz | 3 +++ kolf.changes | 44 ++++++++++++++++++++------------ kolf.spec | 61 ++++++++++++++++++++++++++++++-------------- 4 files changed, 72 insertions(+), 39 deletions(-) delete mode 100644 kolf-16.12.3.tar.xz create mode 100644 kolf-17.03.80.tar.xz diff --git a/kolf-16.12.3.tar.xz b/kolf-16.12.3.tar.xz deleted file mode 100644 index ebf01b3..0000000 --- a/kolf-16.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5ddaeb9b7805124c287b2af977cee254b0d30c316542627465964ca90f3d18c -size 768284 diff --git a/kolf-17.03.80.tar.xz b/kolf-17.03.80.tar.xz new file mode 100644 index 0000000..a647f05 --- /dev/null +++ b/kolf-17.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b6654486944c249e4357431c6343967d5f5a8b781040a642296c158ff3d513e +size 769624 diff --git a/kolf.changes b/kolf.changes index c079fac..e4456d9 100644 --- a/kolf.changes +++ b/kolf.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Mar 25 23:10:57 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: + * None + ------------------------------------------------------------------- Thu Mar 9 12:45:38 CET 2017 - lbeltrame@kde.org @@ -20,14 +30,14 @@ Thu Feb 9 07:26:49 UTC 2017 - lbeltrame@kde.org Sat Jan 14 09:09:59 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:10:03 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 @@ -128,7 +138,7 @@ Mon Apr 11 06:45:26 UTC 2016 - tittiatcoke@gmail.com Sun Mar 13 15:47:56 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 @@ -137,7 +147,7 @@ Sun Mar 13 15:47:56 UTC 2016 - tittiatcoke@gmail.com Sat Feb 13 08:15:40 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 @@ -146,7 +156,7 @@ Sat Feb 13 08:15:40 UTC 2016 - tittiatcoke@gmail.com Sat Jan 9 18:24:37 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 @@ -155,7 +165,7 @@ Sat Jan 9 18:24:37 UTC 2016 - tittiatcoke@gmail.com Sun Dec 13 13:23:23 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 @@ -164,7 +174,7 @@ Sun Dec 13 13:23:23 UTC 2015 - tittiatcoke@gmail.com Tue Nov 10 20:12:53 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 @@ -173,7 +183,7 @@ Tue Nov 10 20:12:53 UTC 2015 - tittiatcoke@gmail.com Sun Oct 11 13:35:40 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 @@ -181,7 +191,7 @@ Sun Oct 11 13:35:40 UTC 2015 - tittiatcoke@gmail.com Sun Sep 13 19:20:46 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 @@ -495,20 +505,20 @@ Mon Apr 1 19:42:37 UTC 2013 - tittiatcoke@gmail.com Sat Mar 2 16:11:22 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 18:20:14 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 ------------------------------------------------------------------- Thu Jan 17 08:44:17 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 ------------------------------------------------------------------- Sat Jan 5 19:55:29 UTC 2013 - asterios.dramis@gmail.com @@ -519,7 +529,7 @@ Sat Jan 5 19:55:29 UTC 2013 - asterios.dramis@gmail.com Thu Jan 3 21:50:06 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 ------------------------------------------------------------------- Thu Dec 27 14:20:38 UTC 2012 - tittiatcoke@gmail.com @@ -535,13 +545,13 @@ Thu Dec 20 11:50:38 UTC 2012 - tittiatcoke@gmail.com Wed Dec 19 19:14:43 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:37:44 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 ------------------------------------------------------------------- Sun Nov 25 11:36:49 UTC 2012 - tittiatcoke@gmail.com @@ -554,5 +564,5 @@ Sat Nov 24 13:21:18 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.80 *See http://www.kde.org/announcements/announce-4.10-beta1.php -- Package was split of from kdegames4 +- Package was split of from kdegames4 diff --git a/kolf.spec b/kolf.spec index ae220f8..c19d969 100644 --- a/kolf.spec +++ b/kolf.spec @@ -1,7 +1,7 @@ # # spec file for package kolf # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,47 +17,70 @@ Name: kolf +Version: 17.03.80 +Release: 0 +%define kf5_version 5.26.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: Miniature golf game License: GPL-2.0+ and LGPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.12.3 -Release: 0 Source0: kolf-%{version}.tar.xz -BuildRequires: libkdegames4-devel -BuildRequires: xz +BuildRequires: extra-cmake-modules +BuildRequires: karchive-devel +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdelibs4support-devel +BuildRequires: kguiaddons-devel +BuildRequires: ki18n-devel +BuildRequires: kiconthemes-devel +BuildRequires: kio-devel +BuildRequires: kitemviews-devel +BuildRequires: knewstuff-devel +BuildRequires: knotifyconfig-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kxmlgui-devel +BuildRequires: libkdegames-devel +BuildRequires: phonon4qt5-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Widgets) +Obsoletes: kolf5 < %{version} +Provides: kolf5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Kolf is a miniature golf game for KDE. - %prep %setup -q %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - %kde4_makeinstall -C build - rm -rf %{buildroot}/%{_kde4_libdir}/libkolfprivate.so - %suse_update_desktop_file -r kolf Game SportsGame - %kde_post_install + %kf5_makeinstall -C build + rm -rf %{buildroot}/%{_kf5_libdir}/libkolfprivate.so + %suse_update_desktop_file -r org.kde.kolf Game SportsGame %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc COPYING COPYING.DOC COPYING.LIB -%{_kde4_bindir}/kolf -%{_kde4_htmldir}/en/kolf/ -%{_kde4_applicationsdir}/kolf.desktop -%{_kde4_iconsdir}/hicolor/*/apps/kolf.* -%{_kde4_appsdir}/kolf/ -%{_kde4_libdir}/libkolfprivate.so.* +%{_kf5_bindir}/kolf +%{_kf5_htmldir}/en/kolf/ +%{_kf5_applicationsdir}/org.kde.kolf.desktop +%{_kf5_iconsdir}/hicolor/*/*/kolf.* +%{_kf5_appsdir}/kolf/ +%{_kf5_libdir}/libkolfprivate.so.* +%{_datadir}/kxmlgui5/kolf/ %changelog From c59de2e567244bd53774869b68401a4d64ec8e8dfe56e30e0969a57429767d05 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 26 Mar 2017 13:05:12 +0000 Subject: [PATCH 2/7] Revert accidental framework branch commit OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kolf?expand=0&rev=43 --- kolf.spec | 61 +++++++++++++++++-------------------------------------- 1 file changed, 19 insertions(+), 42 deletions(-) diff --git a/kolf.spec b/kolf.spec index c19d969..646d58a 100644 --- a/kolf.spec +++ b/kolf.spec @@ -1,7 +1,7 @@ # # spec file for package kolf # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -17,70 +17,47 @@ Name: kolf -Version: 17.03.80 -Release: 0 -%define kf5_version 5.26.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: Miniature golf game License: GPL-2.0+ and LGPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org +Version: 17.03.80 +Release: 0 Source0: kolf-%{version}.tar.xz -BuildRequires: extra-cmake-modules -BuildRequires: karchive-devel -BuildRequires: kconfig-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kdelibs4support-devel -BuildRequires: kguiaddons-devel -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kio-devel -BuildRequires: kitemviews-devel -BuildRequires: knewstuff-devel -BuildRequires: knotifyconfig-devel -BuildRequires: kwidgetsaddons-devel -BuildRequires: kxmlgui-devel -BuildRequires: libkdegames-devel -BuildRequires: phonon4qt5-devel -BuildRequires: pkgconfig -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5QuickWidgets) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5Widgets) -Obsoletes: kolf5 < %{version} -Provides: kolf5 = %{version} +BuildRequires: libkdegames4-devel +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build +%kde4_runtime_requires %description Kolf is a miniature golf game for KDE. + %prep %setup -q %build - %cmake_kf5 -d build + %cmake_kde4 -d build %make_jobs %install - %kf5_makeinstall -C build - rm -rf %{buildroot}/%{_kf5_libdir}/libkolfprivate.so - %suse_update_desktop_file -r org.kde.kolf Game SportsGame + %kde4_makeinstall -C build + rm -rf %{buildroot}/%{_kde4_libdir}/libkolfprivate.so + %suse_update_desktop_file -r kolf Game SportsGame + %kde_post_install %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc COPYING COPYING.DOC COPYING.LIB -%{_kf5_bindir}/kolf -%{_kf5_htmldir}/en/kolf/ -%{_kf5_applicationsdir}/org.kde.kolf.desktop -%{_kf5_iconsdir}/hicolor/*/*/kolf.* -%{_kf5_appsdir}/kolf/ -%{_kf5_libdir}/libkolfprivate.so.* -%{_datadir}/kxmlgui5/kolf/ +%{_kde4_bindir}/kolf +%{_kde4_htmldir}/en/kolf/ +%{_kde4_applicationsdir}/kolf.desktop +%{_kde4_iconsdir}/hicolor/*/apps/kolf.* +%{_kde4_appsdir}/kolf/ +%{_kde4_libdir}/libkolfprivate.so.* %changelog From 07dc842d42185d7bd971bfa1ecebad3fc407c756fb668a76faad4758c2579749 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 12 Apr 2017 14:53:18 +0000 Subject: [PATCH 3/7] RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kolf?expand=0&rev=44 --- kolf-17.03.80.tar.xz | 3 --- kolf-17.03.90.tar.xz | 3 +++ kolf.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 kolf-17.03.80.tar.xz create mode 100644 kolf-17.03.90.tar.xz diff --git a/kolf-17.03.80.tar.xz b/kolf-17.03.80.tar.xz deleted file mode 100644 index a647f05..0000000 --- a/kolf-17.03.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b6654486944c249e4357431c6343967d5f5a8b781040a642296c158ff3d513e -size 769624 diff --git a/kolf-17.03.90.tar.xz b/kolf-17.03.90.tar.xz new file mode 100644 index 0000000..caa7fde --- /dev/null +++ b/kolf-17.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79da4fe629a77118987097511bd3de253a4170465d872c58cab086252378569a +size 769412 diff --git a/kolf.spec b/kolf.spec index 646d58a..d0f71f5 100644 --- a/kolf.spec +++ b/kolf.spec @@ -21,7 +21,7 @@ Summary: Miniature golf game License: GPL-2.0+ and LGPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 17.03.80 +Version: 17.03.90 Release: 0 Source0: kolf-%{version}.tar.xz BuildRequires: libkdegames4-devel From 344272c2dfdc204593af4f94cf75ab430121e06e49f25d292b1028d7f6678cd5 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 12 Apr 2017 18:44:43 +0000 Subject: [PATCH 4/7] Update changes file - Automated commit, please verify contents OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kolf?expand=0&rev=45 --- kolf.changes | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/kolf.changes b/kolf.changes index e4456d9..ca5e65b 100644 --- a/kolf.changes +++ b/kolf.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Apr 12 20:25:46 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:57 CET 2017 - lbeltrame@kde.org From c09cb013c99c1f76d356ff758a7470d316de8abcbc9ddeeb9848859046910e6e Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 14:01:31 +0000 Subject: [PATCH 5/7] KDE Applications 17.04 final OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kolf?expand=0&rev=46 --- kolf-17.03.90.tar.xz | 3 --- kolf-17.04.0.tar.xz | 3 +++ kolf.changes | 10 ++++++++++ kolf.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 kolf-17.03.90.tar.xz create mode 100644 kolf-17.04.0.tar.xz diff --git a/kolf-17.03.90.tar.xz b/kolf-17.03.90.tar.xz deleted file mode 100644 index caa7fde..0000000 --- a/kolf-17.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79da4fe629a77118987097511bd3de253a4170465d872c58cab086252378569a -size 769412 diff --git a/kolf-17.04.0.tar.xz b/kolf-17.04.0.tar.xz new file mode 100644 index 0000000..f5c24c6 --- /dev/null +++ b/kolf-17.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6af8fea09dc0eb3eb0f1f625350f3cc766e5e6387ce1d3f66bebd2ad44f17be7 +size 768204 diff --git a/kolf.changes b/kolf.changes index ca5e65b..d7517bb 100644 --- a/kolf.changes +++ b/kolf.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Apr 16 10:45:37 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:25:46 CEST 2017 - lbeltrame@kde.org diff --git a/kolf.spec b/kolf.spec index d0f71f5..8d5f98e 100644 --- a/kolf.spec +++ b/kolf.spec @@ -21,7 +21,7 @@ Summary: Miniature golf game License: GPL-2.0+ and LGPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 17.03.90 +Version: 17.04.0 Release: 0 Source0: kolf-%{version}.tar.xz BuildRequires: libkdegames4-devel From 6565619b645ec20b59eb401d129508123d99850cbc6e7b65bc9c1c83ce7b31aa Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 19:26:27 +0000 Subject: [PATCH 6/7] Temporarily remove URLs to bypass validation OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kolf?expand=0&rev=47 --- kolf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolf.spec b/kolf.spec index 8d5f98e..b35d564 100644 --- a/kolf.spec +++ b/kolf.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 # From fcaf78109c8d7cc2897ae32bfe50d76230f118476efcf4c284668fa5807ba518 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 20 Apr 2017 08:35:00 +0000 Subject: [PATCH 7/7] Add bug urls back OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kolf?expand=0&rev=48 --- kolf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolf.spec b/kolf.spec index b35d564..8d5f98e 100644 --- a/kolf.spec +++ b/kolf.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/ #