From c1a071d5a2902a0b6688cbc54b56777c8050b4a21f97061100b64b024ab0149d Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 8 Aug 2014 17:30:22 +0000 Subject: [PATCH 1/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=19 --- kde-cli-tools-5.0.0.tar.xz | 3 --- kde-cli-tools-5.0.1.tar.xz | 3 +++ kde-cli-tools5.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 kde-cli-tools-5.0.0.tar.xz create mode 100644 kde-cli-tools-5.0.1.tar.xz diff --git a/kde-cli-tools-5.0.0.tar.xz b/kde-cli-tools-5.0.0.tar.xz deleted file mode 100644 index a84a5b8..0000000 --- a/kde-cli-tools-5.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ccf1f0c460ffe5148c8dbc12caad2be6a1c40fee27eab75ecd6c88c338be6c8b -size 467180 diff --git a/kde-cli-tools-5.0.1.tar.xz b/kde-cli-tools-5.0.1.tar.xz new file mode 100644 index 0000000..0e83b8c --- /dev/null +++ b/kde-cli-tools-5.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a0d48278e0bec794ff7ec520bb66ccce3d71896d201663d6f302f7721ef43b7 +size 467124 diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index e01cbe7..982cbd5 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -17,7 +17,7 @@ Name: kde-cli-tools5 -Version: 5.0.0 +Version: 5.0.1 Release: 0 Summary: Additional CLI tools for KDE applications License: GPL-2.0+ From effc82ea1e7166ff597fd4247d56ce67c66b74dff56b8b790586b8093b40ac5a Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 8 Aug 2014 17:40:00 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=20 --- kde-cli-tools5.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 1d439eb..34a6fab 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 8 17:31:10 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.0.1 + * Translation updates + ------------------------------------------------------------------- Fri Jul 11 18:33:06 UTC 2014 - hrvoje.senjan@gmail.com From e5c91ba864674dd93543d799cb89e40013cf35f07d0e49f6cd24e412bb902d27 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 8 Aug 2014 21:20:39 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=21 --- kde-cli-tools5.changes | 1 + kde-cli-tools5.spec | 28 +++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 34a6fab..658d4fa 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -3,6 +3,7 @@ Fri Aug 8 17:31:10 UTC 2014 - hrvoje.senjan@gmail.com - Update to 5.0.1 * Translation updates +- Install kdesu via update-alternatives ------------------------------------------------------------------- Fri Jul 11 18:33:06 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 982cbd5..05a244c 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -46,7 +46,6 @@ Additional CLI tools for KDE applications and workspaces. %prep %setup -q -n kde-cli-tools-%{version} -sed -i '/^add_subdirectory(doc)/d' CMakeLists.txt %build %cmake_kf5 -d build -- -DBUILD_po=OFF @@ -55,12 +54,29 @@ sed -i '/^add_subdirectory(doc)/d' CMakeLists.txt %install %kf5_makeinstall -C build -%post -p /sbin/ldconfig + # 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 + ln -s -f %{_sysconfdir}/alternatives/kdesu.1%{?ext_man} %{buildroot}%{_mandir}/man1/kdesu.1%{?ext_man} -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +%{_sbindir}/update-alternatives \ + --install %{_kf5_bindir}/kdesu kdesu %{_kf5_libdir}/libexec/kdesu 15 \ + --slave %{_kf5_mandir}/man1/kdesu.1.gz kdesu.1%{?ext_man} %{_kf5_mandir}/man1/kdesu.1%{?ext_man} + +%postun +/sbin/ldconfig +if [ $1 -eq 0 ]; then + %{_sbindir}/update-alternatives --remove kdesu \ + %{_kf5_libdir}/libexec/kdesu +fi %files %defattr(-,root,root) +%{_kf5_bindir}/kdesu %{_kf5_bindir}/kcmshell5 %{_kf5_bindir}/kdecp5 %{_kf5_bindir}/kdemv5 @@ -74,8 +90,10 @@ sed -i '/^add_subdirectory(doc)/d' CMakeLists.txt %{_kf5_servicesdir}/ %{_kf5_libdir}/libkdeinit5_kcmshell5.so %{_kf5_libdir}/libexec/ +%ghost %{_sysconfdir}/alternatives/kdesu %{_kf5_plugindir}/ -#doc %{_kf5_htmldir}/ -#{_kf5_mandir}/man1/kdesu.* +%ghost %{_sysconfdir}/alternatives/kdesu.1%{?ext_man} +%doc %{_kf5_htmldir}/ +%{_kf5_mandir}/man1/kdesu.* %changelog From 6618995ab24aca9a1bfb14a4e8b364ecfa3fb37d723471bc7bebf74998f74ffd Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 8 Aug 2014 21:31:51 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=22 --- kde-cli-tools5.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 05a244c..ad71750 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -59,7 +59,9 @@ Additional CLI tools for KDE applications and workspaces. touch %{buildroot}%{_sysconfdir}/alternatives/kdesu chmod +x %{buildroot}%{_sysconfdir}/alternatives/kdesu ln -s -f %{_sysconfdir}/alternatives/kdesu %{buildroot}%{_kf5_bindir}/kdesu - ln -s -f %{_sysconfdir}/alternatives/kdesu.1%{?ext_man} %{buildroot}%{_mandir}/man1/kdesu.1%{?ext_man} + touch %{buildroot}%{_sysconfdir}/alternatives/kdesu.1%{?ext_man} + mv %{buildroot}%{_mandir}/man1/kdesu.1 %{buildroot}%{_mandir}/man1/kdesu-4.1 + ln -s -f %{_sysconfdir}/alternatives/kdesu.1%{?ext_man} %{buildroot}%{_mandir}/man1/kdesu.1%{?ext_man} %post /sbin/ldconfig @@ -94,6 +96,6 @@ fi %{_kf5_plugindir}/ %ghost %{_sysconfdir}/alternatives/kdesu.1%{?ext_man} %doc %{_kf5_htmldir}/ -%{_kf5_mandir}/man1/kdesu.* +%{_kf5_mandir}/man1/kdesu*.* %changelog From 0829a990b271bf9b2628f3d9333a9857e2aee18a1863109bae172b19ecf650ae Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 8 Aug 2014 21:40:31 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=23 --- kde-cli-tools5.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index ad71750..8380386 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -60,14 +60,14 @@ Additional CLI tools for KDE applications and workspaces. 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}%{_mandir}/man1/kdesu.1 %{buildroot}%{_mandir}/man1/kdesu-4.1 + mv %{buildroot}%{_mandir}/man1/kdesu.1 %{buildroot}%{_mandir}/man1/kdesu-5.1 ln -s -f %{_sysconfdir}/alternatives/kdesu.1%{?ext_man} %{buildroot}%{_mandir}/man1/kdesu.1%{?ext_man} %post /sbin/ldconfig %{_sbindir}/update-alternatives \ --install %{_kf5_bindir}/kdesu kdesu %{_kf5_libdir}/libexec/kdesu 15 \ - --slave %{_kf5_mandir}/man1/kdesu.1.gz kdesu.1%{?ext_man} %{_kf5_mandir}/man1/kdesu.1%{?ext_man} + --slave %{_kf5_mandir}/man1/kdesu.1.gz kdesu.1%{?ext_man} %{_kf5_mandir}/man1/kdesu-5.1%{?ext_man} %postun /sbin/ldconfig From 16a0665daad30bb654509418933aea438a985870157c3e134e1f905faab350f9 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 8 Aug 2014 21:46:12 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=24 --- kde-cli-tools5.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 8380386..e69f5e1 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -39,6 +39,8 @@ BuildRequires: pkgconfig(Qt5Test) >= 5.3.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.3.0 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.3.0 BuildRequires: pkgconfig(x11) +Requires(post): update-alternatives +Requires(postun): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build %description From 6012196d368cda15e519c72b858f983fb4afcfc3d389340eaef7ec04da494290 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 12 Aug 2014 18:09:37 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=25 --- kde-cli-tools5.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index e69f5e1..035e026 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -62,8 +62,8 @@ Additional CLI tools for KDE applications and workspaces. 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}%{_mandir}/man1/kdesu.1 %{buildroot}%{_mandir}/man1/kdesu-5.1 - ln -s -f %{_sysconfdir}/alternatives/kdesu.1%{?ext_man} %{buildroot}%{_mandir}/man1/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 From d04e710a8a917ce0c91ffea8fb572656916490c50f71a6385e2ca87d441a6268 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Thu, 14 Aug 2014 21:05:01 +0000 Subject: [PATCH 8/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=26 --- kde-cli-tools5.changes | 1 + kde-cli-tools5.spec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 658d4fa..ac42781 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -4,6 +4,7 @@ Fri Aug 8 17:31:10 UTC 2014 - hrvoje.senjan@gmail.com - Update to 5.0.1 * Translation updates - Install kdesu via update-alternatives +- Require kdbusaddons-tools package ------------------------------------------------------------------- Fri Jul 11 18:33:06 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 035e026..13ff155 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -39,6 +39,8 @@ BuildRequires: pkgconfig(Qt5Test) >= 5.3.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.3.0 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.3.0 BuildRequires: pkgconfig(x11) +# for kquitapp5 +Requires: kdbusaddons-tools Requires(post): update-alternatives Requires(postun): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build