From 01b8e501ed0d32ed830e6fdde310ba11a432a8a19a3c851e93be78260fa79422 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 21 Nov 2017 22:47:37 +0000 Subject: [PATCH 1/5] KDE Applications 17.12 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/sweeper?expand=0&rev=64 --- sweeper-17.08.3.tar.xz | 3 -- sweeper-17.11.80.tar.xz | 3 ++ sweeper.changes | 10 ++++++ sweeper.spec | 80 +++++++++++++++++++++++++++-------------- 4 files changed, 67 insertions(+), 29 deletions(-) delete mode 100644 sweeper-17.08.3.tar.xz create mode 100644 sweeper-17.11.80.tar.xz diff --git a/sweeper-17.08.3.tar.xz b/sweeper-17.08.3.tar.xz deleted file mode 100644 index fa6fe09..0000000 --- a/sweeper-17.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b61bb0e9e86f3aeeedb5aae4b7d6d909cd7bf26dd6df2e3cd29a7b22c09fd54b -size 82304 diff --git a/sweeper-17.11.80.tar.xz b/sweeper-17.11.80.tar.xz new file mode 100644 index 0000000..ed05e76 --- /dev/null +++ b/sweeper-17.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:200a9427730234c67a57870df45a2386801560ac6d0f0e8e507ce26a744eb518 +size 382028 diff --git a/sweeper.changes b/sweeper.changes index 8a52a5f..214c67c 100644 --- a/sweeper.changes +++ b/sweeper.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Nov 20 06:59:52 CET 2017 - lbeltrame@kde.org + +- Update to 17.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12-beta.php +- Changes since 17.08.3: + * Too many changes to list here + ------------------------------------------------------------------- Thu Nov 09 23:13:26 CET 2017 - lbeltrame@kde.org diff --git a/sweeper.spec b/sweeper.spec index d834346..d39afc6 100644 --- a/sweeper.spec +++ b/sweeper.spec @@ -1,7 +1,7 @@ # # spec file for package sweeper # -# Copyright (c) 2015 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,53 +15,81 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%bcond_without lang Name: sweeper -Version: 17.08.3 +Version: 17.11.80 Release: 0 +%define kf5_version 5.26.0 +# 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: KDE Privacy Utility License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org Source0: sweeper-%{version}.tar.xz -Patch1: desktop-files.diff -BuildRequires: libkde4-devel -BuildRequires: oxygen5-icon-theme +BuildRequires: breeze5-icons +BuildRequires: extra-cmake-modules +BuildRequires: kbookmarks-devel +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kcrash-devel +BuildRequires: kdoctools-devel +BuildRequires: ki18n-devel +BuildRequires: kio-devel +BuildRequires: ktextwidgets-devel +BuildRequires: kxmlgui-devel +BuildRequires: kactivities-stats-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Widgets) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires +%if %{with lang} +Recommends: %{name}-lang +%endif + %description Helps clean unwanted traces the user leaves on the system. +%if %{with lang} +%lang_package +%endif + %prep %setup -q -n sweeper-%{version} -%patch1 %build -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -cd build -%make_install -for i in 16 22 32 48; do -mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/apps -cp %{_kde4_iconsdir}/oxygen/base/${i}x${i}/actions/trash-empty.png %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/apps/sweeper.png -done -%suse_update_desktop_file sweeper Utility Security -%kde_post_install - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%kf5_makeinstall -C build +%if %{with lang} + %find_lang %{name} --with-man --all-name + %kf5_find_htmldocs +%endif +%suse_update_desktop_file org.kde.sweeper Utility Security +mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/actions +mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/apps/ +cp %{_kf5_iconsdir}/breeze/actions/24/trash-empty.svg %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/actions/ +cp %{_kf5_iconsdir}/breeze/apps/48/sweeper.svg %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/apps/ %files %defattr(-,root,root) -%_kde4_bindir/sweeper -%_kde4_applicationsdir/sweeper.desktop -%{_datadir}/dbus-1/interfaces/*.xml -%_kde4_htmldir/en/sweeper/ -%_kde4_appsdir/sweeper/ -%{_kde4_iconsdir}/hicolor/*/*/* +%doc %lang(en) %{_kf5_htmldir}/en/sweeper/ +%{_kf5_applicationsdir}/org.kde.sweeper.desktop +%{_kf5_appstreamdir}/org.kde.sweeper.appdata.xml +%{_kf5_bindir}/sweeper +%{_kf5_iconsdir}/hicolor/scalable/*/* +%{_kf5_kxmlguidir}/sweeper/ +%{_kf5_sharedir}/dbus-1/interfaces/*.xml + +%if %{with lang} +%files lang -f %{name}.lang +%endif %changelog From c626dd9f72913d3994cb3a898348318fb36f896dbd876a2facc482e83ccdbbc7 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 2 Dec 2017 16:52:59 +0000 Subject: [PATCH 2/5] KDE Applications 17.12.0 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/sweeper?expand=0&rev=65 --- sweeper-17.11.80.tar.xz | 3 --- sweeper-17.11.90.tar.xz | 3 +++ sweeper.changes | 10 ++++++++++ sweeper.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 sweeper-17.11.80.tar.xz create mode 100644 sweeper-17.11.90.tar.xz diff --git a/sweeper-17.11.80.tar.xz b/sweeper-17.11.80.tar.xz deleted file mode 100644 index ed05e76..0000000 --- a/sweeper-17.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:200a9427730234c67a57870df45a2386801560ac6d0f0e8e507ce26a744eb518 -size 382028 diff --git a/sweeper-17.11.90.tar.xz b/sweeper-17.11.90.tar.xz new file mode 100644 index 0000000..9e04a28 --- /dev/null +++ b/sweeper-17.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ac0f69e4da710372dc50da6b656a4598ed4823c4a14780bb94bd62d140b262b +size 382252 diff --git a/sweeper.changes b/sweeper.changes index 214c67c..ea5b1b4 100644 --- a/sweeper.changes +++ b/sweeper.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Dec 02 10:12:39 CET 2017 - lbeltrame@kde.org + +- Update to 17.11.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12-rc.php +- Changes since 17.11.80: + * None + ------------------------------------------------------------------- Mon Nov 20 06:59:52 CET 2017 - lbeltrame@kde.org diff --git a/sweeper.spec b/sweeper.spec index d39afc6..2bb9838 100644 --- a/sweeper.spec +++ b/sweeper.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: sweeper -Version: 17.11.80 +Version: 17.11.90 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) From bc56ee796430a0925f7c7c90203c51cdf99cff6c14dc5ca2104df2e727e3b2f4 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 11 Dec 2017 18:31:42 +0000 Subject: [PATCH 3/5] KDE Applications 17.12 final OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/sweeper?expand=0&rev=66 --- sweeper-17.11.90.tar.xz | 3 --- sweeper-17.12.0.tar.xz | 3 +++ sweeper.changes | 10 ++++++++++ sweeper.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 sweeper-17.11.90.tar.xz create mode 100644 sweeper-17.12.0.tar.xz diff --git a/sweeper-17.11.90.tar.xz b/sweeper-17.11.90.tar.xz deleted file mode 100644 index 9e04a28..0000000 --- a/sweeper-17.11.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ac0f69e4da710372dc50da6b656a4598ed4823c4a14780bb94bd62d140b262b -size 382252 diff --git a/sweeper-17.12.0.tar.xz b/sweeper-17.12.0.tar.xz new file mode 100644 index 0000000..87b4dba --- /dev/null +++ b/sweeper-17.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:525ae0719df849c16487fea28e3fdedffb58e746265402058c82cb3b5a674c33 +size 382308 diff --git a/sweeper.changes b/sweeper.changes index ea5b1b4..f60c2d7 100644 --- a/sweeper.changes +++ b/sweeper.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Dec 09 14:59:13 CET 2017 - lbeltrame@kde.org + +- Update to 17.12.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.0.php +- Changes since 17.11.90: + * None + ------------------------------------------------------------------- Sat Dec 02 10:12:39 CET 2017 - lbeltrame@kde.org diff --git a/sweeper.spec b/sweeper.spec index 2bb9838..de18e0b 100644 --- a/sweeper.spec +++ b/sweeper.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: sweeper -Version: 17.11.90 +Version: 17.12.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) From 1f651e6b65818344b050e23c598bd49b0e8d26767570fde292f03135d199b76b Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 11 Dec 2017 22:29:52 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/sweeper?expand=0&rev=67 --- sweeper.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sweeper.changes b/sweeper.changes index f60c2d7..4b7da3f 100644 --- a/sweeper.changes +++ b/sweeper.changes @@ -7,6 +7,8 @@ Sat Dec 09 14:59:13 CET 2017 - lbeltrame@kde.org * https://www.kde.org/announcements/announce-applications-17.12.0.php - Changes since 17.11.90: * None +- Removed patches, no longer needed: + * desktop-files.diff ------------------------------------------------------------------- Sat Dec 02 10:12:39 CET 2017 - lbeltrame@kde.org From b576e9d4c998466717afd750df2fdebaa3d7d5b52b946d5cd86e723e2d47a6a9 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 11 Dec 2017 22:30:02 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/sweeper?expand=0&rev=68 --- desktop-files.diff | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 desktop-files.diff diff --git a/desktop-files.diff b/desktop-files.diff deleted file mode 100644 index c39c330..0000000 --- a/desktop-files.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: sweeper.desktop -=================================================================== ---- sweeper.desktop.orig -+++ sweeper.desktop -@@ -2,6 +2,7 @@ - X-DocPath= - Icon=sweeper - Exec=sweeper -+OnlyShowIn=KDE; - Type=Application - Terminal=false - X-KDE-StartupNotify=true