From 3a60beb39c8c3f71facc4a301543d813c61a5e8b4ebe8203a17b9d9925f1ee12 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 26 Mar 2017 07:16:35 +0000 Subject: [PATCH 01/10] KDE Applications 17.08.80 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=63 --- kate-16.12.3.tar.xz | 3 -- kate-17.03.80.tar.xz | 3 ++ kate.changes | 76 ++++++++++++++++------------ kate.spec | 7 +-- remove-popupapplet-servicetype.patch | 22 -------- 5 files changed, 48 insertions(+), 63 deletions(-) delete mode 100644 kate-16.12.3.tar.xz create mode 100644 kate-17.03.80.tar.xz delete mode 100644 remove-popupapplet-servicetype.patch diff --git a/kate-16.12.3.tar.xz b/kate-16.12.3.tar.xz deleted file mode 100644 index b9c28c2..0000000 --- a/kate-16.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19e8c40985392b5640c022ceb577aa16541fdd99d389645e38b22d621c6d79b9 -size 1871900 diff --git a/kate-17.03.80.tar.xz b/kate-17.03.80.tar.xz new file mode 100644 index 0000000..50aa002 --- /dev/null +++ b/kate-17.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acbc6ab7a7263fdc5c2041a4a7615cab8f7ff5aed217491f0e86474b3758ace5 +size 1867880 diff --git a/kate.changes b/kate.changes index b434646..33737b3 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Mar 25 23:10:16 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:35:33 CET 2017 - lbeltrame@kde.org @@ -27,14 +37,14 @@ Thu Jan 19 19:19:16 UTC 2017 - fabian@ritter-vogt.de Sat Jan 14 08:52:14 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 19:33:57 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 @@ -157,7 +167,7 @@ Mon Apr 11 06:34:14 UTC 2016 - tittiatcoke@gmail.com Sun Mar 13 15:37:08 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 @@ -166,7 +176,7 @@ Sun Mar 13 15:37:08 UTC 2016 - tittiatcoke@gmail.com Sat Feb 13 08:04:24 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 @@ -174,14 +184,14 @@ Sat Feb 13 08:04:24 UTC 2016 - tittiatcoke@gmail.com ------------------------------------------------------------------- Sun Feb 7 10:00:08 UTC 2016 - tittiatcoke@gmail.com -- Kwrite does not require kate, so lets not put the kwrite icon in - the kate package. +- Kwrite does not require kate, so lets not put the kwrite icon in + the kate package. ------------------------------------------------------------------- Sat Jan 9 18:13:08 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 @@ -190,7 +200,7 @@ Sat Jan 9 18:13:08 UTC 2016 - tittiatcoke@gmail.com Sun Dec 13 13:09:35 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 @@ -199,7 +209,7 @@ Sun Dec 13 13:09:35 UTC 2015 - tittiatcoke@gmail.com Tue Nov 10 19:56:32 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 @@ -208,7 +218,7 @@ Tue Nov 10 19:56:32 UTC 2015 - tittiatcoke@gmail.com Sun Oct 11 13:18:41 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 @@ -221,7 +231,7 @@ Tue Sep 22 22:30:37 UTC 2015 - alarrosa@suse.com Sun Sep 13 19:00:20 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 @@ -373,7 +383,7 @@ Fri Aug 15 08:23:54 UTC 2014 - tittiatcoke@gmail.com Wed Aug 13 11:34:33 UTC 2014 - toddrme2178@gmail.com - Add subpackage for the python plugins - - Requires additional python requires for full functionality + - Requires additional python requires for full functionality ------------------------------------------------------------------- Thu Jul 17 16:44:00 UTC 2014 - cgiboudeaux@gmx.com @@ -594,8 +604,8 @@ Wed Mar 13 09:54:26 UTC 2013 - hrvoje.senjan@gmail.com Sat Mar 2 15:34:10 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 - Drop fix-plugin-loading.diff, applied upstream ------------------------------------------------------------------- @@ -607,35 +617,35 @@ Mon Feb 11 20:12:44 UTC 2013 - hrvoje.senjan@gmail.com Thu Jan 31 17:44:43 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:02:32 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:06:39 UTC 2013 - tittiatcoke@gmail.com - Update to 4.9.97 - * This is the second RC release for 4.10. Contains bugfixes -- Dropped patch fix_build_for_unicode_python.diff as this was + * This is the second RC release for 4.10. Contains bugfixes +- Dropped patch fix_build_for_unicode_python.diff as this was incorporated upstream ------------------------------------------------------------------- Wed Dec 19 18:33:51 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.95 - * This is the first RC release for 4.10. Contains bugfixes -- Added fix_build_for_unicode_python.diff patch, fixes 32bit + * This is the first RC release for 4.10. Contains bugfixes +- Added fix_build_for_unicode_python.diff patch, fixes 32bit compilation ------------------------------------------------------------------- Sat Dec 1 20:00:24 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:48:54 UTC 2012 - tittiatcoke@gmail.com @@ -646,7 +656,7 @@ Sat Nov 24 12:48:54 UTC 2012 - tittiatcoke@gmail.com * Advanced gid(1) plugin using both ID files and etags * Built-in quick open (Ctrl+Alt+o) * New Project Plugin - * Improved Scripting Support + * Improved Scripting Support ------------------------------------------------------------------- Fri Nov 2 16:46:28 UTC 2012 - tittiatcoke@gmail.com @@ -665,7 +675,7 @@ Wed Sep 5 12:02:32 UTC 2012 - dmueller@suse.com - update to 4.9.1 * see http://kde.org/announcements/4.9.1/ for details - + ------------------------------------------------------------------- Mon Jul 30 16:49:32 UTC 2012 - dmueller@suse.com @@ -708,7 +718,7 @@ Wed Jan 18 20:56:34 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 16:32:04 CET 2012 - dmueller@suse.de @@ -716,7 +726,7 @@ Tue Jan 10 16:32:04 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 - + ------------------------------------------------------------------- Wed Dec 7 10:57:00 UTC 2011 - coolo@suse.com @@ -750,11 +760,11 @@ Thu Sep 1 23:14:13 CEST 2011 - dmueller@suse.de ------------------------------------------------------------------- Thu Aug 18 13:13:04 UTC 2011 - toddrme2178@gmail.com - + - Split kwrite doc package (fix for RPMLINT warning) - Removed redundant buildrequires - Cleaned up spec file formatting - + ------------------------------------------------------------------- Mon Aug 8 07:56:03 UTC 2011 - mlin@suse.com @@ -766,7 +776,7 @@ Fri Jul 22 20:17:48 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 09:51:34 CEST 2011 - dmueller@suse.de @@ -1230,7 +1240,7 @@ Thu Jul 29 16:55:54 CEST 2010 - dmueller@suse.de - update to 4.5.0 * KDE 4.5.0 final (version bump over RC3) - + ------------------------------------------------------------------- Sat Jul 24 00:04:44 CEST 2010 - dmueller@suse.de @@ -1238,7 +1248,7 @@ Sat Jul 24 00:04:44 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:21:13 CEST 2010 - dmueller@suse.de @@ -1643,17 +1653,17 @@ Thu Nov 1 12:21:39 CET 2007 - dmueller@suse.de ------------------------------------------------------------------- Wed Oct 31 23:39:16 CET 2007 - dmueller@suse.de -- update to KDE 4.0 Beta4 +- update to KDE 4.0 Beta4 ------------------------------------------------------------------- Sat Oct 20 17:58:01 CEST 2007 - dmueller@suse.de -- update to 3.94.1 +- update to 3.94.1 ------------------------------------------------------------------- Thu Oct 11 11:39:13 CEST 2007 - dmueller@suse.de -- udpate to KDE 4.0 Beta3 +- udpate to KDE 4.0 Beta3 ------------------------------------------------------------------- Tue Oct 2 16:10:31 CEST 2007 - stbinner@suse.de diff --git a/kate.spec b/kate.spec index 1598a69..9ed1d18 100644 --- a/kate.spec +++ b/kate.spec @@ -18,10 +18,10 @@ %define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1) Name: kate -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: Advanced Text Editor License: GPL-2.0+ @@ -29,8 +29,6 @@ License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://www.kde.org/ Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM remove-popupapplet-servicetype.patch -- Remove the depreciated Plasma PopupApplet servicetype -Patch1: remove-popupapplet-servicetype.patch BuildRequires: kactivities5-devel BuildRequires: kconfig-devel BuildRequires: kcrash-devel @@ -89,7 +87,6 @@ plugins and data files for Kate and KWrite editors. %prep %setup -q -%patch1 -p1 %build %cmake_kf5 -d build diff --git a/remove-popupapplet-servicetype.patch b/remove-popupapplet-servicetype.patch deleted file mode 100644 index 369f294..0000000 --- a/remove-popupapplet-servicetype.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a1f8e09413465969d10b198a6c3bb01e90ca440d Mon Sep 17 00:00:00 2001 -From: Raymond Wooninck -Date: Wed, 21 Dec 2016 11:22:36 +0100 -Subject: [PATCH] Remove the depreciated Plasma PopupApplet servicetype - ---- - addons/sessionapplet/applet/metadata.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: kate-16.12.1/addons/sessionapplet/applet/metadata.desktop -=================================================================== ---- kate-16.12.1.orig/addons/sessionapplet/applet/metadata.desktop -+++ kate-16.12.1/addons/sessionapplet/applet/metadata.desktop -@@ -98,7 +98,7 @@ Comment[zh_TW]=Kate å·¥ä½œéšŽæ®µå•Ÿå‹•å™ - - Type=Service - Icon=kate --X-KDE-ServiceTypes=Plasma/Applet,Plasma/PopupApplet -+X-KDE-ServiceTypes=Plasma/Applet - - X-Plasma-API=declarativeappletscript - X-Plasma-MainScript=ui/katesessions.qml From 01aaf04a80cdb035b9be3a72a35f1f3594703bd434a47d676bfb5ed2cab60338 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 30 Mar 2017 05:28:07 +0000 Subject: [PATCH 02/10] - Drop upstreamed patch: remove-popupapplet-servicetype.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=64 --- kate.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kate.changes b/kate.changes index 33737b3..8b2f921 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 30 05:27:33 UTC 2017 - lbeltrame@kde.org + +- Drop upstreamed patch: remove-popupapplet-servicetype.patch + ------------------------------------------------------------------- Sat Mar 25 23:10:16 CET 2017 - lbeltrame@kde.org From 49fca53aba8f251a6aa56cfd62a86d5193963d43a49071a42c31e41e06975030 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 12 Apr 2017 14:40:09 +0000 Subject: [PATCH 03/10] RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=65 --- kate-17.03.80.tar.xz | 3 --- kate-17.03.90.tar.xz | 3 +++ kate.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 kate-17.03.80.tar.xz create mode 100644 kate-17.03.90.tar.xz diff --git a/kate-17.03.80.tar.xz b/kate-17.03.80.tar.xz deleted file mode 100644 index 50aa002..0000000 --- a/kate-17.03.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acbc6ab7a7263fdc5c2041a4a7615cab8f7ff5aed217491f0e86474b3758ace5 -size 1867880 diff --git a/kate-17.03.90.tar.xz b/kate-17.03.90.tar.xz new file mode 100644 index 0000000..b216153 --- /dev/null +++ b/kate-17.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44c78b31b1ae36ef38a362108882a28a24476510b2bd0746fc3095ecdc68914e +size 5212420 diff --git a/kate.spec b/kate.spec index 9ed1d18..035771f 100644 --- a/kate.spec +++ b/kate.spec @@ -18,7 +18,7 @@ %define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1) Name: kate -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 d1ccf3c6f0c1a93b3ccb46421c055dc2b07263ecf4750a2b44818de17e9e345c Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 12 Apr 2017 18:40:32 +0000 Subject: [PATCH 04/10] Update changes file - Automated commit, please verify contents OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=66 --- kate.changes | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/kate.changes b/kate.changes index 8b2f921..d4592c6 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Apr 12 20:25:22 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 + ------------------------------------------------------------------- Thu Mar 30 05:27:33 UTC 2017 - lbeltrame@kde.org From 48ea96a2dc48a45a1479ff1c2670d16d8af2f99568496de41e55546e282ffa19 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 13:28:02 +0000 Subject: [PATCH 05/10] Make a merry car great again OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=67 --- kate.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/kate.spec b/kate.spec index 035771f..eba972b 100644 --- a/kate.spec +++ b/kate.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%bcond_without lang %define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1) Name: kate @@ -85,6 +86,10 @@ Obsoletes: kate5-plugins < %{version} Kate is an advanced text editor for KDE. This package contains plugins and data files for Kate and KWrite editors. +%if %{with lang} +%lang_package +%endif + %prep %setup -q @@ -94,6 +99,10 @@ plugins and data files for Kate and KWrite editors. %install %kf5_makeinstall -C build + %if %{with lang} + %find_lang %{name} --with-man --all-name + %kf5_find_htmldocs + %endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -135,4 +144,9 @@ plugins and data files for Kate and KWrite editors. %{_kf5_sharedir}/plasma/ %{_kf5_servicesdir}/ +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING* +%endif + %changelog From 0df94d0f6683a5cd676dbf3e4aee0167f4645d034d506c8dcafbc61d72e8747f Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 13:56:33 +0000 Subject: [PATCH 06/10] KDE Applications 17.04 final OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=68 --- kate-17.03.90.tar.xz | 3 --- kate-17.04.0.tar.xz | 3 +++ kate.changes | 10 ++++++++++ kate.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 kate-17.03.90.tar.xz create mode 100644 kate-17.04.0.tar.xz diff --git a/kate-17.03.90.tar.xz b/kate-17.03.90.tar.xz deleted file mode 100644 index b216153..0000000 --- a/kate-17.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44c78b31b1ae36ef38a362108882a28a24476510b2bd0746fc3095ecdc68914e -size 5212420 diff --git a/kate-17.04.0.tar.xz b/kate-17.04.0.tar.xz new file mode 100644 index 0000000..028b142 --- /dev/null +++ b/kate-17.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c8d1936a2ec3a7c3c71e353da11e483251875f51846b9609667f9beee1a6042 +size 5213352 diff --git a/kate.changes b/kate.changes index d4592c6..403eb06 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Apr 16 10:44:51 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: + * Enable numericMode for sorting document list in filetree + ------------------------------------------------------------------- Wed Apr 12 20:25:22 CEST 2017 - lbeltrame@kde.org diff --git a/kate.spec b/kate.spec index eba972b..f1001ff 100644 --- a/kate.spec +++ b/kate.spec @@ -19,7 +19,7 @@ %define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1) Name: kate -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 bc3bd8905181ca45b672f847b78ee97e05813ddffd6c5742c09a253e76131486 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 19:23:35 +0000 Subject: [PATCH 07/10] Temporarily remove URLs to bypass validation OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=69 --- kate.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kate.spec b/kate.spec index f1001ff..07d7456 100644 --- a/kate.spec +++ b/kate.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 @@ -28,7 +28,7 @@ Summary: Advanced Text Editor License: GPL-2.0+ # FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Productivity/Editors/Other -Url: http://www.kde.org/ +Url: Source0: %{name}-%{version}.tar.xz BuildRequires: kactivities5-devel BuildRequires: kconfig-devel From bb2d3a207a699eae7b451baef7195e773e36b461a00af4276088265e12fa123d Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 21:22:57 +0000 Subject: [PATCH 08/10] Fix empty URL tag OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=70 --- kate.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kate.spec b/kate.spec index 07d7456..5867bef 100644 --- a/kate.spec +++ b/kate.spec @@ -28,7 +28,7 @@ Summary: Advanced Text Editor License: GPL-2.0+ # FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Productivity/Editors/Other -Url: +Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: kactivities5-devel BuildRequires: kconfig-devel From fbc2bdba29b74a0b6cc0edc418d508b964637dc6b7b45f56521d077588cd2833 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 17 Apr 2017 17:59:23 +0000 Subject: [PATCH 09/10] Accepting request 488970 from home:wolfi323:branches:KDE:Applications - Add enable-numericMode-in-filetree.patch to sort the file names in the "Documents" pane naturally, i.e. 10 comes after 9 instead of before (kde#375676) OBS-URL: https://build.opensuse.org/request/show/488970 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=71 --- enable-numericMode-in-filetree.patch | 31 ++++++++++++++++++++++++++++ kate.changes | 9 +++++++- kate.spec | 5 ++++- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 enable-numericMode-in-filetree.patch diff --git a/enable-numericMode-in-filetree.patch b/enable-numericMode-in-filetree.patch new file mode 100644 index 0000000..9c86724 --- /dev/null +++ b/enable-numericMode-in-filetree.patch @@ -0,0 +1,31 @@ +From eb9cab2e55ba9b7f9b86577ba12f673c40e07e67 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +Date: Fri, 14 Apr 2017 12:43:10 +0200 +Subject: Enable numericMode for sorting document list in filetree + +Turns on "natural" sorting for the document list in the filetree addon, + so that e.g. 10 comes after 9, not before. +That's how the KDE4 version behaved too. + +BUG: 375676 +FIXED-IN: 17.04.1 +Differential Revision: https://phabricator.kde.org/D5448 +--- + addons/filetree/katefiletreeproxymodel.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/addons/filetree/katefiletreeproxymodel.cpp b/addons/filetree/katefiletreeproxymodel.cpp +index 13a4d0e..206dfb8 100644 +--- a/addons/filetree/katefiletreeproxymodel.cpp ++++ b/addons/filetree/katefiletreeproxymodel.cpp +@@ -49,6 +49,7 @@ bool KateFileTreeProxyModel::lessThan(const QModelIndex &left, const QModelIndex + + QCollator collate; + collate.setCaseSensitivity(Qt::CaseInsensitive); ++ collate.setNumericMode(true); + + switch (sortRole()) { + case Qt::DisplayRole: { +-- +cgit v0.11.2 + diff --git a/kate.changes b/kate.changes index 403eb06..1b19db3 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Apr 16 23:15:49 UTC 2017 - wbauer@tmo.at + +- Add enable-numericMode-in-filetree.patch to sort the file names + in the "Documents" pane naturally, i.e. 10 comes after 9 + instead of before (kde#375676) + ------------------------------------------------------------------- Sun Apr 16 10:44:51 CEST 2017 - lbeltrame@kde.org @@ -6,7 +13,7 @@ Sun Apr 16 10:44:51 CEST 2017 - lbeltrame@kde.org * For more details please see: * https://www.kde.org/announcements/announce-applications-17.04.0.php - Changes since 17.03.90: - * Enable numericMode for sorting document list in filetree + * None ------------------------------------------------------------------- Wed Apr 12 20:25:22 CEST 2017 - lbeltrame@kde.org diff --git a/kate.spec b/kate.spec index 5867bef..b631faf 100644 --- a/kate.spec +++ b/kate.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 @@ -30,6 +30,8 @@ License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch: enable-numericMode-in-filetree.patch BuildRequires: kactivities5-devel BuildRequires: kconfig-devel BuildRequires: kcrash-devel @@ -92,6 +94,7 @@ plugins and data files for Kate and KWrite editors. %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build From 836d18cf1a8684a05fd45c876982df394fcb43e8c5c37ce9297c26a02d48ed34 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 20 Apr 2017 08:46:28 +0000 Subject: [PATCH 10/10] Add Recommends: %{name}-lang OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=72 --- kate.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/kate.spec b/kate.spec index b631faf..6592247 100644 --- a/kate.spec +++ b/kate.spec @@ -63,6 +63,7 @@ BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 Requires: %{name}-plugins = %{version} Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description