From a2cb1ff19fb568d78f2679baed32fef2a39766562f9db775e5704af91cace3a6 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 26 Mar 2017 07:15:28 +0000 Subject: [PATCH 1/6] KDE Applications 17.08.80 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/grantlee-editor?expand=0&rev=13 --- grantlee-editor-16.12.3.tar.xz | 3 --- grantlee-editor-17.03.80.tar.xz | 3 +++ grantlee-editor.changes | 24 ++++++++++++++++++++++-- grantlee-editor.spec | 11 +++++++---- 4 files changed, 32 insertions(+), 9 deletions(-) delete mode 100644 grantlee-editor-16.12.3.tar.xz create mode 100644 grantlee-editor-17.03.80.tar.xz diff --git a/grantlee-editor-16.12.3.tar.xz b/grantlee-editor-16.12.3.tar.xz deleted file mode 100644 index 8ef1eca..0000000 --- a/grantlee-editor-16.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1df143df3cd6754b51e08985534af65c1366a59c28bca9be17f0f571633f800 -size 45408 diff --git a/grantlee-editor-17.03.80.tar.xz b/grantlee-editor-17.03.80.tar.xz new file mode 100644 index 0000000..b41c715 --- /dev/null +++ b/grantlee-editor-17.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25c0e6f499a047b229e8f64d2236d18fbf8390a403404cecef1ff4028a98fa47 +size 46024 diff --git a/grantlee-editor.changes b/grantlee-editor.changes index fe48940..fc3ae6f 100644 --- a/grantlee-editor.changes +++ b/grantlee-editor.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sat Mar 25 23:10:11 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: + * Const'ify + * Fix check + * Remove wallet dependancy + * Remove not necessary check + * clean forward declaration + * Remove some Q_FOREACH + * Minor optimization + * Use nullptr + * update copyright + * Use uniq project name + * Add ECMCoverageOption + ------------------------------------------------------------------- Thu Mar 9 12:34:31 CET 2017 - lbeltrame@kde.org @@ -20,14 +40,14 @@ Thu Feb 9 06:42:48 UTC 2017 - lbeltrame@kde.org Sat Jan 14 08:50:22 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:30:39 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 diff --git a/grantlee-editor.spec b/grantlee-editor.spec index 75bf51f..8b9d05d 100644 --- a/grantlee-editor.spec +++ b/grantlee-editor.spec @@ -17,10 +17,10 @@ Name: grantlee-editor -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: Base package of kdepim License: GPL-2.0+ and LGPL-2.1+ @@ -43,9 +43,7 @@ BuildRequires: knewstuff-devel BuildRequires: kparts-devel BuildRequires: kpimtextedit-devel >= %{_kapp_version} BuildRequires: ktexteditor-devel -BuildRequires: kwallet-devel BuildRequires: kxmlgui-devel -BuildRequires: libkdepim-devel BuildRequires: libkleo BuildRequires: messagelib-devel >= %{_kapp_version} BuildRequires: pimcommon-devel @@ -61,6 +59,11 @@ BuildRequires: pkgconfig(Qt5Quick) >= 5.2.0 BuildRequires: pkgconfig(Qt5WebEngine) >= 5.6.0 BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +%else +BuildRequires: boost-devel +%endif Requires: kaddressbook Requires: kmail-application-icons BuildRoot: %{_tmppath}/%{name}-%{version}-build From 1fe92eed3ecfdf918ff2e82b3454d299e1b53da786de3a4f1f20f499af0377db Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 12 Apr 2017 14:39:23 +0000 Subject: [PATCH 2/6] RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/grantlee-editor?expand=0&rev=14 --- grantlee-editor-17.03.80.tar.xz | 3 --- grantlee-editor-17.03.90.tar.xz | 3 +++ grantlee-editor.spec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 grantlee-editor-17.03.80.tar.xz create mode 100644 grantlee-editor-17.03.90.tar.xz diff --git a/grantlee-editor-17.03.80.tar.xz b/grantlee-editor-17.03.80.tar.xz deleted file mode 100644 index b41c715..0000000 --- a/grantlee-editor-17.03.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25c0e6f499a047b229e8f64d2236d18fbf8390a403404cecef1ff4028a98fa47 -size 46024 diff --git a/grantlee-editor-17.03.90.tar.xz b/grantlee-editor-17.03.90.tar.xz new file mode 100644 index 0000000..bd19b7c --- /dev/null +++ b/grantlee-editor-17.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ba4568f1163f89665b4078f9ee7ebad1f841dffab1eb9ed9e6cdd0a38ae4f28 +size 111428 diff --git a/grantlee-editor.spec b/grantlee-editor.spec index 8b9d05d..67d9ef3 100644 --- a/grantlee-editor.spec +++ b/grantlee-editor.spec @@ -1,7 +1,7 @@ # # spec file for package grantlee-editor # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: grantlee-editor -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 4e2b48e6354964fa733496710f9346a579c8ded5acb4f62bdef62d23e854b98d Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 12 Apr 2017 18:39:27 +0000 Subject: [PATCH 3/6] Update changes file - Automated commit, please verify contents OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/grantlee-editor?expand=0&rev=15 --- grantlee-editor.changes | 10 ++++++++++ grantlee-editor.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/grantlee-editor.changes b/grantlee-editor.changes index fc3ae6f..ad5034c 100644 --- a/grantlee-editor.changes +++ b/grantlee-editor.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Apr 12 20:25:16 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 + ------------------------------------------------------------------- Sat Mar 25 23:10:11 CET 2017 - lbeltrame@kde.org diff --git a/grantlee-editor.spec b/grantlee-editor.spec index 67d9ef3..85a79a6 100644 --- a/grantlee-editor.spec +++ b/grantlee-editor.spec @@ -1,7 +1,7 @@ # # spec file for package grantlee-editor # -# Copyright (c) 2017 SUSE LINUX Products 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 From 263255f2f62095ad27ff18a19d3b4fbb3bb0e34cc219b42a9b16734fa402a4c3 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 13:27:53 +0000 Subject: [PATCH 4/6] Make a merry car great again OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/grantlee-editor?expand=0&rev=16 --- grantlee-editor.spec | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/grantlee-editor.spec b/grantlee-editor.spec index 85a79a6..294a19d 100644 --- a/grantlee-editor.spec +++ b/grantlee-editor.spec @@ -16,6 +16,8 @@ # +%bcond_without lang + Name: grantlee-editor Version: 17.03.90 Release: 0 @@ -73,6 +75,10 @@ ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 %description This package contains the core files of the kdepim module. +%if %{with lang} +%lang_package +%endif + %prep %setup -q @@ -82,6 +88,10 @@ This package contains the core files of the kdepim module. %install %kf5_makeinstall -C build +%if %{with lang} + %find_lang %{name} --with-man --all-name + %kf5_find_htmldocs +%endif rm %{buildroot}%{_kf5_libdir}/*.so %post -p /sbin/ldconfig @@ -103,4 +113,9 @@ rm %{buildroot}%{_kf5_libdir}/*.so %{_kf5_htmldir}/en/contactthemeeditor/ %{_kf5_htmldir}/en/headerthemeeditor/ +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING* +%endif + %changelog From 660d81eda6eb443cb19a7d3f5c5db1f8b8a49b3494dfd7dbeb64eebdc91d9e8f Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 13:55:24 +0000 Subject: [PATCH 5/6] KDE Applications 17.04 final OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/grantlee-editor?expand=0&rev=17 --- grantlee-editor-17.03.90.tar.xz | 3 --- grantlee-editor-17.04.0.tar.xz | 3 +++ grantlee-editor.changes | 10 ++++++++++ grantlee-editor.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 grantlee-editor-17.03.90.tar.xz create mode 100644 grantlee-editor-17.04.0.tar.xz diff --git a/grantlee-editor-17.03.90.tar.xz b/grantlee-editor-17.03.90.tar.xz deleted file mode 100644 index bd19b7c..0000000 --- a/grantlee-editor-17.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ba4568f1163f89665b4078f9ee7ebad1f841dffab1eb9ed9e6cdd0a38ae4f28 -size 111428 diff --git a/grantlee-editor-17.04.0.tar.xz b/grantlee-editor-17.04.0.tar.xz new file mode 100644 index 0000000..0c0de3e --- /dev/null +++ b/grantlee-editor-17.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b9825762e65d4b6680169dcddca35146632519c38aa732b88a88a914d7555b9 +size 111384 diff --git a/grantlee-editor.changes b/grantlee-editor.changes index ad5034c..1fda676 100644 --- a/grantlee-editor.changes +++ b/grantlee-editor.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Apr 16 10:44:47 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: + * Use QFileInfo::exists(...) method + ------------------------------------------------------------------- Wed Apr 12 20:25:16 CEST 2017 - lbeltrame@kde.org diff --git a/grantlee-editor.spec b/grantlee-editor.spec index 294a19d..575e19c 100644 --- a/grantlee-editor.spec +++ b/grantlee-editor.spec @@ -19,7 +19,7 @@ %bcond_without lang Name: grantlee-editor -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 83ce35167fd218579c575fd9bd95df00c80b5314413fe06f4bb4790d84c565e3 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 20 Apr 2017 08:47:23 +0000 Subject: [PATCH 6/6] Add Recommends: %{name}-lang OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/grantlee-editor?expand=0&rev=18 --- grantlee-editor.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/grantlee-editor.spec b/grantlee-editor.spec index 575e19c..58bed93 100644 --- a/grantlee-editor.spec +++ b/grantlee-editor.spec @@ -68,6 +68,7 @@ BuildRequires: boost-devel %endif Requires: kaddressbook Requires: kmail-application-icons +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build # It can only build on the same platforms as Qt Webengine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64