From f2270dafdc8bc22cf4a715c691913bcc1c629f38 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Tue, 9 Dec 2014 22:29:56 +0100
Subject: [PATCH] - up to 5.4.0

---
 kf5-solid.spec | 63 ++++++++++++++++++++------------------------------
 1 file changed, 25 insertions(+), 38 deletions(-)

diff --git a/kf5-solid.spec b/kf5-solid.spec
index 74746f2..2fb4a49 100644
--- a/kf5-solid.spec
+++ b/kf5-solid.spec
@@ -1,30 +1,30 @@
 # TODO:
 # - dir /usr/include/KF5 not packaged
-# /usr/lib/qt5/qml/org/kde not packaged
-%define         _state          stable
-%define		orgname		solid
+%define		kdeframever	5.4
+%define		qtver		5.3.2
+%define		kfname		solid
 
 Summary:	Desktop hardware abstraction
-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:	c79868c1de10553a51126c75d5a122a6
+Source0:	http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5:	361b9d43063356aa275e43b73e212325
 URL:		http://www.kde.org/
-BuildRequires:	Qt5Concurrent-devel
-BuildRequires:	Qt5Core-devel
-BuildRequires:	Qt5DBus-devel
-BuildRequires:	Qt5Gui-devel >= 5.3.1
-BuildRequires:	Qt5Test-devel
-BuildRequires:	Qt5Widgets-devel
-BuildRequires:	Qt5Xml-devel >= 5.2.0
+BuildRequires:	Qt5Concurrent-devel >= %{qtver}
+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:	bison
 BuildRequires:	cmake >= 2.8.12
 BuildRequires:	flex
-BuildRequires:	kf5-extra-cmake-modules >= 1.0.0
-BuildRequires:	qt5-linguist
+BuildRequires:	kf5-extra-cmake-modules >= 1.4.0
+BuildRequires:	qt5-linguist >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-devel
@@ -46,35 +46,25 @@ It provides the following features for application developers:
 
 
 %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 \
+	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
 	../
 %{__make}
 
@@ -84,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build/ install \
         DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{orgname}5_qt --with-qm
+%find_lang %{kfname}5_qt --with-qm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,15 +82,12 @@ rm -rf $RPM_BUILD_ROOT
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f %{orgname}5_qt.lang
+%files -f %{kfname}5_qt.lang
 %defattr(644,root,root,755)
 %doc README.md TODO
 %attr(755,root,root) %{_bindir}/solid-hardware5
 %attr(755,root,root) %ghost %{_libdir}/libKF5Solid.so.5
-%attr(755,root,root) %{_libdir}/libKF5Solid.so.5.0.0
-%dir %{qt5dir}/qml/org/kde/solid
-%attr(755,root,root) %{qt5dir}/qml/org/kde/solid/libsolidextensionplugin.so
-%{qt5dir}/qml/org/kde/solid/qmldir
+%attr(755,root,root) %{_libdir}/libKF5Solid.so.5.4.0
 
 %files devel
 %defattr(644,root,root,755)
-- 
2.44.0