From ff90fe9ae5d687b5590e265307ea5a9ed07606f8587227c66b95633becc5f4a1 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 5 Apr 2015 11:43:49 +0000 Subject: [PATCH 1/4] 5.9.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=61 --- frameworkintegration-5.8.0.tar.xz | 3 --- frameworkintegration-5.9.0.tar.xz | 3 +++ frameworkintegration.changes | 7 +++++++ frameworkintegration.spec | 10 +++++++--- 4 files changed, 17 insertions(+), 6 deletions(-) delete mode 100644 frameworkintegration-5.8.0.tar.xz create mode 100644 frameworkintegration-5.9.0.tar.xz diff --git a/frameworkintegration-5.8.0.tar.xz b/frameworkintegration-5.8.0.tar.xz deleted file mode 100644 index c64cbd0..0000000 --- a/frameworkintegration-5.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ee0c7dbfa1e63cc470a1d32805e6c726aa9a54d5d776ec81e20787eb4b34b87 -size 1776372 diff --git a/frameworkintegration-5.9.0.tar.xz b/frameworkintegration-5.9.0.tar.xz new file mode 100644 index 0000000..17d4518 --- /dev/null +++ b/frameworkintegration-5.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9b7755ed04e935a7bf6ca04cf67b8af55f37415d7756f0f8ee174a7b7e9d23a +size 1777476 diff --git a/frameworkintegration.changes b/frameworkintegration.changes index 77573b9..6b35c85 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Apr 4 14:40:42 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.9.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.9.0.php + ------------------------------------------------------------------- Sat Mar 7 16:58:43 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/frameworkintegration.spec b/frameworkintegration.spec index f5489c7..9a4dc44 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -17,13 +17,13 @@ %define lname libKF5Style5 -%define _tar_path 5.8 +%define _tar_path 5.9 Name: frameworkintegration Version: %{_tar_path}.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: extra-cmake-modules >= %{version} BuildRequires: fdupes BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kconfigwidgets-devel >= %{kf5_version} @@ -109,7 +109,11 @@ Applications do not need to link to this directly. Development files %kf5_makeinstall -C build %fdupes -s %{buildroot} - %find_lang %{name}5 +if [ -e po ]; then +%find_lang %{name}5 +else +touch %{name}5.lang +fi %post -n %lname -p /sbin/ldconfig From 6fee4132c01b63ebb87e26d57dab14d01f8b4bffabf964dccdbd87e33c93019b Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 10:36:41 +0000 Subject: [PATCH 2/4] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=62 --- frameworkintegration.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frameworkintegration.changes b/frameworkintegration.changes index 6b35c85..d40acdb 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -2,6 +2,9 @@ Sat Apr 4 14:40:42 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.9.0 + * Fix possible crash when destroying a QSystemTrayIcon + (triggered by e.g. Trojita), kde#343976 + * Fix native modal file dialogs in QML, kde#334963 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.9.0.php From 97ea03b4b785fd2b5aa516c8c9e60f2e39d0529a8642fe5f4957b8296ab00b22 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 16:27:08 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=63 --- frameworkintegration.spec | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 9a4dc44..1e3c9cd 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -16,23 +16,24 @@ # +%bcond_without lang %define lname libKF5Style5 %define _tar_path 5.9 Name: frameworkintegration -Version: %{_tar_path}.0 +Version: 5.9.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= %{version} +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes -BuildRequires: kconfig-devel >= %{kf5_version} -BuildRequires: kconfigwidgets-devel >= %{kf5_version} +BuildRequires: kconfig-devel >= %{_tar_path} +BuildRequires: kconfigwidgets-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{kf5_version} -BuildRequires: kiconthemes-devel >= %{kf5_version} -BuildRequires: kio-devel >= %{kf5_version} -BuildRequires: knotifications-devel >= %{kf5_version} -BuildRequires: kwidgetsaddons-devel >= %{kf5_version} +BuildRequires: ki18n-devel >= %{_tar_path} +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.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 @@ -60,7 +61,9 @@ 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 Obsoletes: libKF5Style4 +%if %{with lang} Recommends: %lname-lang = %{version} +%endif %description -n %lname Framework Integration is a set of plugins responsible for better @@ -87,8 +90,8 @@ Summary: Plugins responsible for better integration of Qt applications in Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: kconfigwidgets-devel >= %{kf5_version} -Requires: kiconthemes-devel >= %{kf5_version} +Requires: kconfigwidgets-devel >= %{_tar_path} +Requires: kiconthemes-devel >= %{_tar_path} %description devel Framework Integration is a set of plugins responsible for better @@ -109,17 +112,17 @@ Applications do not need to link to this directly. Development files %kf5_makeinstall -C build %fdupes -s %{buildroot} -if [ -e po ]; then +%if %{with lang} %find_lang %{name}5 -else -touch %{name}5.lang -fi +%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) From 01b3d8b698f1196dfc2e251ef7917e39d73236e0f3bd8cde40014440d375c695 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 16:47:25 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=64 --- frameworkintegration.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 1e3c9cd..987be79 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -110,7 +110,7 @@ Applications do not need to link to this directly. Development files %install %kf5_makeinstall -C build - %fdupes -s %{buildroot} + %fdupes %{buildroot} %if %{with lang} %find_lang %{name}5