From cc9bd796b5f3500cad43eec185880d6c30590f100e60d90f86f4fae0810e6311 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Sep 2016 09:13:59 +0000 Subject: [PATCH 1/8] osc copypac from project:KDE:Unstable:Frameworks package:kde-cli-tools5 revision:88 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kde-cli-tools5?expand=0&rev=1 --- _service | 12 ++ ...s-5.7.90git~20160915T100742~ee24b4e.tar.xz | 3 + _service:set_version:kde-cli-tools5.spec | 132 ++++++++++++++++++ kde-cli-tools-5.7.4.tar.xz | 3 - kde-cli-tools5-rpmlintrc | 2 + kde-cli-tools5.changes | 92 ------------ kde-cli-tools5.spec | 15 +- kdesu-Do-not-change-minimum-size.patch | 23 --- kdesu-add-some-i18n-love.patch | 20 +-- 9 files changed, 166 insertions(+), 136 deletions(-) create mode 100644 _service create mode 100644 _service:recompress:tar_scm:kde-cli-tools-5.7.90git~20160915T100742~ee24b4e.tar.xz create mode 100644 _service:set_version:kde-cli-tools5.spec delete mode 100644 kde-cli-tools-5.7.4.tar.xz create mode 100644 kde-cli-tools5-rpmlintrc delete mode 100644 kdesu-Do-not-change-minimum-size.patch diff --git a/_service b/_service new file mode 100644 index 0000000..8f46b53 --- /dev/null +++ b/_service @@ -0,0 +1,12 @@ + + + git://anongit.kde.org/kde-cli-tools.git + git + 5.7.90git~%ci~%h + + + *.tar + xz + + + \ No newline at end of file diff --git a/_service:recompress:tar_scm:kde-cli-tools-5.7.90git~20160915T100742~ee24b4e.tar.xz b/_service:recompress:tar_scm:kde-cli-tools-5.7.90git~20160915T100742~ee24b4e.tar.xz new file mode 100644 index 0000000..a0582a1 --- /dev/null +++ b/_service:recompress:tar_scm:kde-cli-tools-5.7.90git~20160915T100742~ee24b4e.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cea521ace46c623c6d43135a24daa000f929de8549ba67bc9814f01fcd58ddab +size 66924 diff --git a/_service:set_version:kde-cli-tools5.spec b/_service:set_version:kde-cli-tools5.spec new file mode 100644 index 0000000..9b22cc4 --- /dev/null +++ b/_service:set_version:kde-cli-tools5.spec @@ -0,0 +1,132 @@ +# +# spec file for package kde-cli-tools5 +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + + +%bcond_without lang +Name: kde-cli-tools5 +Version: 5.7.90git~20160915T100742~ee24b4e +Release: 0 +Summary: Additional CLI tools for KDE applications +License: GPL-2.0+ +Group: System/GUI/KDE +Url: http://www.kde.org +Source: kde-cli-tools-%{version}.tar.xz +Source99: %{name}-rpmlintrc +# PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256 +Patch0: kdesu-add-some-i18n-love.patch +BuildRequires: extra-cmake-modules >= 1.3.0 +BuildRequires: kf5-filesystem +BuildRequires: xz +BuildRequires: cmake(KF5Config) >= 5.16.0 +BuildRequires: cmake(KF5DocTools) >= 5.16.0 +BuildRequires: cmake(KF5I18n) >= 5.16.0 +BuildRequires: cmake(KF5IconThemes) >= 5.16.0 +BuildRequires: cmake(KF5Init) >= 5.16.0 +BuildRequires: cmake(KF5KCMUtils) >= 5.16.0 +BuildRequires: cmake(KF5KDELibs4Support) >= 5.16.0 +BuildRequires: cmake(KF5KIO) >= 5.16.0 +BuildRequires: cmake(KF5Su) >= 5.16.0 +BuildRequires: cmake(KF5WindowSystem) >= 5.16.0 +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Svg) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) +# for kquitapp5 +Requires: kdbusaddons-tools +%if %{with lang} +Recommends: %{name}-lang +%endif +Requires(post): update-alternatives +Requires(postun): update-alternatives +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Additional CLI tools for KDE applications and workspaces. + +%lang_package +%prep +%setup -q -n kde-cli-tools-%{version} +%patch0 -p1 + +%build + %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 + %make_jobs + +%install + %kf5_makeinstall -C build + + # create a dummy target for /etc/alternatives/kdesu + install -d -m 755 %{buildroot}%{_sysconfdir}/alternatives/ + touch %{buildroot}%{_sysconfdir}/alternatives/kdesu + chmod +x %{buildroot}%{_sysconfdir}/alternatives/kdesu + ln -s -f %{_sysconfdir}/alternatives/kdesu %{buildroot}%{_kf5_bindir}/kdesu + touch %{buildroot}%{_sysconfdir}/alternatives/kdesu.1%{?ext_man} + mv %{buildroot}%{_kf5_mandir}/man1/kdesu.1 %{buildroot}%{_kf5_mandir}/man1/kdesu-5.1 + ln -s -f %{_sysconfdir}/alternatives/kdesu.1%{?ext_man} %{buildroot}%{_kf5_mandir}/man1/kdesu.1%{?ext_man} + +%post +/sbin/ldconfig +%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} +%{_sbindir}/update-alternatives \ + --install %{_kf5_bindir}/kdesu kdesu %{_kf5_libexecdir}/kdesu 25 \ + --slave %{_kf5_mandir}/man1/kdesu.1.gz kdesu.1%{?ext_man} %{_kf5_mandir}/man1/kdesu-5.1%{?ext_man} +%else +%{_sbindir}/update-alternatives \ + --install %{_kf5_bindir}/kdesu kdesu %{_kf5_libexecdir}/kdesu 15 \ + --slave %{_kf5_mandir}/man1/kdesu.1.gz kdesu.1%{?ext_man} %{_kf5_mandir}/man1/kdesu-5.1%{?ext_man} +%endif + +%postun +/sbin/ldconfig +if [ $1 -eq 0 ]; then + %{_sbindir}/update-alternatives --remove kdesu \ + %{_kf5_libexecdir}/kdesu +fi + +%files +%defattr(-,root,root) +%doc COPYING* +%{_kf5_bindir}/kdesu +%{_kf5_bindir}/kcmshell5 +%{_kf5_bindir}/kdecp5 +%{_kf5_bindir}/kdemv5 +%{_kf5_bindir}/kde-open5 +%{_kf5_bindir}/keditfiletype5 +%{_kf5_bindir}/kioclient5 +%{_kf5_bindir}/kmimetypefinder5 +%{_kf5_bindir}/ksvgtopng5 +%{_kf5_bindir}/kstart5 +%{_kf5_bindir}/ktraderclient5 +%{_kf5_servicesdir}/ +%{_kf5_libdir}/libkdeinit5_kcmshell5.so +%{_kf5_libexecdir}/ +%ghost %{_sysconfdir}/alternatives/kdesu +%{_kf5_plugindir}/ +%ghost %{_sysconfdir}/alternatives/kdesu.1%{?ext_man} +%doc %{_kf5_htmldir}/ +%{_kf5_mandir}/man1/kdesu*.* + +%if %{with lang} +%files lang +%defattr(-,root,root) +%{_kf5_localedir}/ +%endif + +%changelog diff --git a/kde-cli-tools-5.7.4.tar.xz b/kde-cli-tools-5.7.4.tar.xz deleted file mode 100644 index a7add33..0000000 --- a/kde-cli-tools-5.7.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:978c64bc0c5450528888467fb4e6aee1f3d2c3aefb1714da611a7fd131fa4d60 -size 486136 diff --git a/kde-cli-tools5-rpmlintrc b/kde-cli-tools5-rpmlintrc new file mode 100644 index 0000000..cc4ae51 --- /dev/null +++ b/kde-cli-tools5-rpmlintrc @@ -0,0 +1,2 @@ +# we don't use find_lang macro as it doesn't searches in subdirectories +addFilter("file-not-in-%lang .*") \ No newline at end of file diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 951052a..17e7500 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,95 +1,3 @@ -------------------------------------------------------------------- -Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de - -- Update to 5.7.4 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.4.php - -------------------------------------------------------------------- -Tue Aug 2 11:35:52 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.3 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.3.php - -------------------------------------------------------------------- -Fri Jul 22 10:43:13 UTC 2016 - wbauer@tmo.at - -- Add kdesu-Do-not-change-minimum-size.patch to prevent the - displayed command line text running into the password field - (boo#958785) - -------------------------------------------------------------------- -Wed Jul 20 08:54:18 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.2 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.2.php - -------------------------------------------------------------------- -Wed Jul 13 06:13:25 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.1 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.1.php - -------------------------------------------------------------------- -Tue Jul 5 11:13:41 UTC 2016 - wbauer@tmo.at - -- Use the new %kf5_find_lang macro to create the file list for the - lang package -- Remove rpmlintrc file, it is not needed any more now - -------------------------------------------------------------------- -Thu Jun 30 12:02:19 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.0 - * New feature release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.0.php - -------------------------------------------------------------------- -Mon May 30 19:15:56 UTC 2016 - wbauer@tmo.at - -- Add keditfiletype-create-directory-if-it-doesnt-exist.patch to - fix modifying filetypes on fresh user accounts (kde#356237) - -------------------------------------------------------------------- -Sun May 15 16:50:12 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.4 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.4.php - -------------------------------------------------------------------- -Tue Apr 19 20:45:31 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.3 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.3.php - -------------------------------------------------------------------- -Tue Apr 5 15:53:43 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.2 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.2.php - -------------------------------------------------------------------- -Tue Mar 29 16:20:39 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.1 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.1.php - ------------------------------------------------------------------- Sun Mar 20 09:19:48 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 785b3cb..2c2e379 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -18,17 +18,16 @@ %bcond_without lang Name: kde-cli-tools5 -Version: 5.7.4 +Version: 5.6.0 Release: 0 Summary: Additional CLI tools for KDE applications License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org Source: kde-cli-tools-%{version}.tar.xz +Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256 Patch0: kdesu-add-some-i18n-love.patch -# PATCH-FIX-UPSTREAM kdesu-Do-not-change-minimum-size.patch boo#958785 -- prevent the displayed command line text running into the password field -Patch1: kdesu-Do-not-change-minimum-size.patch BuildRequires: extra-cmake-modules >= 1.3.0 BuildRequires: kf5-filesystem BuildRequires: xz @@ -65,17 +64,13 @@ Additional CLI tools for KDE applications and workspaces. %prep %setup -q -n kde-cli-tools-%{version} %patch0 -p1 -%patch1 -p1 %build - %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} + %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 %make_jobs %install %kf5_makeinstall -C build -%if %{with lang} - %kf5_find_lang -%endif # create a dummy target for /etc/alternatives/kdesu install -d -m 755 %{buildroot}%{_sysconfdir}/alternatives/ @@ -129,7 +124,9 @@ fi %{_kf5_mandir}/man1/kdesu*.* %if %{with lang} -%files lang -f %{name}.lang +%files lang +%defattr(-,root,root) +%{_kf5_localedir}/ %endif %changelog diff --git a/kdesu-Do-not-change-minimum-size.patch b/kdesu-Do-not-change-minimum-size.patch deleted file mode 100644 index 8030bb1..0000000 --- a/kdesu-Do-not-change-minimum-size.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Christoph Feck -Date: Thu, 21 Jul 2016 21:34:02 +0000 -Subject: Do not change minimumSize() -X-Git-Url: http://quickgit.kde.org/?p=kde-cli-tools.git&a=commitdiff&h=dc023ba3cbd6e6fcbe8a6b13e1796a2c0744a5a2 ---- -Do not change minimumSize() - -KPasswordDialog knows better. ---- - - ---- a/kdesu/sudlg.cpp -+++ b/kdesu/sudlg.cpp -@@ -59,8 +59,6 @@ - if( withIgnoreButton ) { - connect(buttonBox()->button(QDialogButtonBox::Ignore), SIGNAL(clicked()), SLOT(slotUser1())); - } -- -- setMinimumSize(minimumSizeHint()); - } - - - diff --git a/kdesu-add-some-i18n-love.patch b/kdesu-add-some-i18n-love.patch index d5dfd48..9c8c0e2 100644 --- a/kdesu-add-some-i18n-love.patch +++ b/kdesu-add-some-i18n-love.patch @@ -15,16 +15,21 @@ diff --git a/kdesu/kdesu.cpp b/kdesu/kdesu.cpp index 9e7f173..f553422 100644 --- a/kdesu/kdesu.cpp +++ b/kdesu/kdesu.cpp -@@ -140,7 +140,7 @@ int main(int argc, char *argv[]) +@@ -160,11 +160,11 @@ if (result == 127) { - KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command))); + KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromUtf8(command))); } + if (result == -2) + { +- KMessageBox::sorry(0, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromLocal8Bit(command))); ++ KMessageBox::sorry(0, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromUtf8(command))); + } return result; -@@ -175,7 +175,7 @@ static int startApp(QCommandLineParser& p) +@@ -199,7 +199,7 @@ prompt = false; // Get target uid @@ -33,7 +38,7 @@ index 9e7f173..f553422 100644 QByteArray auth_user = user; struct passwd *pw = getpwnam(user); if (pw == 0L) -@@ -235,7 +235,7 @@ static int startApp(QCommandLineParser& p) +@@ -259,7 +259,7 @@ // Get command if (p.isSet("c")) { @@ -42,7 +47,7 @@ index 9e7f173..f553422 100644 // Accepting additional arguments here is somewhat weird, // but one can conceive use cases: have a complex command with // redirections and additional file names which need to be quoted -@@ -323,7 +323,7 @@ static int startApp(QCommandLineParser& p) +@@ -347,7 +347,7 @@ // } KUser u; @@ -51,7 +56,7 @@ index 9e7f173..f553422 100644 if (keep && !terminal && !just_started) { -@@ -429,7 +429,7 @@ static int startApp(QCommandLineParser& p) +@@ -459,7 +459,7 @@ } else if (keep && have_daemon) { @@ -60,7 +65,7 @@ index 9e7f173..f553422 100644 client.setPriority(priority); client.setScheduler(scheduler); int result = client.exec(command, user, options, env); -@@ -448,7 +448,7 @@ static int startApp(QCommandLineParser& p) +@@ -478,7 +478,7 @@ proc.setPriority(priority); proc.setScheduler(scheduler); proc.setCommand(command); @@ -69,6 +74,3 @@ index 9e7f173..f553422 100644 return result; } return -1; --- -1.8.4.4 - From cb48ae7db84e6c5ed577e996fdc95b8d80e1f1965548b40cf10603acc454ac12 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Sep 2016 17:10:55 +0000 Subject: [PATCH 2/8] Update to Plasma 5.7.95 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kde-cli-tools5?expand=0&rev=2 --- _service | 12 -- ...s-5.7.90git~20160915T100742~ee24b4e.tar.xz | 3 - _service:set_version:kde-cli-tools5.spec | 132 ------------------ kde-cli-tools-5.7.95.tar.xz | 3 + kde-cli-tools5.changes | 109 +++++++++++++++ kde-cli-tools5.spec | 4 +- 6 files changed, 114 insertions(+), 149 deletions(-) delete mode 100644 _service delete mode 100644 _service:recompress:tar_scm:kde-cli-tools-5.7.90git~20160915T100742~ee24b4e.tar.xz delete mode 100644 _service:set_version:kde-cli-tools5.spec create mode 100644 kde-cli-tools-5.7.95.tar.xz diff --git a/_service b/_service deleted file mode 100644 index 8f46b53..0000000 --- a/_service +++ /dev/null @@ -1,12 +0,0 @@ - - - git://anongit.kde.org/kde-cli-tools.git - git - 5.7.90git~%ci~%h - - - *.tar - xz - - - \ No newline at end of file diff --git a/_service:recompress:tar_scm:kde-cli-tools-5.7.90git~20160915T100742~ee24b4e.tar.xz b/_service:recompress:tar_scm:kde-cli-tools-5.7.90git~20160915T100742~ee24b4e.tar.xz deleted file mode 100644 index a0582a1..0000000 --- a/_service:recompress:tar_scm:kde-cli-tools-5.7.90git~20160915T100742~ee24b4e.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cea521ace46c623c6d43135a24daa000f929de8549ba67bc9814f01fcd58ddab -size 66924 diff --git a/_service:set_version:kde-cli-tools5.spec b/_service:set_version:kde-cli-tools5.spec deleted file mode 100644 index 9b22cc4..0000000 --- a/_service:set_version:kde-cli-tools5.spec +++ /dev/null @@ -1,132 +0,0 @@ -# -# spec file for package kde-cli-tools5 -# -# 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# 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/ -# - - -%bcond_without lang -Name: kde-cli-tools5 -Version: 5.7.90git~20160915T100742~ee24b4e -Release: 0 -Summary: Additional CLI tools for KDE applications -License: GPL-2.0+ -Group: System/GUI/KDE -Url: http://www.kde.org -Source: kde-cli-tools-%{version}.tar.xz -Source99: %{name}-rpmlintrc -# PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256 -Patch0: kdesu-add-some-i18n-love.patch -BuildRequires: extra-cmake-modules >= 1.3.0 -BuildRequires: kf5-filesystem -BuildRequires: xz -BuildRequires: cmake(KF5Config) >= 5.16.0 -BuildRequires: cmake(KF5DocTools) >= 5.16.0 -BuildRequires: cmake(KF5I18n) >= 5.16.0 -BuildRequires: cmake(KF5IconThemes) >= 5.16.0 -BuildRequires: cmake(KF5Init) >= 5.16.0 -BuildRequires: cmake(KF5KCMUtils) >= 5.16.0 -BuildRequires: cmake(KF5KDELibs4Support) >= 5.16.0 -BuildRequires: cmake(KF5KIO) >= 5.16.0 -BuildRequires: cmake(KF5Su) >= 5.16.0 -BuildRequires: cmake(KF5WindowSystem) >= 5.16.0 -BuildRequires: cmake(Qt5DBus) >= 5.4.0 -BuildRequires: cmake(Qt5Svg) >= 5.4.0 -BuildRequires: cmake(Qt5Test) >= 5.4.0 -BuildRequires: cmake(Qt5Widgets) >= 5.4.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xcb) -# for kquitapp5 -Requires: kdbusaddons-tools -%if %{with lang} -Recommends: %{name}-lang -%endif -Requires(post): update-alternatives -Requires(postun): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -Additional CLI tools for KDE applications and workspaces. - -%lang_package -%prep -%setup -q -n kde-cli-tools-%{version} -%patch0 -p1 - -%build - %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 - %make_jobs - -%install - %kf5_makeinstall -C build - - # create a dummy target for /etc/alternatives/kdesu - install -d -m 755 %{buildroot}%{_sysconfdir}/alternatives/ - touch %{buildroot}%{_sysconfdir}/alternatives/kdesu - chmod +x %{buildroot}%{_sysconfdir}/alternatives/kdesu - ln -s -f %{_sysconfdir}/alternatives/kdesu %{buildroot}%{_kf5_bindir}/kdesu - touch %{buildroot}%{_sysconfdir}/alternatives/kdesu.1%{?ext_man} - mv %{buildroot}%{_kf5_mandir}/man1/kdesu.1 %{buildroot}%{_kf5_mandir}/man1/kdesu-5.1 - ln -s -f %{_sysconfdir}/alternatives/kdesu.1%{?ext_man} %{buildroot}%{_kf5_mandir}/man1/kdesu.1%{?ext_man} - -%post -/sbin/ldconfig -%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} -%{_sbindir}/update-alternatives \ - --install %{_kf5_bindir}/kdesu kdesu %{_kf5_libexecdir}/kdesu 25 \ - --slave %{_kf5_mandir}/man1/kdesu.1.gz kdesu.1%{?ext_man} %{_kf5_mandir}/man1/kdesu-5.1%{?ext_man} -%else -%{_sbindir}/update-alternatives \ - --install %{_kf5_bindir}/kdesu kdesu %{_kf5_libexecdir}/kdesu 15 \ - --slave %{_kf5_mandir}/man1/kdesu.1.gz kdesu.1%{?ext_man} %{_kf5_mandir}/man1/kdesu-5.1%{?ext_man} -%endif - -%postun -/sbin/ldconfig -if [ $1 -eq 0 ]; then - %{_sbindir}/update-alternatives --remove kdesu \ - %{_kf5_libexecdir}/kdesu -fi - -%files -%defattr(-,root,root) -%doc COPYING* -%{_kf5_bindir}/kdesu -%{_kf5_bindir}/kcmshell5 -%{_kf5_bindir}/kdecp5 -%{_kf5_bindir}/kdemv5 -%{_kf5_bindir}/kde-open5 -%{_kf5_bindir}/keditfiletype5 -%{_kf5_bindir}/kioclient5 -%{_kf5_bindir}/kmimetypefinder5 -%{_kf5_bindir}/ksvgtopng5 -%{_kf5_bindir}/kstart5 -%{_kf5_bindir}/ktraderclient5 -%{_kf5_servicesdir}/ -%{_kf5_libdir}/libkdeinit5_kcmshell5.so -%{_kf5_libexecdir}/ -%ghost %{_sysconfdir}/alternatives/kdesu -%{_kf5_plugindir}/ -%ghost %{_sysconfdir}/alternatives/kdesu.1%{?ext_man} -%doc %{_kf5_htmldir}/ -%{_kf5_mandir}/man1/kdesu*.* - -%if %{with lang} -%files lang -%defattr(-,root,root) -%{_kf5_localedir}/ -%endif - -%changelog diff --git a/kde-cli-tools-5.7.95.tar.xz b/kde-cli-tools-5.7.95.tar.xz new file mode 100644 index 0000000..9f01bdf --- /dev/null +++ b/kde-cli-tools-5.7.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dee0c2c41401ced2ff6d74850dcbf3ac9851d19eaab9f20b6610a466a74999a8 +size 486416 diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 17e7500..76e2e60 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,3 +1,112 @@ +------------------------------------------------------------------- +Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.95 (Plasma 5.8 Beta) + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.95.php + +------------------------------------------------------------------- +Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.5 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.5.php +- Refresh kdesu-add-some-i18n-love.patch and add new change + +------------------------------------------------------------------- +Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- +Tue Aug 2 11:35:52 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.3 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.3.php + +------------------------------------------------------------------- +Fri Jul 22 10:43:13 UTC 2016 - wbauer@tmo.at + +- Add kdesu-Do-not-change-minimum-size.patch to prevent the + displayed command line text running into the password field + (boo#958785) + +------------------------------------------------------------------- +Wed Jul 20 08:54:18 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.2 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.2.php + +------------------------------------------------------------------- +Wed Jul 13 06:13:25 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.1 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.1.php + +------------------------------------------------------------------- +Tue Jul 5 11:13:41 UTC 2016 - wbauer@tmo.at + +- Use the new %kf5_find_lang macro to create the file list for the + lang package +- Remove rpmlintrc file, it is not needed any more now + +------------------------------------------------------------------- +Thu Jun 30 12:02:19 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.0 + * New feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.0.php + +------------------------------------------------------------------- +Mon May 30 19:15:56 UTC 2016 - wbauer@tmo.at + +- Add keditfiletype-create-directory-if-it-doesnt-exist.patch to + fix modifying filetypes on fresh user accounts (kde#356237) + +------------------------------------------------------------------- +Sun May 15 16:50:12 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.4.php + +------------------------------------------------------------------- +Tue Apr 19 20:45:31 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.3 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.3.php + +------------------------------------------------------------------- +Tue Apr 5 15:53:43 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.2 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.2.php + +------------------------------------------------------------------- +Tue Mar 29 16:20:39 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.1 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.1.php + ------------------------------------------------------------------- Sun Mar 20 09:19:48 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 2c2e379..36646b0 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -18,13 +18,13 @@ %bcond_without lang Name: kde-cli-tools5 -Version: 5.6.0 +Version: 5.7.95 Release: 0 Summary: Additional CLI tools for KDE applications License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Source: kde-cli-tools-%{version}.tar.xz +Source: http://download.kde.org/unstable/plasma/%{version}/kde-cli-tools-%{version}.tar.xz Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256 Patch0: kdesu-add-some-i18n-love.patch From afee60e5a4600c2907bd5b1754a163bb45e4f8d9861c43803c8c393b5689b647 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Sep 2016 19:40:54 +0000 Subject: [PATCH 3/8] Use kf5_find_lang everywhere OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kde-cli-tools5?expand=0&rev=3 --- kde-cli-tools5.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 36646b0..9bedf4b 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -66,11 +66,14 @@ Additional CLI tools for KDE applications and workspaces. %patch0 -p1 %build - %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 + %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %make_jobs %install %kf5_makeinstall -C build +%if %{with lang} + %kf5_find_lang +%endif # create a dummy target for /etc/alternatives/kdesu install -d -m 755 %{buildroot}%{_sysconfdir}/alternatives/ @@ -124,9 +127,7 @@ fi %{_kf5_mandir}/man1/kdesu*.* %if %{with lang} -%files lang -%defattr(-,root,root) -%{_kf5_localedir}/ +%files lang -f %{name}.lang %endif %changelog From e19c67fce01daaad5783d867d5c9fba2ddf46d45f5fc046eb384624bf4ed7d42 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Fri, 16 Sep 2016 14:42:52 +0000 Subject: [PATCH 4/8] Accepting request 428234 from home:alarrosa:branches:KDE:Frameworks5:LTS - Removed patch kdesu-Do-not-change-minimum-size.patch OBS-URL: https://build.opensuse.org/request/show/428234 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kde-cli-tools5?expand=0&rev=4 --- kde-cli-tools5.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 76e2e60..aa26d75 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -5,6 +5,7 @@ Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de * New LTS feature release * For more details please see: https://www.kde.org/announcements/plasma-5.7.95.php +- Removed patch kdesu-Do-not-change-minimum-size.patch ------------------------------------------------------------------- Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de From 4bb7153d818f7839c8d4df02fc248abe5c3a28edcba144e7b375627b334473ce Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 17 Sep 2016 18:00:47 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kde-cli-tools5?expand=0&rev=5 --- kde-cli-tools5-rpmlintrc | 2 -- kde-cli-tools5.spec | 1 - 2 files changed, 3 deletions(-) delete mode 100644 kde-cli-tools5-rpmlintrc diff --git a/kde-cli-tools5-rpmlintrc b/kde-cli-tools5-rpmlintrc deleted file mode 100644 index cc4ae51..0000000 --- a/kde-cli-tools5-rpmlintrc +++ /dev/null @@ -1,2 +0,0 @@ -# we don't use find_lang macro as it doesn't searches in subdirectories -addFilter("file-not-in-%lang .*") \ No newline at end of file diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 9bedf4b..e0adcce 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -25,7 +25,6 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/unstable/plasma/%{version}/kde-cli-tools-%{version}.tar.xz -Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256 Patch0: kdesu-add-some-i18n-love.patch BuildRequires: extra-cmake-modules >= 1.3.0 From e42dd3ef8b475b5d20f960fc38c8207ec9ad44521cef7976ac07e3d23435e37b Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 26 Sep 2016 08:23:12 +0000 Subject: [PATCH 6/8] - Remove unnecessary kde-cli-tools5-rpmlintrc OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kde-cli-tools5?expand=0&rev=6 --- kde-cli-tools5.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index aa26d75..8ea08e1 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 26 08:22:42 UTC 2016 - fabian@ritter-vogt.de + +- Remove unnecessary kde-cli-tools5-rpmlintrc + ------------------------------------------------------------------- Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de From 50c3ca4461967d40a725277634ef604bb4ccb6a7b57042fa638972a1edb2f3ba Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Sat, 1 Oct 2016 22:14:31 +0000 Subject: [PATCH 7/8] Accepting request 432190 from home:Vogtinator:branches:KDE:Frameworks5:LTS OBS-URL: https://build.opensuse.org/request/show/432190 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kde-cli-tools5?expand=0&rev=7 --- kde-cli-tools-5.7.95.tar.xz | 3 --- kde-cli-tools-5.8.0.tar.xz | 3 +++ kde-cli-tools5.changes | 8 ++++++++ kde-cli-tools5.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 kde-cli-tools-5.7.95.tar.xz create mode 100644 kde-cli-tools-5.8.0.tar.xz diff --git a/kde-cli-tools-5.7.95.tar.xz b/kde-cli-tools-5.7.95.tar.xz deleted file mode 100644 index 9f01bdf..0000000 --- a/kde-cli-tools-5.7.95.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dee0c2c41401ced2ff6d74850dcbf3ac9851d19eaab9f20b6610a466a74999a8 -size 486416 diff --git a/kde-cli-tools-5.8.0.tar.xz b/kde-cli-tools-5.8.0.tar.xz new file mode 100644 index 0000000..3751eea --- /dev/null +++ b/kde-cli-tools-5.8.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8561295ef8892d947a91b25cb4cddbb6c5cc40b39657a6cfc6fe4cfd98e728a6 +size 485448 diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 8ea08e1..925e414 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 29 16:36:28 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.8.0 + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.8.0.php + ------------------------------------------------------------------- Mon Sep 26 08:22:42 UTC 2016 - fabian@ritter-vogt.de diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index e0adcce..cb7a5a7 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kde-cli-tools5 -Version: 5.7.95 +Version: 5.8.0 Release: 0 Summary: Additional CLI tools for KDE applications License: GPL-2.0+ From e50f8ebb3b680791d9ac49cf1d7fecf4ed0aaa4822314fb9a71eeee21482c663 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 2 Oct 2016 08:45:44 +0000 Subject: [PATCH 8/8] Remove source URLs temporarily OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kde-cli-tools5?expand=0&rev=8 --- kde-cli-tools5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index cb7a5a7..88660cd 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -24,7 +24,7 @@ Summary: Additional CLI tools for KDE applications License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/unstable/plasma/%{version}/kde-cli-tools-%{version}.tar.xz +Source: kde-cli-tools-%{version}.tar.xz # PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256 Patch0: kdesu-add-some-i18n-love.patch BuildRequires: extra-cmake-modules >= 1.3.0