- up to 5.4.0

diff --git a/kf5-sonnet.spec b/kf5-sonnet.spec
index e150d5ee117b09276e099414c9c5fb9179e66c2d..d35af1b88f1f4682bd4ff08a5d454abf3f5ae4d4 100644 (file)
--- a/kf5-sonnet.spec
+++ b/kf5-sonnet.spec
@@ -1,31 +1,29 @@
 # TODO:
 # - dir /usr/include/KF5 not packaged
-# /usr/lib/qt5/qml/org/kde not packaged
-# /usr/lib/qt5/plugins/kf5
-# /usr/share/kf5
-
-%define         _state          stable
-%define                orgname         sonnet
+# - fix build with aspell
+%define                kdeframever     5.4
+%define                qtver           5.3.2
+%define                kfname          sonnet
 
 Summary:       Multi-language spell checker
-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: b5608009ca1d34e6fdfd4f89c9752eef
+Source0:       http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5: c100990572daeb8d07968671246674eb
 URL:           http://www.kde.org/
-BuildRequires: Qt5Core-devel
-BuildRequires: Qt5Gui-devel >= 5.3.1
-BuildRequires: Qt5Test-devel
-BuildRequires: Qt5Widgets-devel
+BuildRequires: Qt5Core-devel >= %{qtver}
+BuildRequires: Qt5Gui-devel >= %{qtver}
+BuildRequires: Qt5Test-devel >= %{qtver}
+BuildRequires: Qt5Widgets-devel >= %{qtver}
 BuildRequires: aspell-devel
 BuildRequires: cmake >= 2.8.12
 BuildRequires: hspell-devel
 BuildRequires: hunspell-devel
-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: xz
@@ -46,35 +44,25 @@ The simplest way to use Sonnet in your application is to use the
 SpellCheckDecorator class on your QTextEdit.
 
 %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 +72,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,13 +80,13 @@ 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
 %attr(755,root,root) %ghost %{_libdir}/libKF5SonnetCore.so.5
-%attr(755,root,root) %{_libdir}/libKF5SonnetCore.so.5.0.0
+%attr(755,root,root) %{_libdir}/libKF5SonnetCore.so.5.4.0
 %attr(755,root,root) %ghost %{_libdir}/libKF5SonnetUi.so.5
-%attr(755,root,root) %{_libdir}/libKF5SonnetUi.so.5.0.0
+%attr(755,root,root) %{_libdir}/libKF5SonnetUi.so.5.4.0
 %dir %{qt5dir}/plugins/kf5/sonnet
 %attr(755,root,root) %{qt5dir}/plugins/kf5/sonnet/aspell.so
 %attr(755,root,root) %{qt5dir}/plugins/kf5/sonnet/hspell.so