From c3c5bae873dd9481950876008ea4997e07bd6cbb1337ec6ffea3c30c33f429a3 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 4 Dec 2016 01:55:01 +0000 Subject: [PATCH 1/5] start with 5.29.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=125 --- frameworkintegration-5.28.0.tar.xz | 3 --- frameworkintegration-5.29.0.tar.xz | 3 +++ frameworkintegration.changes | 7 +++++++ frameworkintegration.spec | 8 ++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) delete mode 100644 frameworkintegration-5.28.0.tar.xz create mode 100644 frameworkintegration-5.29.0.tar.xz diff --git a/frameworkintegration-5.28.0.tar.xz b/frameworkintegration-5.28.0.tar.xz deleted file mode 100644 index f051c9b..0000000 --- a/frameworkintegration-5.28.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:161fc7576315d314d5f8f19e6fbc7723c4fc7c697ff8d2b455d9d7faaccf92ad -size 1749760 diff --git a/frameworkintegration-5.29.0.tar.xz b/frameworkintegration-5.29.0.tar.xz new file mode 100644 index 0000000..501bec4 --- /dev/null +++ b/frameworkintegration-5.29.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebb89e4b236163c067402cf78d67cddc443ef4fda0778001980948efc3cf5a52 +size 1750692 diff --git a/frameworkintegration.changes b/frameworkintegration.changes index 8f398f6..d65bd5f 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Dec 4 01:54:53 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.29.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.29.0.php + ------------------------------------------------------------------- Sat Nov 5 20:07:12 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 848f579..897a351 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -17,9 +17,9 @@ %define lname libKF5Style5 -%define _tar_path 5.28 +%define _tar_path 5.29 Name: frameworkintegration -Version: 5.28.0 +Version: 5.29.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -32,10 +32,13 @@ BuildRequires: ki18n-devel >= %{_tar_path} BuildRequires: kiconthemes-devel >= %{_tar_path} BuildRequires: kio-devel >= %{_tar_path} BuildRequires: knotifications-devel >= %{_tar_path} +BuildRequires: kpackage-devel >= %{_tar_path} BuildRequires: kwidgetsaddons-devel >= %{_tar_path} +BuildRequires: cmake(AppStreamQt) BuildRequires: cmake(Qt5DBus) >= 5.5.0 BuildRequires: cmake(Qt5Widgets) >= 5.5.0 BuildRequires: cmake(Qt5X11Extras) >= 5.5.0 +BuildRequires: cmake(packagekitqt5) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcursor) @@ -120,6 +123,7 @@ Applications do not need to link to this directly. Development files %doc COPYING* README* %{_kf5_datadir}/infopage/ %{_kf5_plugindir}/ +%{_kf5_libexecdir}/ %{_kf5_notifydir}/ %files devel From 767d05c2f7258e3fff817c9a610e1f71e20dc965e29736f0157f409033606594 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 14 Dec 2016 22:07:45 +0000 Subject: [PATCH 2/5] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=126 --- frameworkintegration.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frameworkintegration.changes b/frameworkintegration.changes index d65bd5f..c826081 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -2,6 +2,8 @@ Sun Dec 4 01:54:53 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.29.0 + * Find QDBus, needed by appstream kpackage handler + * Let KPackage have dependencies from packagekit & appstream * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.29.0.php From e996315d089ca5d179bada794d13eae6cbd84c9fed74601fe31ea13bc44c8ca7 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 15 Dec 2016 12:39:51 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=127 --- frameworkintegration.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 897a351..c2ab21c 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -34,7 +34,7 @@ BuildRequires: kio-devel >= %{_tar_path} BuildRequires: knotifications-devel >= %{_tar_path} BuildRequires: kpackage-devel >= %{_tar_path} BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: cmake(AppStreamQt) +BuildRequires: cmake(AppstreamQt) BuildRequires: cmake(Qt5DBus) >= 5.5.0 BuildRequires: cmake(Qt5Widgets) >= 5.5.0 BuildRequires: cmake(Qt5X11Extras) >= 5.5.0 From a5730382467d3460b83a20699308a81aa7c05120470c7470cf85e527781372ad Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 15 Dec 2016 15:28:40 +0000 Subject: [PATCH 4/5] - Add fix-appstream-detection.patch: fix AppstreamQt vs AppStreamQt detection OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=128 --- fix-appstream-detection.patch | 13 +++++++++++++ frameworkintegration.changes | 6 ++++++ frameworkintegration.spec | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 fix-appstream-detection.patch diff --git a/fix-appstream-detection.patch b/fix-appstream-detection.patch new file mode 100644 index 0000000..932ea7c --- /dev/null +++ b/fix-appstream-detection.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e20a47b..4e1c9a9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,7 +39,7 @@ find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) + find_package(KF5Package ${KF5_DEP_VERSION} REQUIRED) + + find_package(packagekitqt5) +-find_package(AppStreamQt 0.10) ++find_package(AppstreamQt 0.10) + + add_subdirectory(src) + add_subdirectory(autotests) diff --git a/frameworkintegration.changes b/frameworkintegration.changes index c826081..55f39b5 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 15:27:31 UTC 2016 - lbeltrame@kde.org + +- Add fix-appstream-detection.patch: fix AppstreamQt vs + AppStreamQt detection + ------------------------------------------------------------------- Sun Dec 4 01:54:53 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/frameworkintegration.spec b/frameworkintegration.spec index c2ab21c..33680ef 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -48,6 +48,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +#PATCH-FIX-OPENSUSE: fix-appstream-detection.patch - fix AppStreamQt detection (Appstream vs AppStream) +Patch0: fix-appstream-detection.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -100,6 +102,7 @@ Applications do not need to link to this directly. Development files %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build From b91417061e17f93886223ad7db4f82d59f3ddd6699b41b4dc14bcc9a84bb1cc4 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Thu, 15 Dec 2016 16:06:41 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=129 --- fix-appstream-detection.patch | 13 ------------- frameworkintegration.changes | 6 ++++++ frameworkintegration.spec | 9 +++------ 3 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 fix-appstream-detection.patch diff --git a/fix-appstream-detection.patch b/fix-appstream-detection.patch deleted file mode 100644 index 932ea7c..0000000 --- a/fix-appstream-detection.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e20a47b..4e1c9a9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,7 +39,7 @@ find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5Package ${KF5_DEP_VERSION} REQUIRED) - - find_package(packagekitqt5) --find_package(AppStreamQt 0.10) -+find_package(AppstreamQt 0.10) - - add_subdirectory(src) - add_subdirectory(autotests) diff --git a/frameworkintegration.changes b/frameworkintegration.changes index 55f39b5..ebb7d28 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 16:05:30 UTC 2016 - hrvoje.senjan@gmail.com + +- Drop fix-appstream-detection.patch - just don't build with + APPSTREAM-QT until we have the right version available + ------------------------------------------------------------------- Thu Dec 15 15:27:31 UTC 2016 - lbeltrame@kde.org diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 33680ef..e774764 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -34,11 +34,11 @@ BuildRequires: kio-devel >= %{_tar_path} BuildRequires: knotifications-devel >= %{_tar_path} BuildRequires: kpackage-devel >= %{_tar_path} BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: cmake(AppstreamQt) +#BuildRequires: cmake(AppstreamQt) BuildRequires: cmake(Qt5DBus) >= 5.5.0 BuildRequires: cmake(Qt5Widgets) >= 5.5.0 BuildRequires: cmake(Qt5X11Extras) >= 5.5.0 -BuildRequires: cmake(packagekitqt5) +#BuildRequires: cmake(packagekitqt5) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcursor) @@ -48,8 +48,6 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf -#PATCH-FIX-OPENSUSE: fix-appstream-detection.patch - fix AppStreamQt detection (Appstream vs AppStream) -Patch0: fix-appstream-detection.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -102,7 +100,6 @@ Applications do not need to link to this directly. Development files %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build @@ -126,7 +123,7 @@ Applications do not need to link to this directly. Development files %doc COPYING* README* %{_kf5_datadir}/infopage/ %{_kf5_plugindir}/ -%{_kf5_libexecdir}/ +#{_kf5_libexecdir}/ %{_kf5_notifydir}/ %files devel