diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index 38171bc..3e66dfa 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -9,7 +9,7 @@ Name: extra-cmake-modules Summary: Additional modules for CMake build system Version: 5.39.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: https://api.kde.org/ecm/ @@ -28,7 +28,7 @@ BuildArch: noarch # bundle clang python bindings here, at least until they are properly packaged elsewhere, see: # https://bugzilla.redhat.com/show_bug.cgi?id=1490997 Source1: clang-python-4.0.1.tar.gz -%if 0%{?fedora} > 25 +%if 0%{?fedora} || 0%{?rhel} > 7 %global clang 1 Provides: bundled(python2-clang) = 4.0.1 %if 0%{?tests} @@ -46,7 +46,7 @@ BuildRequires: kf5-rpm-macros # qcollectiongenerator BuildRequires: qt5-qttools-devel # sphinx-build -%if 0%{?fedora} > 23 +%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: python2-sphinx %else BuildRequires: python-sphinx @@ -54,13 +54,13 @@ BuildRequires: python-sphinx %endif Requires: kf5-rpm-macros -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 # /usr/share/ECM/kde-modules/appstreamtest.cmake references appstreamcli # hard vs soft dep? --rex Requires: appstream %endif # /usr/share/ECM/modules/ECMPoQmTools.cmake -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 Requires: cmake(Qt5LinguistTools) %else # use pkgname instead of cmake since el7 qt5 pkgs currently do not include cmake() provides @@ -125,6 +125,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* Thu Nov 09 2017 Troy Dawson - 5.39.0-2 +- Cleanup conditionals + * Mon Nov 06 2017 Rex Dieter - 5.39.0-2 - FindPoppler.cmake: avoid overlinking base/core libpoppler