- updated to 5.104.0

[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 292333d0d63eb3b4ed87e6b85033214cfb763459..01b3c6cbfd3565c9ddc929288d2dfaa79820ce39 100644 (file)
--- a/kf5-extra-cmake-modules.spec
+++ b/kf5-extra-cmake-modules.spec
@@ -4,38 +4,34 @@
 %bcond_without tests           # build without tests
 
 %define                orgname         extra-cmake-modules
-%define                kdeframever     5.87
+%define                kdeframever     5.104
 Summary:       Extra Cmake Modules for KF5
 Summary(pl.UTF-8):     Dodatkowe moduły Cmake'a dla KF5
 Name:          kf5-%{orgname}
-Version:       5.87.0
-Release:       2
+Version:       5.104.0
+Release:       1
 License:       BSD
 Group:         Development/Building
 Source0:       https://download.kde.org/stable/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
-# Source0-md5: 4c99ba4e843f835a129be9f39666efb0
+# Source0-md5: 868f2ede18cd48146830476d3af9f8ca
 Patch0:                %{orgname}-tests.patch
 Patch1:                kdefetchtranslations-test.patch
+Patch2:                no-fatal-warnings.patch
 URL:           https://kde.org/
 BuildRequires: cmake >= 3.16
 BuildRequires: qt5-assistant >= 5.9.0
 BuildRequires: qt5-linguist
-BuildRequires: python3-charset_normalizer >= 2.0.0
 BuildRequires: rpmbuild(macros) >= 1.698
 BuildRequires: sed >= 4.0
-BuildRequires: sphinx-pdg >= 1.2
+%{?with_doc:BuildRequires:     sphinx-pdg >= 1.2}
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 %if %{with tests}
 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
+BuildConflicts:        qmake
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -70,6 +66,7 @@ dowolnych programów wykorzystujących system budowania CMake.
 Summary:       API documentation for %{orgname}
 Summary(pl.UTF-8):     Dokumentacja API %{orgname}
 Group:         Documentation
+Obsoletes:     kf5-extra-cmake-modules-doc < 1.4.0
 
 %description apidocs
 API documentation for %{orgname}.
@@ -81,6 +78,7 @@ Dokumentacja API dla %{orgname}.
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 # causes make install failure after running tests
 %{__sed} -i -e '/ECMToolchainAndroidTest/d' tests/CMakeLists.txt
@@ -98,7 +96,7 @@ cd build
 %if %{with tests}
 # GenerateSipBindings wants clang and has libclang checks incompatible with libclang >= 4
 # ECMPoQmToolsTest fails to build it's own moc file
-ctest -E '(GenerateSipBindings|ECMPoQmToolsTest)'
+ctest -E '(GenerateSipBindings|ECMPoQmToolsTest)' --output-on-failure
 %endif
 
 %install