From bce6c9a5a628834d9cf6e5e6baf56153a3b63014f4dced658ba86810b3d54440 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:27:39 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/libkeduvocdocument?expand=0&rev=52 --- libkeduvocdocument-17.04.3.tar.xz | 3 --- libkeduvocdocument-17.07.90.tar.xz | 3 +++ libkeduvocdocument.changes | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 libkeduvocdocument-17.04.3.tar.xz create mode 100644 libkeduvocdocument-17.07.90.tar.xz diff --git a/libkeduvocdocument-17.04.3.tar.xz b/libkeduvocdocument-17.04.3.tar.xz deleted file mode 100644 index e9b1d4e..0000000 --- a/libkeduvocdocument-17.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfa33ada9aa4a2b6e063a8ca2c08312e1c4e2a22280a42f673ec3446824623fc -size 212632 diff --git a/libkeduvocdocument-17.07.90.tar.xz b/libkeduvocdocument-17.07.90.tar.xz new file mode 100644 index 0000000..0798f56 --- /dev/null +++ b/libkeduvocdocument-17.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c15b2d96d2f4a38dfba84ced4d65361000c1e5dce890be17c2250aa74f9aa005 +size 209436 diff --git a/libkeduvocdocument.changes b/libkeduvocdocument.changes index 019ac04..b60f03e 100644 --- a/libkeduvocdocument.changes +++ b/libkeduvocdocument.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Aug 5 18:19:19 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 + + ------------------------------------------------------------------- Sun Jul 16 08:49:44 CEST 2017 - lbeltrame@kde.org From a781aee49e8a36ef5925ec6b4ba23afb7db93af73f60e7c900dc7142d404507e Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 5 Aug 2017 18:53:26 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/libkeduvocdocument?expand=0&rev=53 --- libkeduvocdocument.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libkeduvocdocument.spec b/libkeduvocdocument.spec index b130875..0cc955b 100644 --- a/libkeduvocdocument.spec +++ b/libkeduvocdocument.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: libkeduvocdocument -Version: 17.04.3 +Version: 17.07.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 002a9556a5f354feead56f877e0d03977b96206f2c352a8b088dfd6abccc3d87 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 23:00:36 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/libkeduvocdocument?expand=0&rev=54 --- libkeduvocdocument.changes | 9 +++++++ libkeduvocdocument.spec | 50 ++++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/libkeduvocdocument.changes b/libkeduvocdocument.changes index b60f03e..a2729bf 100644 --- a/libkeduvocdocument.changes +++ b/libkeduvocdocument.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Aug 11 22:46:18 UTC 2017 - christophe@krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Use Q_DECL_OVERRIDE + ------------------------------------------------------------------- Sat Aug 5 18:19:19 UTC 2017 - christophe@krop.fr diff --git a/libkeduvocdocument.spec b/libkeduvocdocument.spec index 0cc955b..929b418 100644 --- a/libkeduvocdocument.spec +++ b/libkeduvocdocument.spec @@ -1,7 +1,7 @@ # # spec file for package libkeduvocdocument # -# Copyright (c) 2016 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,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang Name: libkeduvocdocument Version: 17.07.90 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# 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: Library for KDE Education Applications License: GPL-2.0+ @@ -41,12 +42,33 @@ BuildRequires: xz BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 +%if %{with lang} +Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains the library which is required by the KDE education applications. +%package -n libKEduVocDocument5 +Summary: Library for KDE Education Applications +Group: System/GUI/KDE +Recommends: kdeedu-data + +%description -n libKEduVocDocument5 +This package contains the library which is required by the KDE education +applications. + +%package devel +Summary: Library for KDE Education Applications: Build Environment +Group: Development/Libraries/KDE +Requires: libKEduVocDocument5 = %{version} + +%description devel +This package contains all necessary files and libraries needed to +develop KDE education applications. + %if %{with lang} %lang_package %endif @@ -65,17 +87,6 @@ applications. %endif %fdupes -s %{buildroot} -%package -n libKEduVocDocument5 -Summary: Library for KDE Education Applications -Group: System/GUI/KDE -Recommends: kdeedu-data -Recommends: %{name}-lang -Provides: %{name} = %{version} - -%description -n libKEduVocDocument5 -This package contains the library which is required by the KDE education -applications. - %post -n libKEduVocDocument5 -p /sbin/ldconfig %postun -n libKEduVocDocument5 -p /sbin/ldconfig @@ -84,21 +95,12 @@ applications. %doc README COPYING* %{_kf5_libdir}/libKEduVocDocument.so.* -%package devel -Summary: Library for KDE Education Applications: Build Environment -Group: Development/Libraries/KDE -Requires: libKEduVocDocument5 = %{version} - -%description devel -This package contains all necessary files and libraries needed to -develop KDE education applications. - %files devel %defattr(-,root,root) %doc README COPYING* -%{_kf5_prefix}/include/libkeduvocdocument/ -%{_kf5_libdir}/cmake/libkeduvocdocument/ +%{_kf5_cmakedir}/libkeduvocdocument/ %{_kf5_libdir}/libKEduVocDocument.so +%{_kf5_prefix}/include/libkeduvocdocument/ %if %{with lang} %files lang -f %{name}.lang From bcc4ad90ac8037f506d5813771b20b69b03fbd215c8411a48e9e8c8dd6e54d4f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Aug 2017 23:16:30 +0000 Subject: [PATCH 4/5] 17.08.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/libkeduvocdocument?expand=0&rev=55 --- libkeduvocdocument-17.07.90.tar.xz | 3 --- libkeduvocdocument-17.08.0.tar.xz | 3 +++ libkeduvocdocument.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 libkeduvocdocument-17.07.90.tar.xz create mode 100644 libkeduvocdocument-17.08.0.tar.xz diff --git a/libkeduvocdocument-17.07.90.tar.xz b/libkeduvocdocument-17.07.90.tar.xz deleted file mode 100644 index 0798f56..0000000 --- a/libkeduvocdocument-17.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c15b2d96d2f4a38dfba84ced4d65361000c1e5dce890be17c2250aa74f9aa005 -size 209436 diff --git a/libkeduvocdocument-17.08.0.tar.xz b/libkeduvocdocument-17.08.0.tar.xz new file mode 100644 index 0000000..4495880 --- /dev/null +++ b/libkeduvocdocument-17.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:124efefc5de59c96d3a66be5bdacc5e839958c81971615c8787f34aefa4fe7f4 +size 209480 diff --git a/libkeduvocdocument.spec b/libkeduvocdocument.spec index 929b418..b7fa1e4 100644 --- a/libkeduvocdocument.spec +++ b/libkeduvocdocument.spec @@ -19,7 +19,7 @@ %bcond_without lang Name: libkeduvocdocument -Version: 17.07.90 +Version: 17.08.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 84cea13e74aa8bfb850eb219df478d5103701f3e3d4dc6cbfeef475920452cff Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 26 Aug 2017 10:05:12 +0000 Subject: [PATCH 5/5] Fix wrong merge direction OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/libkeduvocdocument?expand=0&rev=56 --- libkeduvocdocument.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libkeduvocdocument.spec b/libkeduvocdocument.spec index b7fa1e4..78a63b5 100644 --- a/libkeduvocdocument.spec +++ b/libkeduvocdocument.spec @@ -42,9 +42,6 @@ BuildRequires: xz BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 -%if %{with lang} -Recommends: %{name}-lang -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,6 +52,8 @@ applications. Summary: Library for KDE Education Applications Group: System/GUI/KDE Recommends: kdeedu-data +Recommends: %{name}-lang +Provides: %{name} = %{version} %description -n libKEduVocDocument5 This package contains the library which is required by the KDE education