[kf5-kglobalaccel/f20] KDE Frameworks 5.7.0

Daniel Vrátil dvratil at fedoraproject.org
Mon Feb 16 12:30:24 UTC 2015


commit e18f13883b9552708ef850734f3155a29f9a993e
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Feb 16 13:13:03 2015 +0100

    KDE Frameworks 5.7.0

 .gitignore            |    1 +
 kf5-kglobalaccel.spec |   49 ++++++++++++++++++++++++++++++++++++++++---------
 sources               |    2 +-
 3 files changed, 42 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ef1a4ce..e332b9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /kglobalaccel-5.4.0.tar.xz
 /kglobalaccel-5.5.0.tar.xz
 /kglobalaccel-5.6.0.tar.xz
+/kglobalaccel-5.7.0.tar.xz
diff --git a/kf5-kglobalaccel.spec b/kf5-kglobalaccel.spec
index fdcb824..cc71745 100644
--- a/kf5-kglobalaccel.spec
+++ b/kf5-kglobalaccel.spec
@@ -1,9 +1,9 @@
 %global framework kglobalaccel
 
 Name:           kf5-%{framework}
-Version:        5.6.0
+Version:        5.7.0
 Release:        1%{?dist}
-Summary:        KDE Frameworks 5 Tier 1 integration module for global shortcuts
+Summary:        KDE Frameworks 5 Tier 3 integration module for global shortcuts
 
 License:        LGPLv2+
 URL:            http://www.kde.org
@@ -19,22 +19,41 @@ Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra
 
 BuildRequires:  libX11-devel
 
+BuildRequires:  kf5-rpm-macros
+BuildRequires:  extra-cmake-modules
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtx11extras-devel
 BuildRequires:  qt5-qttools-devel
 
-BuildRequires:  kf5-rpm-macros
-BuildRequires:  extra-cmake-modules
+BuildRequires:  kf5-kconfig-devel
+BuildRequires:  kf5-kcoreaddons-devel
+BuildRequires:  kf5-kcrash-devel
+BuildRequires:  kf5-kdbusaddons-devel
+BuildRequires:  kf5-ki18n-devel
+BuildRequires:  kf5-kwindowsystem-devel
+
+BuildRequires:  libxcb-devel
+BuildRequires:  xcb-util-keysyms-devel
 
 Requires:       kf5-filesystem
 
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
 %description
 KDE Framework 5 Tier 1 integration module for global shortcuts.
 
+%package        libs
+Summary:        Runtime libraries for %{name}
+# Before -libs were created
+Conflicts:      kf5-kglobalaccel < 5.7.0
+%description    libs
+%{summary}.
 
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       qt5-qtbase-devel
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -54,18 +73,24 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang kglobalaccel5_qt --with-qt --all-name
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%find_lang_kf5 kglobalaccel5
+%find_lang_kf5 kglobalaccel5_qt
 
-%files -f kglobalaccel5_qt.lang
+%files -f kglobalaccel5.lang
 %doc COPYING.LIB README.md
+%{_kf5_bindir}/kglobalaccel5
+%{_kf5_datadir}/kservices5/kglobalaccel5.desktop
+%{_datadir}/dbus-1/services/org.kde.kglobalaccel.service
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%files libs -f kglobalaccel5_qt.lang
 %{_kf5_libdir}/libKF5GlobalAccel.so.*
 
 %files devel
-%doc
 %{_kf5_includedir}/kglobalaccel_version.h
 %{_kf5_includedir}/KGlobalAccel/
 %{_kf5_libdir}/libKF5GlobalAccel.so
@@ -75,6 +100,12 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Mon Feb 16 2015 Daniel Vrátil <dvratil at redhat.com> - 5.7.0-1
+- KDE Frameworks 5.7.0
+
+* Mon Feb 09 2015 Daniel Vrátil <dvratil at redhat.com> - 5.7.0-1
+- KDE Frameworks 5.7.0
+
 * Thu Jan 08 2015 Daniel Vrátil <dvratil at redhat.com> - 5.6.0-1
 - KDE Frameworks 5.6.0
 
diff --git a/sources b/sources
index 2089f7a..7f45399 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd69f1591e18ddb5342963f4907b1bd1  kglobalaccel-5.6.0.tar.xz
+a54ad9ea7f1ed3eb5d8f3f3708e1d78c  kglobalaccel-5.7.0.tar.xz


More information about the scm-commits mailing list