From ed1b53f3f66085d78d14c7623ea705c7ba1a41bac44a656c2b181e80721ca158 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 5 Apr 2015 15:32:07 +0000 Subject: [PATCH 1/3] 5.9.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdeclarative?expand=0&rev=49 --- kdeclarative-5.8.0.tar.xz | 3 --- kdeclarative-5.9.0.tar.xz | 3 +++ kdeclarative.changes | 8 ++++++++ kdeclarative.spec | 11 ++++++++--- 4 files changed, 19 insertions(+), 6 deletions(-) delete mode 100644 kdeclarative-5.8.0.tar.xz create mode 100644 kdeclarative-5.9.0.tar.xz diff --git a/kdeclarative-5.8.0.tar.xz b/kdeclarative-5.8.0.tar.xz deleted file mode 100644 index af88e51..0000000 --- a/kdeclarative-5.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:563848af5392a23f94e8ce185ac1878749d64cc4c0327f646b34ebd10887dea3 -size 150888 diff --git a/kdeclarative-5.9.0.tar.xz b/kdeclarative-5.9.0.tar.xz new file mode 100644 index 0000000..8cd3be5 --- /dev/null +++ b/kdeclarative-5.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84b15fb7092d963841fd70d1f603ca4a704e0284154368fc2fef80c04b2ea1f4 +size 158036 diff --git a/kdeclarative.changes b/kdeclarative.changes index c4aafc9..65160b1 100644 --- a/kdeclarative.changes +++ b/kdeclarative.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Apr 4 14:40:53 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 +- Added kcoreaddons-devel Requires to devel subpackage + ------------------------------------------------------------------- Sat Mar 7 16:58:53 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kdeclarative.spec b/kdeclarative.spec index e4f06b0..87443e1 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -17,13 +17,13 @@ %define lname libKF5Declarative5 -%define _tar_path 5.8 +%define _tar_path 5.9 Name: kdeclarative 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: kcoreaddons-devel >= %{kf5_version} @@ -89,6 +89,7 @@ Requires: %lname = %{version} Requires: %{name}-components = %{version} Requires: extra-cmake-modules Requires: kconfig-devel >= %{kf5_version} +Requires: kcoreaddons-devel >= %{kf5_version} Requires: kpackage-devel >= %{kf5_version} Requires: libKF5QuickAddons5 = %{version} Requires: pkgconfig(Qt5Qml) >= 5.2.0 @@ -109,7 +110,11 @@ 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 2096eceacf974e98c394b6a554b1a3735b206f779ad6a180143c20f77ccf9f3a Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 16:28:18 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdeclarative?expand=0&rev=50 --- kdeclarative.spec | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/kdeclarative.spec b/kdeclarative.spec index 87443e1..a60c35d 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -16,26 +16,27 @@ # +%bcond_without lang %define lname libKF5Declarative5 %define _tar_path 5.9 Name: kdeclarative -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: kcoreaddons-devel >= %{kf5_version} +BuildRequires: kconfig-devel >= %{_tar_path} +BuildRequires: kcoreaddons-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: kglobalaccel-devel >= %{kf5_version} -BuildRequires: kguiaddons-devel >= %{kf5_version} -BuildRequires: ki18n-devel >= %{kf5_version} -BuildRequires: kiconthemes-devel >= %{kf5_version} -BuildRequires: kio-devel >= %{kf5_version} -BuildRequires: kpackage-devel >= %{kf5_version} -BuildRequires: kwidgetsaddons-devel >= %{kf5_version} -BuildRequires: kwindowsystem-devel >= %{kf5_version} +BuildRequires: kglobalaccel-devel >= %{_tar_path} +BuildRequires: kguiaddons-devel >= %{_tar_path} +BuildRequires: ki18n-devel >= %{_tar_path} +BuildRequires: kiconthemes-devel >= %{_tar_path} +BuildRequires: kio-devel >= %{_tar_path} +BuildRequires: kpackage-devel >= %{_tar_path} +BuildRequires: kwidgetsaddons-devel >= %{_tar_path} +BuildRequires: kwindowsystem-devel >= %{_tar_path} BuildRequires: libepoxy-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 @@ -56,7 +57,9 @@ KDeclarative provides integration of QML and KDE workspaces. %package -n %lname Summary: Integration of QML and KDE workspaces Group: System/GUI/KDE +%if %{with lang} Recommends: %lname-lang = %{version} +%endif %description -n %lname KDeclarative provides integration of QML and KDE workspaces. @@ -88,9 +91,9 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: %{name}-components = %{version} Requires: extra-cmake-modules -Requires: kconfig-devel >= %{kf5_version} -Requires: kcoreaddons-devel >= %{kf5_version} -Requires: kpackage-devel >= %{kf5_version} +Requires: kconfig-devel >= %{_tar_path} +Requires: kcoreaddons-devel >= %{_tar_path} +Requires: kpackage-devel >= %{_tar_path} Requires: libKF5QuickAddons5 = %{version} Requires: pkgconfig(Qt5Qml) >= 5.2.0 @@ -110,11 +113,9 @@ 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 @@ -124,7 +125,9 @@ fi %postun -n libKF5QuickAddons5 -p /sbin/ldconfig +%if %{with lang} %files -n %lname-lang -f %{name}5.lang +%endif %files -n %lname %defattr(-,root,root) From d4fe572ffe56aacbcac81cf5938206f901db45d988f9adeefb6557bcd73bf439 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 16:48:22 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdeclarative?expand=0&rev=51 --- kdeclarative.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdeclarative.spec b/kdeclarative.spec index a60c35d..ceb21d4 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -111,7 +111,7 @@ Development files. %install %kf5_makeinstall -C build - %fdupes -s %{buildroot} + %fdupes %{buildroot} %if %{with lang} %find_lang %{name}5