From c64b256fd55e3c09f25d6c7549ac35bc2b9cc162d01f2268f8f543e181fe81f4 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 24 Nov 2018 23:45:34 +0000 Subject: [PATCH 1/4] KDE Applications 18.12.0 Beta (last try; fix any other issue post acceptance) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/pim-sieve-editor?expand=0&rev=65 --- pim-sieve-editor-18.08.3.tar.xz | 3 --- pim-sieve-editor-18.11.80.tar.xz | 3 +++ pim-sieve-editor.changes | 15 ++++++++++++ pim-sieve-editor.spec | 39 +++++++++++++++----------------- 4 files changed, 36 insertions(+), 24 deletions(-) delete mode 100644 pim-sieve-editor-18.08.3.tar.xz create mode 100644 pim-sieve-editor-18.11.80.tar.xz diff --git a/pim-sieve-editor-18.08.3.tar.xz b/pim-sieve-editor-18.08.3.tar.xz deleted file mode 100644 index febb6e1..0000000 --- a/pim-sieve-editor-18.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dbd35e92007911e9a627521d94c5e3aca0918d65b19fa7d9dcfc1d798c3200b -size 448636 diff --git a/pim-sieve-editor-18.11.80.tar.xz b/pim-sieve-editor-18.11.80.tar.xz new file mode 100644 index 0000000..8fd4fb4 --- /dev/null +++ b/pim-sieve-editor-18.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cd662162bf9527202033687198cd5207b3e1d65714b52635ba17c7424e861b8 +size 450496 diff --git a/pim-sieve-editor.changes b/pim-sieve-editor.changes index 5f034c0..3b0caf6 100644 --- a/pim-sieve-editor.changes +++ b/pim-sieve-editor.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Nov 20 06:23:06 UTC 2018 - Luca Beltrame + +- Run spec-cleaner + +------------------------------------------------------------------- +Tue Nov 20 05:57:36 UTC 2018 - lbeltrame@kde.org + +- Update to 18.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.11.80.php +- Changes since 18.08.3: + * Too many changes to list here + ------------------------------------------------------------------- Thu Nov 08 20:44:19 UTC 2018 - lbeltrame@kde.org diff --git a/pim-sieve-editor.spec b/pim-sieve-editor.spec index 6cd7f80..bafe707 100644 --- a/pim-sieve-editor.spec +++ b/pim-sieve-editor.spec @@ -16,21 +16,26 @@ # -%bcond_without lang - -Name: pim-sieve-editor -Version: 18.08.3 -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: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang +Name: pim-sieve-editor +Version: 18.11.80 +Release: 0 Summary: Sieve scripts editor for KDE PIM License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/KDE -Url: http://www.kde.org +URL: http://www.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: gettext-devel +# Is only required for the icon +BuildRequires: kmail-application-icons +BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: update-desktop-files +BuildRequires: xz BuildRequires: cmake(KF5Bookmarks) BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5DBusAddons) @@ -41,29 +46,22 @@ BuildRequires: cmake(KF5LibKSieve) BuildRequires: cmake(KF5MailTransport) BuildRequires: cmake(KF5PimCommon) BuildRequires: cmake(KF5PimTextEdit) -# Is only required for the icon -BuildRequires: kmail-application-icons -BuildRequires: pkgconfig -BuildRequires: python-devel -BuildRequires: update-desktop-files -BuildRequires: xz BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +Requires: kmail +# It can only build on the same platforms as Qt Webengine +ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %endif -Requires: kmail %if %{with lang} Recommends: %{name}-lang %endif -# It can only build on the same platforms as Qt Webengine -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package provides an editor, complete with syntax highlighting and @@ -85,17 +83,15 @@ in KDE PIM applications. %kf5_makeinstall -C build %if %{with lang} %find_lang %{name} --with-man --all-name - %kf5_find_htmldocs + %{kf5_find_htmldocs} %endif %suse_update_desktop_file org.kde.sieveeditor Network Email %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %config %{_kf5_configdir}/sieveeditor.categories %config %{_kf5_configdir}/sieveeditor.renamecategories %doc %lang(en) %{_kf5_htmldir}/en/sieveeditor/ @@ -104,10 +100,11 @@ in KDE PIM applications. %{_kf5_configkcfgdir}/sieveeditorglobalconfig.kcfg %{_kf5_libdir}/libsieveeditor.so.* %{_kf5_sharedir}/kconf_update/ +%{_kf5_appstreamdir}/org.kde.sieveeditor.appdata.xml %if %{with lang} %files lang -f %{name}.lang -%doc COPYING* +%license COPYING* %endif %changelog From 8bbe235bd5778c50e2e84d6ada48e3b43ef9ca8f7e68144dce8427a8300e92d2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 4 Dec 2018 16:23:19 +0000 Subject: [PATCH 2/4] KDE Applications 18.12.0 RC (knights is already in K:A) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/pim-sieve-editor?expand=0&rev=66 --- pim-sieve-editor-18.11.80.tar.xz | 3 --- pim-sieve-editor-18.11.90.tar.xz | 3 +++ pim-sieve-editor.changes | 10 ++++++++++ pim-sieve-editor.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 pim-sieve-editor-18.11.80.tar.xz create mode 100644 pim-sieve-editor-18.11.90.tar.xz diff --git a/pim-sieve-editor-18.11.80.tar.xz b/pim-sieve-editor-18.11.80.tar.xz deleted file mode 100644 index 8fd4fb4..0000000 --- a/pim-sieve-editor-18.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cd662162bf9527202033687198cd5207b3e1d65714b52635ba17c7424e861b8 -size 450496 diff --git a/pim-sieve-editor-18.11.90.tar.xz b/pim-sieve-editor-18.11.90.tar.xz new file mode 100644 index 0000000..3cada78 --- /dev/null +++ b/pim-sieve-editor-18.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c4c00020f83008b7a682755d212590c314adfec44f421207c83de0e2548c387 +size 450652 diff --git a/pim-sieve-editor.changes b/pim-sieve-editor.changes index 3b0caf6..3060b0d 100644 --- a/pim-sieve-editor.changes +++ b/pim-sieve-editor.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 03 20:56:27 UTC 2018 - lbeltrame@kde.org + +- Update to 18.11.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-rc.php +- Changes since 18.11.80: + * No code changes since 18.11.80 + ------------------------------------------------------------------- Tue Nov 20 06:23:06 UTC 2018 - Luca Beltrame diff --git a/pim-sieve-editor.spec b/pim-sieve-editor.spec index bafe707..7ed6d97 100644 --- a/pim-sieve-editor.spec +++ b/pim-sieve-editor.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: pim-sieve-editor -Version: 18.11.80 +Version: 18.11.90 Release: 0 Summary: Sieve scripts editor for KDE PIM License: GPL-2.0-or-later AND LGPL-2.1-or-later From 9cafdf0d2260d4c1cdf46531e421fc1a9a6d4580b9cc871afbb3e672ae9027f6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 16:51:35 +0000 Subject: [PATCH 3/4] KDE Applications 18.12.0 (not yet built) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/pim-sieve-editor?expand=0&rev=67 --- pim-sieve-editor-18.11.90.tar.xz | 3 --- pim-sieve-editor-18.12.0.tar.xz | 3 +++ pim-sieve-editor.changes | 10 ++++++++++ pim-sieve-editor.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 pim-sieve-editor-18.11.90.tar.xz create mode 100644 pim-sieve-editor-18.12.0.tar.xz diff --git a/pim-sieve-editor-18.11.90.tar.xz b/pim-sieve-editor-18.11.90.tar.xz deleted file mode 100644 index 3cada78..0000000 --- a/pim-sieve-editor-18.11.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c4c00020f83008b7a682755d212590c314adfec44f421207c83de0e2548c387 -size 450652 diff --git a/pim-sieve-editor-18.12.0.tar.xz b/pim-sieve-editor-18.12.0.tar.xz new file mode 100644 index 0000000..ebf769f --- /dev/null +++ b/pim-sieve-editor-18.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85509a35cd726bdcecdd39e37bcb8e8951d59d49eb885255dc01dfe0edca8e90 +size 450536 diff --git a/pim-sieve-editor.changes b/pim-sieve-editor.changes index 3060b0d..e40cdf3 100644 --- a/pim-sieve-editor.changes +++ b/pim-sieve-editor.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 14 06:09:23 UTC 2018 - lbeltrame@kde.org + +- Update to 18.12.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.0.php +- Changes since 18.11.90: + * No code changes since 18.11.90 + ------------------------------------------------------------------- Mon Dec 03 20:56:27 UTC 2018 - lbeltrame@kde.org diff --git a/pim-sieve-editor.spec b/pim-sieve-editor.spec index 7ed6d97..b9a36c1 100644 --- a/pim-sieve-editor.spec +++ b/pim-sieve-editor.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: pim-sieve-editor -Version: 18.11.90 +Version: 18.12.0 Release: 0 Summary: Sieve scripts editor for KDE PIM License: GPL-2.0-or-later AND LGPL-2.1-or-later From 3b6837758a9d7ae16a5a28800fc4797183439e56205751d862712bb26bfc3422 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 23:07:20 +0000 Subject: [PATCH 4/4] Fix wrong beta and rc release announcement URLs OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/pim-sieve-editor?expand=0&rev=68 --- pim-sieve-editor.changes | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pim-sieve-editor.changes b/pim-sieve-editor.changes index e40cdf3..5284f42 100644 --- a/pim-sieve-editor.changes +++ b/pim-sieve-editor.changes @@ -29,7 +29,7 @@ Tue Nov 20 05:57:36 UTC 2018 - lbeltrame@kde.org - Update to 18.11.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.11.80.php + * https://www.kde.org/announcements/announce-applications-18.12-beta.php - Changes since 18.08.3: * Too many changes to list here @@ -79,7 +79,7 @@ Thu Jul 26 13:01:07 UTC 2018 - lbeltrame@kde.org - Update to 18.07.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.07.80.php + * https://www.kde.org/announcements/announce-applications-18.08-beta.php - Changes since 18.04.3: * We depend against qt5.9 @@ -129,7 +129,7 @@ Fri Apr 06 07:10:17 CEST 2018 - lbeltrame@kde.org - Update to 18.03.90 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.03.90.php + * https://www.kde.org/announcements/announce-applications-18.04-rc.php - Changes since 17.12.3: * Too many changes to list here @@ -238,7 +238,7 @@ Sat Aug 5 18:19:45 UTC 2017 - christophe@krop.fr - Update to KDE Applications 17.07.90 * KDE Applications 17.07.90 - * https://www.kde.org/announcements/announce-applications-17.07.90.php + * https://www.kde.org/announcements/announce-applications-17.08-rc.php ------------------------------------------------------------------- @@ -309,7 +309,7 @@ Sat Mar 25 23:10:54 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 + * https://www.kde.org/announcements/announce-applications-17.04-beta.php - Changes since 16.12.3: * Too many changes to list here