- updated URL and cmake version

[packages/kf5-extra-cmake-modules.git] / kf5-extra-cmake-modules.spec

diff --git a/kf5-extra-cmake-modules.spec b/kf5-extra-cmake-modules.spec
index 158f17d060c783b12f8ee34e13f16f39f618c225..8e7f457e091ce0620bc32cb78f7fa0e40dd76b35 100644 (file)
--- a/kf5-extra-cmake-modules.spec
+++ b/kf5-extra-cmake-modules.spec
@@ -3,20 +3,21 @@
 %bcond_without tests           # build without tests
 
 %define                orgname         extra-cmake-modules
-%define                kdeframever     5.39
+%define                kdeframever     5.86
 Summary:       Extra Cmake Modules for KF5
 Summary(pl.UTF-8):     Dodatkowe moduły Cmake'a dla KF5
 Name:          kf5-%{orgname}
-Version:       5.39.0
+Version:       5.86.0
 Release:       1
 License:       BSD
 Group:         Development/Building
-Source0:       http://download.kde.org/stable/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
-# Source0-md5: 777b57222f5c23d1599b8e8774e96b73
+Source0:       https://download.kde.org/stable/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
+# Source0-md5: cee2ba8f60aa01fe0f4eb9b6304c1a5b
 Patch0:                %{orgname}-tests.patch
-URL:           http://www.kde.org/
-BuildRequires: cmake >= 2.8.12
-BuildRequires: qt5-assistant >= 5.5.1
+Patch1:                kdefetchtranslations-test.patch
+URL:           https://kde.org/
+BuildRequires: cmake >= 3.16
+BuildRequires: qt5-assistant >= 5.9.0
 BuildRequires: qt5-linguist
 BuildRequires: rpmbuild(macros) >= 1.698
 BuildRequires: sed >= 4.0
@@ -24,14 +25,16 @@ BuildRequires:      sphinx-pdg >= 1.2
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 %if %{with tests}
-BuildRequires: Qt5Core-devel >= 5.5.1
-BuildRequires: Qt5Gui-devel >= 5.5.1
-BuildRequires: Qt5Network-devel >= 5.5.1
-BuildRequires: Qt5Qml-devel >= 5.5.1
-BuildRequires: Qt5Quick-devel >= 5.5.1
-BuildRequires: libstdc++-devel >= 6:4.9
-BuildRequires: qt5-build >= 5.5.1
+BuildRequires: Qt5Core-devel >= 5.9.0
+BuildRequires: Qt5Gui-devel >= 5.9.0
+BuildRequires: Qt5Network-devel >= 5.9.0
+BuildRequires: Qt5Qml-devel >= 5.9.0
+BuildRequires: Qt5Quick-devel >= 5.9.0
+BuildRequires: libstdc++-devel >= 6:5
+BuildRequires: qt5-build >= 5.9.0
 %endif
+Obsoletes:     kf5-extra-cmake-modules-doc
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,6 +67,7 @@ dowolnych programów wykorzystujących system budowania CMake.
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
+%patch1 -p0
 
 # causes make install failure after running tests
 %{__sed} -i -e '/ECMToolchainAndroidTest/d' tests/CMakeLists.txt
@@ -71,14 +75,16 @@ dowolnych programów wykorzystujących system budowania CMake.
 %build
 install -d build
 cd build
-%cmake .. \
-       %{!?with_tests:-DBUILD_TESTING=OFF}
+%cmake \
+       %{!?with_tests:-DBUILD_TESTING=OFF} \
+       ..
 
 %{__make}
 
 %if %{with tests}
 # GenerateSipBindings wants clang and has libclang checks incompatible with libclang >= 4
-ctest -E GenerateSipBindings
+# ECMPoQmToolsTest fails to build it's own moc file
+ctest -E '(GenerateSipBindings|ECMPoQmToolsTest)'
 %endif
 
 %install
@@ -87,7 +93,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build -j1 install \
         DESTDIR=$RPM_BUILD_ROOT
 
+sed -i -e 's#/usr/bin/env bash#/bin/bash#' $RPM_BUILD_ROOT%{_datadir}/ECM/kde-modules/kde-git-commit-hooks/pre-commit.in
+sed -i -e 's#/usr/bin/env bash#/bin/bash#' $RPM_BUILD_ROOT%{_datadir}/ECM/kde-modules/kde-git-commit-hooks/clang-format.sh
+
 %{__mv} $RPM_BUILD_ROOT%{_docdir}/ECM ECM-doc
+install -d $RPM_BUILD_ROOT%{_datadir}/qlogging-categories5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,4 +106,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYING-CMAKE-SCRIPTS README.rst ECM-doc/*
 %{_datadir}/ECM
+%{_datadir}/qlogging-categories5
 %{_mandir}/man7/ecm*.7*