From d9e2279de59f2ec94b03b174ba0590e3aa6e7dffd74cff6ee3befdc31e92533b Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 7 May 2016 18:29:50 +0000 Subject: [PATCH 1/3] start with 5.22.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=107 --- frameworkintegration-5.21.0.tar.xz | 3 --- frameworkintegration-5.22.0.tar.xz | 3 +++ frameworkintegration.changes | 7 +++++++ frameworkintegration.spec | 10 ++-------- 4 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 frameworkintegration-5.21.0.tar.xz create mode 100644 frameworkintegration-5.22.0.tar.xz diff --git a/frameworkintegration-5.21.0.tar.xz b/frameworkintegration-5.21.0.tar.xz deleted file mode 100644 index 891fd7c..0000000 --- a/frameworkintegration-5.21.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88d29e0270fe754228e93781aaf2399b1aa4a9da548f33edefa87dc950b07755 -size 1784828 diff --git a/frameworkintegration-5.22.0.tar.xz b/frameworkintegration-5.22.0.tar.xz new file mode 100644 index 0000000..5383b32 --- /dev/null +++ b/frameworkintegration-5.22.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:496db04e8f19ebf1174c49fa3a8e82d7e57c11a50e620844d1daa08cc6f1c949 +size 1749468 diff --git a/frameworkintegration.changes b/frameworkintegration.changes index 788db50..70562cb 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat May 7 18:29:44 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.22.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.22.0.php + ------------------------------------------------------------------- Mon Apr 4 14:18:29 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/frameworkintegration.spec b/frameworkintegration.spec index a5e1a89..da8be98 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Style5 -%define _tar_path 5.21 +%define _tar_path 5.22 Name: frameworkintegration -Version: 5.21.0 +Version: 5.22.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -34,7 +34,6 @@ BuildRequires: kiconthemes-devel >= %{_tar_path} BuildRequires: kio-devel >= %{_tar_path} BuildRequires: knotifications-devel >= %{_tar_path} BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: libQt5Gui-private-headers-devel >= 5.4.0 BuildRequires: cmake(Qt5DBus) >= 5.4.0 BuildRequires: cmake(Qt5Widgets) >= 5.4.0 BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 @@ -74,11 +73,7 @@ Applications do not need to link to this directly. %package plugin Summary: Plugins responsible for better integration of Qt applications in KDE Workspace Group: System/GUI/KDE -Requires: kde-oxygen-fonts -Requires: noto-sans -#Requires: plasma5-integration-plugin Conflicts: %lname < 5.6.0 -%requires_eq libQt5Gui5 %description plugin Framework Integration is a set of plugins responsible for better @@ -139,7 +134,6 @@ Applications do not need to link to this directly. Development files %{_kf5_datadir}/infopage/ %{_kf5_plugindir}/ %{_kf5_notifydir}/ -%{_kf5_sharedir}/kconf_update/ %files devel %defattr(-,root,root) From 93c9cf821da5ba04212e3a2b5eaadde36d07c569831e09daa48e65faa089ad1a Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 7 May 2016 19:21:28 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=108 --- frameworkintegration.spec | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/frameworkintegration.spec b/frameworkintegration.spec index da8be98..5aa429c 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -16,7 +16,6 @@ # -%bcond_without lang %define lname libKF5Style5 %define _tar_path 5.22 Name: frameworkintegration @@ -58,10 +57,8 @@ Applications do not need to link to this directly. %package -n %lname Summary: Plugins responsible for better integration of Qt applications in KDE Workspace Group: System/GUI/KDE +Obsoletes: %lname-lang < %{version} Obsoletes: libKF5Style4 -%if %{with lang} -Recommends: %lname-lang = %{version} -%endif %description -n %lname Framework Integration is a set of plugins responsible for better @@ -74,6 +71,7 @@ Applications do not need to link to this directly. Summary: Plugins responsible for better integration of Qt applications in KDE Workspace Group: System/GUI/KDE Conflicts: %lname < 5.6.0 +Requires: plasma5-integration-plugin %description plugin Framework Integration is a set of plugins responsible for better @@ -97,7 +95,6 @@ KDE Plasma workspace. Applications do not need to link to this directly. Development files -%lang_package -n %lname %prep %setup -q @@ -109,20 +106,10 @@ Applications do not need to link to this directly. Development files %kf5_makeinstall -C build %fdupes %{buildroot} -#rm -rfv %{buildroot}%{_kf5_plugindir}/platformthemes - -%if %{with lang} -%find_lang %{name}5 -%endif - %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig -%if %{with lang} -%files -n %lname-lang -f %{name}5.lang -%endif - %files -n %lname %defattr(-,root,root) %doc COPYING* README* From 219f9fdb126d460172ca1a79d3b8d09147ea9eaea28d5f8150b4a1a3dc7f1673 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 15 May 2016 15:38:51 +0000 Subject: [PATCH 3/3] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=109 --- frameworkintegration.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frameworkintegration.changes b/frameworkintegration.changes index 70562cb..1f24c86 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Sat May 7 18:29:44 UTC 2016 - hrvoje.senjan@gmail.com -- Update to 5.22.0 +- Update to 5.22.0 (boo#980066) + * Remove platformtheme plugin as it's in plasma-integration * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.22.0.php