- up to 5.4.0

diff --git a/kf5-kdeclarative.spec b/kf5-kdeclarative.spec
index bd8bedfc0f3a35e47a74e64f4fd6d93c86b914ef..287d2efe2d173f5ad6d272cf817009b7b874fd0f 100644 (file)
--- a/kf5-kdeclarative.spec
+++ b/kf5-kdeclarative.spec
@@ -2,32 +2,32 @@
 # Not packaged:
 # /usr/include/KF5
 # /usr/share/kservicetypes5
-
-%define         _state          stable
-%define                orgname         kdeclarative
+%define                kdeframever     5.4
+%define                qtver           5.3.2
+%define                kfname          kdeclarative
 
 Summary:       Integration of QML and KDE work spaces
-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: 9ffd395578771ff0933532aa9a83061f
+Source0:       http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5: 2478ce5757782a8e8f3b06512aa3d65a
 URL:           http://www.kde.org/
-BuildRequires: Qt5Core-devel >= 5.2.0
-BuildRequires: Qt5DBus-devel >= 5.2.0
-BuildRequires: Qt5Gui-devel
-BuildRequires: Qt5Network-devel >= 5.3.1
-BuildRequires: Qt5Qml-devel
-BuildRequires: Qt5Quick-devel
-BuildRequires: Qt5Test-devel
-BuildRequires: Qt5Widgets-devel >= 5.2.0
-BuildRequires: Qt5Xml-devel >= 5.2.0
+BuildRequires: Qt5Core-devel >= %{qtver}
+BuildRequires: Qt5DBus-devel >= %{qtver}
+BuildRequires: Qt5Gui-devel >= %{qtver}
+BuildRequires: Qt5Network-devel >= %{qtver}
+BuildRequires: Qt5Qml-devel >= %{qtver}
+BuildRequires: Qt5Quick-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-kbookmarks-devel >= %{version}
 BuildRequires: kf5-kcodecs-devel >= %{version}
@@ -61,36 +61,25 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 KDeclarative provides integration of QML and KDE work spaces.
 
 %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}
 
@@ -100,7 +89,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
@@ -108,11 +97,13 @@ 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}/libKF5Declarative.so.5
-%attr(755,root,root) %{_libdir}/libKF5Declarative.so.5.0.0
+%attr(755,root,root) %{_libdir}/libKF5Declarative.so.5.4.0
+%attr(755,root,root) %ghost %{_libdir}/libKF5QuickAddons.so.5
+%attr(755,root,root) %{_libdir}/libKF5QuickAddons.so.5.4.0
 %attr(755,root,root) %{qt5dir}/qml/org/kde/draganddrop/libdraganddropplugin.so
 %{qt5dir}/qml/org/kde/draganddrop/qmldir
 %attr(755,root,root) %{qt5dir}/qml/org/kde/kcoreaddons/libkcoreaddonsplugin.so
@@ -130,4 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/KF5/kdeclarative_version.h
 %{_libdir}/cmake/KF5Declarative
 %attr(755,root,root) %{_libdir}/libKF5Declarative.so
+%attr(755,root,root) %{_libdir}/libKF5QuickAddons.so
 %{qt5dir}/mkspecs/modules/qt_KDeclarative.pri
+%{qt5dir}/mkspecs/modules/qt_QuickAddons.pri
+%attr(755,root,root) %{qt5dir}/qml/org/kde/kio/libkio.so