From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 9 Dec 2014 23:05:40 +0000 (+0100)
Subject: - up to 5.4.0
X-Git-Tag: auto/th/kf5-kcmutils-5.4.0-0.1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fkf5-kcmutils.git;a=commitdiff_plain;h=2f229c0

- up to 5.4.0
---

diff --git a/kf5-kcmutils.spec b/kf5-kcmutils.spec
index 636845c..a072c87 100644
--- a/kf5-kcmutils.spec
+++ b/kf5-kcmutils.spec
@@ -2,29 +2,29 @@
 # Not packaged:
 # /usr/include/KF5
 # /usr/share/kservicetypes5
-
-%define         _state          stable
-%define		orgname		kcmutils
+%define		kdeframever	5.4
+%define		qtver		5.3.2
+%define		kfname		kcmutils
 
 Summary:	Utilities for KDE System Settings modules
-Name:		kf5-%{orgname}
-Version:	5.0.0
+Name:		kf5-%{kfname}
+Version:	5.4.0
 Release:	0.1
 License:	LGPL v2.1+
 Group:		X11/Libraries
-Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/frameworks/%{version}/%{orgname}-%{version}.tar.xz
-# Source0-md5:	25fd159316e94e6f6c458fb7426e5a86
+Source0:	http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5:	b4d45c6e33a339e8304ef664cb2bd538
 URL:		http://www.kde.org/
-BuildRequires:	Qt5Core-devel >= 5.2.0
-BuildRequires:	Qt5DBus-devel
-BuildRequires:	Qt5Gui-devel >= 5.3.1
-BuildRequires:	Qt5Test-devel
-BuildRequires:	Qt5Widgets-devel
-BuildRequires:	Qt5Xml-devel
+BuildRequires:	Qt5Core-devel >= %{qtver}
+BuildRequires:	Qt5DBus-devel >= %{qtver}
+BuildRequires:	Qt5Gui-devel >= %{qtver}
+BuildRequires:	Qt5Test-devel >= %{qtver}
+BuildRequires:	Qt5Widgets-devel >= %{qtver}
+BuildRequires:	Qt5Xml-devel >= %{qtver}
 BuildRequires:	cmake >= 2.8.12
 BuildRequires:	gettext-devel
 BuildRequires:	kf5-attica-devel >= %{version}
-BuildRequires:	kf5-extra-cmake-modules >= 1.0.0
+BuildRequires:	kf5-extra-cmake-modules >= 1.4.0
 BuildRequires:	kf5-kauth-devel >= %{version}
 BuildRequires:	kf5-kcodecs-devel >= %{version}
 BuildRequires:	kf5-kcompletion-devel >= %{version}
@@ -55,36 +55,25 @@ KCMUtils provides various classes to work with KCModules. KCModules
 can be created with the KConfigWidgets framework.
 
 %package devel
-Summary:	Header files for %{orgname} development
-Summary(pl.UTF-8):	Pliki nagłówkowe dla programistów używających %{orgname}
+Summary:	Header files for %{kfname} development
+Summary(pl.UTF-8):	Pliki nagłówkowe dla programistów używających %{kfname}
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
-Header files for %{orgname} development.
+Header files for %{kfname} development.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe dla programistów używających %{orgname}.
+Pliki nagłówkowe dla programistów używających %{kfname}.
 
 %prep
-%setup -q -n %{orgname}-%{version}
+%setup -q -n %{kfname}-%{version}
 
 %build
 install -d build
 cd build
 %cmake \
-	-DBIN_INSTALL_DIR=%{_bindir} \
-	-DKCFG_INSTALL_DIR=%{_datadir}/config.kcfg \
-	-DPLUGIN_INSTALL_DIR=%{qt5dir}/plugins \
-	-DQT_PLUGIN_INSTALL_DIR=%{qt5dir}/plugins \
-	-DQML_INSTALL_DIR=%{qt5dir}/qml \
-	-DIMPORTS_INSTALL_DIR=%{qt5dirs}/imports \
-	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
-	-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
-	-DKF5_LIBEXEC_INSTALL_DIR=%{_libexecdir} \
-	-DKF5_INCLUDE_INSTALL_DIR=%{_includedir} \
-	-DECM_MKSPECS_INSTALL_DIR=%{qt5dir}/mkspecs/modules \
-	-D_IMPORT_PREFIX=%{_prefix} \
+	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
 	../
 %{__make}
 
@@ -94,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build/ install \
         DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{orgname}5
+%find_lang %{kfname}5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,11 +91,11 @@ rm -rf $RPM_BUILD_ROOT
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f %{orgname}5.lang
+%files -f %{kfname}5.lang
 %defattr(644,root,root,755)
 %doc README.md
 %attr(755,root,root) %ghost %{_libdir}/libKF5KCMUtils.so.5
-%attr(755,root,root) %{_libdir}/libKF5KCMUtils.so.5.0.0
+%attr(755,root,root) %{_libdir}/libKF5KCMUtils.so.5.4.0
 %{_datadir}/kservicetypes5/kcmodule.desktop
 %{_datadir}/kservicetypes5/kcmoduleinit.desktop