From bcb847bd70fe7a2dfabbf6cb282d64887f88e78419ecd10af85a30a5ce4c322e Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 Dec 2015 13:26:28 +0000 Subject: [PATCH 1/3] update to (15.12.0) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksirk?expand=0&rev=20 --- ksirk-15.08.3.tar.xz | 3 --- ksirk-15.12.0.tar.xz | 3 +++ ksirk.changes | 9 +++++++++ ksirk.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 ksirk-15.08.3.tar.xz create mode 100644 ksirk-15.12.0.tar.xz diff --git a/ksirk-15.08.3.tar.xz b/ksirk-15.08.3.tar.xz deleted file mode 100644 index 906f06e..0000000 --- a/ksirk-15.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41bc89e9190740a2b9eeabd2d6ec9afbc97aa41d6eb11caba3eee6fd5803def8 -size 5002960 diff --git a/ksirk-15.12.0.tar.xz b/ksirk-15.12.0.tar.xz new file mode 100644 index 0000000..5db0b6e --- /dev/null +++ b/ksirk-15.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f80be5c433d2c94db9b6eb10af7352d914b25809154579f503b00019dde125c +size 5002172 diff --git a/ksirk.changes b/ksirk.changes index aa6081d..ded3ac4 100644 --- a/ksirk.changes +++ b/ksirk.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Dec 13 13:26:19 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + ------------------------------------------------------------------- Tue Nov 10 20:15:58 UTC 2015 - tittiatcoke@gmail.com diff --git a/ksirk.spec b/ksirk.spec index 3dd9fa9..6244587 100644 --- a/ksirk.spec +++ b/ksirk.spec @@ -21,7 +21,7 @@ Summary: Risk-like game for KDE License: GPL-2.0+ and LGPL-2.0+ Group: Amusements/Games/Strategy/Turn Based Url: http://www.kde.org -Version: 15.08.3 +Version: 15.12.0 Release: 0 Source0: ksirk-%{version}.tar.xz BuildRequires: libkdegames4-devel From bc1cb6f00cf744fc12bbea169e786e59bbc1d6c8d24dc819ee6cf36896b03066 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 15 Dec 2015 18:32:52 +0000 Subject: [PATCH 2/3] Accepting request 348955 from home:wolfi323:branches:KDE:Applications - Add fix-ksirk-desktop-exec-line.patch and revert it, this upstream commit breaks the application menu entry (kde#356731) OBS-URL: https://build.opensuse.org/request/show/348955 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksirk?expand=0&rev=21 --- fix-ksirk-desktop-exec-line.patch | 22 ++++++++++++++++++++++ ksirk.changes | 6 ++++++ ksirk.spec | 4 ++++ 3 files changed, 32 insertions(+) create mode 100644 fix-ksirk-desktop-exec-line.patch diff --git a/fix-ksirk-desktop-exec-line.patch b/fix-ksirk-desktop-exec-line.patch new file mode 100644 index 0000000..f906c12 --- /dev/null +++ b/fix-ksirk-desktop-exec-line.patch @@ -0,0 +1,22 @@ +From: Jeremy Whiting +Date: Mon, 23 Nov 2015 20:39:04 +0000 +Subject: Fix ksirk .desktop file exec line. +X-Git-Tag: v15.11.90 +X-Git-Url: http://quickgit.kde.org/?p=ksirk.git&a=commitdiff&h=8e6165d0c18cf6a624457f216ca2a5a4c9092ca6 +--- +Fix ksirk .desktop file exec line. +--- + + +--- a/ksirk/ksirk.desktop ++++ b/ksirk/ksirk.desktop +@@ -1,7 +1,7 @@ + # KDE Config File + [Desktop Entry] + Type=Application +-Exec=ksirk -caption %c %i ++Exec=ksirk -qwindowtitle %c %i + Icon=ksirk + X-DocPath=ksirk/index.html + Terminal=false + diff --git a/ksirk.changes b/ksirk.changes index ded3ac4..59f81ae 100644 --- a/ksirk.changes +++ b/ksirk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 14 17:09:42 UTC 2015 - wbauer@tmo.at + +- Add fix-ksirk-desktop-exec-line.patch and revert it, this + upstream commit breaks the application menu entry (kde#356731) + ------------------------------------------------------------------- Sun Dec 13 13:26:19 UTC 2015 - tittiatcoke@gmail.com diff --git a/ksirk.spec b/ksirk.spec index 6244587..64d8d13 100644 --- a/ksirk.spec +++ b/ksirk.spec @@ -24,6 +24,9 @@ Url: http://www.kde.org Version: 15.12.0 Release: 0 Source0: ksirk-%{version}.tar.xz +# PATCH-UNFIX-UPSTREAM fix-ksirk-desktop-exec-line.patch -- this commit broke the ksirk menu entry, revert it (kde#356731) +# (ksirk is still a KDE4 application and doesn't support the -qwindowtitle parameter) +Patch: fix-ksirk-desktop-exec-line.patch BuildRequires: libkdegames4-devel BuildRequires: libqca2-devel BuildRequires: xz @@ -35,6 +38,7 @@ KsirK is a computerized version of a well known strategy game. %prep %setup -q +%patch -Rp1 %build %cmake_kde4 -d build From 6439d1e3522b21f535b9a6c61b18ccff06e96e6ae064834f46d2b2a9dec486b3 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 15 Dec 2015 21:14:31 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksirk?expand=0&rev=22 --- fix-ksirk-desktop-exec-line.patch | 22 ---------------------- ksirk-15.12.0.tar.xz | 4 ++-- ksirk.changes | 6 ------ ksirk.spec | 4 ---- 4 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 fix-ksirk-desktop-exec-line.patch diff --git a/fix-ksirk-desktop-exec-line.patch b/fix-ksirk-desktop-exec-line.patch deleted file mode 100644 index f906c12..0000000 --- a/fix-ksirk-desktop-exec-line.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Jeremy Whiting -Date: Mon, 23 Nov 2015 20:39:04 +0000 -Subject: Fix ksirk .desktop file exec line. -X-Git-Tag: v15.11.90 -X-Git-Url: http://quickgit.kde.org/?p=ksirk.git&a=commitdiff&h=8e6165d0c18cf6a624457f216ca2a5a4c9092ca6 ---- -Fix ksirk .desktop file exec line. ---- - - ---- a/ksirk/ksirk.desktop -+++ b/ksirk/ksirk.desktop -@@ -1,7 +1,7 @@ - # KDE Config File - [Desktop Entry] - Type=Application --Exec=ksirk -caption %c %i -+Exec=ksirk -qwindowtitle %c %i - Icon=ksirk - X-DocPath=ksirk/index.html - Terminal=false - diff --git a/ksirk-15.12.0.tar.xz b/ksirk-15.12.0.tar.xz index 5db0b6e..ac67743 100644 --- a/ksirk-15.12.0.tar.xz +++ b/ksirk-15.12.0.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f80be5c433d2c94db9b6eb10af7352d914b25809154579f503b00019dde125c -size 5002172 +oid sha256:1e72de20a031f4e3c25a55b7fe8fcaeb51c9b8920d2bb1e98e48da7bfebdfe12 +size 5003496 diff --git a/ksirk.changes b/ksirk.changes index 59f81ae..ded3ac4 100644 --- a/ksirk.changes +++ b/ksirk.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Mon Dec 14 17:09:42 UTC 2015 - wbauer@tmo.at - -- Add fix-ksirk-desktop-exec-line.patch and revert it, this - upstream commit breaks the application menu entry (kde#356731) - ------------------------------------------------------------------- Sun Dec 13 13:26:19 UTC 2015 - tittiatcoke@gmail.com diff --git a/ksirk.spec b/ksirk.spec index 64d8d13..6244587 100644 --- a/ksirk.spec +++ b/ksirk.spec @@ -24,9 +24,6 @@ Url: http://www.kde.org Version: 15.12.0 Release: 0 Source0: ksirk-%{version}.tar.xz -# PATCH-UNFIX-UPSTREAM fix-ksirk-desktop-exec-line.patch -- this commit broke the ksirk menu entry, revert it (kde#356731) -# (ksirk is still a KDE4 application and doesn't support the -qwindowtitle parameter) -Patch: fix-ksirk-desktop-exec-line.patch BuildRequires: libkdegames4-devel BuildRequires: libqca2-devel BuildRequires: xz @@ -38,7 +35,6 @@ KsirK is a computerized version of a well known strategy game. %prep %setup -q -%patch -Rp1 %build %cmake_kde4 -d build