From 5104423a0d98781547df17d38f015f9d622fe677dec0e5bd81cc48f8060e4a40 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:26:43 +0000 Subject: [PATCH 1/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksudoku?expand=0&rev=57 --- ksudoku-17.04.3.tar.xz | 3 --- ksudoku-17.07.90.tar.xz | 3 +++ ksudoku.changes | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 ksudoku-17.04.3.tar.xz create mode 100644 ksudoku-17.07.90.tar.xz diff --git a/ksudoku-17.04.3.tar.xz b/ksudoku-17.04.3.tar.xz deleted file mode 100644 index f1a40ea..0000000 --- a/ksudoku-17.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1162839b75f7508bd4007fc586c3466565527c3519069bbba636802f7f95a474 -size 1434536 diff --git a/ksudoku-17.07.90.tar.xz b/ksudoku-17.07.90.tar.xz new file mode 100644 index 0000000..e6e478a --- /dev/null +++ b/ksudoku-17.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8365f3a36117020d0390be0bcd0aad54e21554acd7016e18f8f911c5babd87db +size 1633720 diff --git a/ksudoku.changes b/ksudoku.changes index cf79b5a..b92d125 100644 --- a/ksudoku.changes +++ b/ksudoku.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Aug 5 18:18:50 UTC 2017 - christophe@krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + ------------------------------------------------------------------- Sun Jul 16 19:16:05 UTC 2017 - wbauer@tmo.at From 38a74fdc3cd35250b8d64f1ec4f2a2a6a669d4be6086dd58a51efff9315dc413 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:52:47 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksudoku?expand=0&rev=58 --- ksudoku.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ksudoku.spec b/ksudoku.spec index 4c0109b..5d09b69 100644 --- a/ksudoku.spec +++ b/ksudoku.spec @@ -24,7 +24,7 @@ Summary: Generate and Solve Sudoku puzzles in 2D or 3D License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 17.04.3 +Version: 17.07.90 Release: 0 Source0: ksudoku-%{version}.tar.xz # PATCH-FIX-OPENSUSE From ca43ed8f541d0110bf6aafd4df8352ceb8bd7b1e4eaff66012796f27c4db96a5 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 23:13:43 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksudoku?expand=0&rev=59 --- ksudoku.changes | 3 +- ksudoku.spec | 85 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 64 insertions(+), 24 deletions(-) diff --git a/ksudoku.changes b/ksudoku.changes index b92d125..1a8ba2e 100644 --- a/ksudoku.changes +++ b/ksudoku.changes @@ -4,7 +4,8 @@ Sat Aug 5 18:18:50 UTC 2017 - christophe@krop.fr - Update to KDE Applications 17.07.90 * KDE Applications 17.07.90 * https://www.kde.org/announcements/announce-applications-17.07.90.php - +- Drop 0001-Revert-Fix-.desktop-Qt5-apps-accept-qwindowtitle-not.patch + (no longer necessary) ------------------------------------------------------------------- Sun Jul 16 19:16:05 UTC 2017 - wbauer@tmo.at diff --git a/ksudoku.spec b/ksudoku.spec index 5d09b69..815b50d 100644 --- a/ksudoku.spec +++ b/ksudoku.spec @@ -1,7 +1,7 @@ # # spec file for package ksudoku # -# 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 @@ -15,22 +15,51 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%bcond_without lang Name: ksudoku -BuildRequires: libkdegames4-devel -BuildRequires: xz -BuildRequires: pkgconfig(glu) +Version: 16.11.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: Generate and Solve Sudoku puzzles in 2D or 3D License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 17.07.90 -Release: 0 Source0: ksudoku-%{version}.tar.xz -# PATCH-FIX-OPENSUSE -Patch: 0001-Revert-Fix-.desktop-Qt5-apps-accept-qwindowtitle-not.patch +BuildRequires: extra-cmake-modules +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kdelibs4support-devel +BuildRequires: ki18n-devel +BuildRequires: kio-devel +BuildRequires: kitemmodels-devel +BuildRequires: knewstuff-devel +BuildRequires: knotifyconfig-devel +BuildRequires: ktextwidgets-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kwindowsystem-devel +BuildRequires: kxmlgui-devel +BuildRequires: libkdegames-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(glu) +BuildRequires: update-desktop-files +%if %{with lang} +Recommends: %{name}-lang +%endif +Obsoletes: ksudoku5 < %{version} +Provides: ksudoku5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description KSudoku is a program that can generate and solve sudoku puzzles. The @@ -39,31 +68,41 @@ cells are filled with a number at the beginnning: the remaining are to be filled by the player using numbers from 1 to 9, without repeating a number twice on each column, row, or subsquare. +%if %{with lang} +%lang_package +%endif %prep -%setup -q -n ksudoku-%{version} -%patch -p1 +%setup -q %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %kde4_makeinstall +%kf5_makeinstall -C build +%if %{with lang} + %find_lang %{name} --with-man --all-name + %kf5_find_htmldocs +%endif %suse_update_desktop_file -G "Sudoku Puzzles" org.kde.ksudoku Game LogicGame - %kde_post_install %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kde4_bindir}/ksudoku -%{_kde4_htmldir}/en/ksudoku/ -%{_kde4_applicationsdir}/org.kde.ksudoku.desktop -%{_kde4_iconsdir}/hicolor/*/apps/ksudoku.* -%{_kde4_appsdir}/ksudoku/ -%{_kde4_configdir}/ksudokurc -%dir %{_datadir}/metainfo -%{_datadir}/metainfo/org.kde.ksudoku.appdata.xml +%dir %{_kf5_appstreamdir} +%{_kf5_applicationsdir}/org.kde.ksudoku.desktop +%{_kf5_appstreamdir}/org.kde.ksudoku.appdata.xml +%{_kf5_bindir}/ksudoku +%{_kf5_configdir}/ksudokurc +%{_kf5_htmldir}/en/ksudoku/ +%{_kf5_iconsdir}/hicolor/*/*/ksudoku* +%{_kf5_kxmlguidir}/ksudoku/ +%{_kf5_sharedir}/ksudoku/ + +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING* +%endif %changelog From 648d60bb10589f521297ff9fba5e997ddc62cee59a96e8fbb24b97bcf88b27f1 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 23:19:54 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksudoku?expand=0&rev=60 --- ksudoku.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ksudoku.spec b/ksudoku.spec index 815b50d..0b4026a 100644 --- a/ksudoku.spec +++ b/ksudoku.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: ksudoku -Version: 16.11.80 +Version: 17.07.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 455a4dc5fdb9cb30e07fc74e1f941a13be7a1ce272c5e11b6a1b6f181875e51c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 9 Aug 2017 13:55:51 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksudoku?expand=0&rev=61 --- ...top-Qt5-apps-accept-qwindowtitle-not.patch | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 0001-Revert-Fix-.desktop-Qt5-apps-accept-qwindowtitle-not.patch diff --git a/0001-Revert-Fix-.desktop-Qt5-apps-accept-qwindowtitle-not.patch b/0001-Revert-Fix-.desktop-Qt5-apps-accept-qwindowtitle-not.patch deleted file mode 100644 index 126ee7e..0000000 --- a/0001-Revert-Fix-.desktop-Qt5-apps-accept-qwindowtitle-not.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2e94a775d5ede50821fd5466a7b05422fdf016c3 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Sun, 16 Jul 2017 21:07:13 +0200 -Subject: [PATCH] Revert "Fix .desktop: Qt5 apps accept qwindowtitle, not - caption" - -This reverts commit 672b4e39f22f840034a8e66e1311175639bff3e3 to fix -starting ksudoku via the application menu entry. - -ksudoku 17.04.3 is still KDE4/Qt4-based and only supports -caption, not --qwindowtitle. - -See also -https://mail.kde.org/pipermail/release-team/2017-July/010426.html ---- - src/gui/org.kde.ksudoku.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/org.kde.ksudoku.desktop b/src/gui/org.kde.ksudoku.desktop -index 858688a..626ec59 100755 ---- a/src/gui/org.kde.ksudoku.desktop -+++ b/src/gui/org.kde.ksudoku.desktop -@@ -50,7 +50,7 @@ Name[wa]=KSudoku - Name[x-test]=xxKSudokuxx - Name[zh_CN]=KSudoku - Name[zh_TW]=KSudoku --Exec=ksudoku %i -qwindowtitle %c -+Exec=ksudoku %i -caption %c - Icon=ksudoku - Type=Application - X-DocPath=ksudoku/index.html --- -2.12.3 - From 2f2514cdf9ec07faa5c186c10a703118ab2a5644094ae05bc0a3dd431121d808 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 22:59:09 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksudoku?expand=0&rev=62 --- ksudoku.changes | 9 +++++++++ ksudoku.spec | 27 ++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ksudoku.changes b/ksudoku.changes index 1a8ba2e..a06ccc6 100644 --- a/ksudoku.changes +++ b/ksudoku.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Aug 11 22:46:03 UTC 2017 - christophe@krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : +- Too many changes to list here + ------------------------------------------------------------------- Sat Aug 5 18:18:50 UTC 2017 - christophe@krop.fr diff --git a/ksudoku.spec b/ksudoku.spec index 0b4026a..2cf4e66 100644 --- a/ksudoku.spec +++ b/ksudoku.spec @@ -1,7 +1,7 @@ # # spec file for package ksudoku # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang Name: ksudoku Version: 17.07.90 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Generate and Solve Sudoku puzzles in 2D or 3D License: GPL-2.0+ @@ -45,6 +46,7 @@ BuildRequires: kwindowsystem-devel BuildRequires: kxmlgui-devel BuildRequires: libkdegames-devel BuildRequires: pkgconfig +BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Quick) @@ -53,12 +55,11 @@ BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(glu) -BuildRequires: update-desktop-files +Obsoletes: ksudoku5 < %{version} +Provides: ksudoku5 = %{version} %if %{with lang} Recommends: %{name}-lang %endif -Obsoletes: ksudoku5 < %{version} -Provides: ksudoku5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -80,22 +81,22 @@ number twice on each column, row, or subsquare. %make_jobs %install -%kf5_makeinstall -C build -%if %{with lang} - %find_lang %{name} --with-man --all-name - %kf5_find_htmldocs -%endif + %kf5_makeinstall -C build + %if %{with lang} + %find_lang %{name} --with-man --all-name + %kf5_find_htmldocs + %endif %suse_update_desktop_file -G "Sudoku Puzzles" org.kde.ksudoku Game LogicGame %files %defattr(-,root,root) -%doc COPYING COPYING.DOC +%doc COPYING* +%config %{_kf5_configdir}/ksudokurc %dir %{_kf5_appstreamdir} +%doc %lang(en) %{_kf5_htmldir}/en/ksudoku/ %{_kf5_applicationsdir}/org.kde.ksudoku.desktop %{_kf5_appstreamdir}/org.kde.ksudoku.appdata.xml %{_kf5_bindir}/ksudoku -%{_kf5_configdir}/ksudokurc -%{_kf5_htmldir}/en/ksudoku/ %{_kf5_iconsdir}/hicolor/*/*/ksudoku* %{_kf5_kxmlguidir}/ksudoku/ %{_kf5_sharedir}/ksudoku/ From 9e66645f67c1289ea1e7726d8492ed30abb88f4c9165877b98dec7e346430b69 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 23:15:00 +0000 Subject: [PATCH 7/7] 17.08.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksudoku?expand=0&rev=63 --- ksudoku-17.07.90.tar.xz | 3 --- ksudoku-17.08.0.tar.xz | 3 +++ ksudoku.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 ksudoku-17.07.90.tar.xz create mode 100644 ksudoku-17.08.0.tar.xz diff --git a/ksudoku-17.07.90.tar.xz b/ksudoku-17.07.90.tar.xz deleted file mode 100644 index e6e478a..0000000 --- a/ksudoku-17.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8365f3a36117020d0390be0bcd0aad54e21554acd7016e18f8f911c5babd87db -size 1633720 diff --git a/ksudoku-17.08.0.tar.xz b/ksudoku-17.08.0.tar.xz new file mode 100644 index 0000000..197451f --- /dev/null +++ b/ksudoku-17.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d996ae8d42315ecaa0b17deb4d20c36ea93c976cc3dfaab8ed4e041f5b73dad3 +size 1633624 diff --git a/ksudoku.spec b/ksudoku.spec index 2cf4e66..49c1a62 100644 --- a/ksudoku.spec +++ b/ksudoku.spec @@ -19,7 +19,7 @@ %bcond_without lang Name: ksudoku -Version: 17.07.90 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)