- up to 1.4.0; drop tons of unneeded defines; run tests

diff --git a/kf5-extra-cmake-modules.spec b/kf5-extra-cmake-modules.spec
index 34695a02d18390d4f835f26aff5909cfe19c9a33..3d6746039f4188234c95dc0f37920c0a8d98bdba 100644 (file)
--- a/kf5-extra-cmake-modules.spec
+++ b/kf5-extra-cmake-modules.spec
@@ -1,17 +1,20 @@
-# TODO where to put files and docs of KF5
-%define         _state          stable
+%bcond_without tests
+
+%define                _state          stable
 %define                orgname         extra-cmake-modules
+%define                kdeframever     5.4
 
 Summary:       Extra Cmake Modules for KF5
 Name:          kf5-extra-cmake-modules
-Version:       1.0.0
-Release:       0.2
-License:       See COPYING-CMAKE-SCRIPTS
-Group:         X11/Libraries
-Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/frameworks/5.0.0/%{orgname}-%{version}.tar.xz
-# Source0-md5: a7b9e8756fdc2b3a8518ad9f9d21dfd5
+Version:       1.4.0
+Release:       1
+License:       BSD
+Group:         Development/Building
+Source0:       http://download.kde.org/%{_state}/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
+# Source0-md5: a8a8278f5448a584cffec07692ed9f19
 URL:           http://www.kde.org/
 BuildRequires: cmake >= 2.8.12
+BuildRequires: qt5-linguist
 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRequires: sphinx-pdg
 BuildRequires: tar >= 1:1.22
@@ -33,16 +36,6 @@ While the driving force of this module is to reduce duplication in
 CMake scripts across KDE software, it is intended to be useful for any
 software that uses the CMake build system.
 
-%package doc
-Summary:       Documentation for ECM
-Group:         Documentation
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
-
-%description doc
-Documentation for ECM.
-
 %prep
 %setup -q -n %{orgname}-%{version}
 
@@ -50,36 +43,24 @@ Documentation for ECM.
 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} \
        ../
 %{__make}
 
+%{?with_tests:%{__make} test}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -C build/ install \
         DESTDIR=$RPM_BUILD_ROOT
 
+mv $RPM_BUILD_ROOT%{_docdir}/ECM ECM-doc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING-CMAKE-SCRIPTS README.rst
+%doc COPYING-CMAKE-SCRIPTS README.rst ECM-doc/*
 %{_datadir}/ECM
-%{_mandir}/man7/ecm*
-
-%files doc
-%defattr(644,root,root,755)
-%{_docdir}/ECM
+%{_mandir}/man7/ecm*.7*