diff --git a/extra-cmake-modules-5.40.0.tar.xz b/extra-cmake-modules-5.40.0.tar.xz deleted file mode 100644 index 83eba12..0000000 --- a/extra-cmake-modules-5.40.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83e48889c84474e4f560e10e4eea0cc529f8511b3bd0415fcb898ac0496e630a -size 312532 diff --git a/extra-cmake-modules-5.41.0.tar.xz b/extra-cmake-modules-5.41.0.tar.xz new file mode 100644 index 0000000..6dba9a1 --- /dev/null +++ b/extra-cmake-modules-5.41.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baaf60940b9ff883332629ba2800090bb86722ba49a85cc12782e4ee5b169f67 +size 313940 diff --git a/extra-cmake-modules.changes b/extra-cmake-modules.changes index f861e45..5a736c6 100644 --- a/extra-cmake-modules.changes +++ b/extra-cmake-modules.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Jan 8 08:41:54 UTC 2018 - tchvatal@suse.com + +- Use python3 sphinx to generate the documentation module + +------------------------------------------------------------------- +Sun Dec 17 09:43:47 CET 2017 - lbeltrame@kde.org + +- Update to 5.41.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.41.0.php +- Changes since 5.40.0: + * Add the description tag to the generated pkgconfig files + * ecm_add_test: Use proper path sep on Windows + * Fix variable name + * restore old behaviour of FindPulseAudio + * Remove FindSasl2.cmake from the ECM's attic. + * Delete the .reviewboardrc file. + * Add FindSasl2.cmake to ECM + * Only pass the ARGS thing when doing Makefiles + * Remove FindGLIB2.cmake and FindPulseAudio.cmake from attic + * Add FindGLIB2.cmake and FindPulseAudio.cmake + * ECMAddTests: set QT_PLUGIN_PATH so locally built plugins can be found + * KDECMakeSettings: more docu about the layout of the build dir + ------------------------------------------------------------------- Mon Nov 13 07:01:13 CET 2017 - lbeltrame@kde.org diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index 31ff6d6..be1d793 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -1,7 +1,7 @@ # # spec file for package extra-cmake-modules # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,34 +16,38 @@ # -%define _tar_path 5.40 +%define _tar_path 5.41 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} +%if 0%{?suse_version} >= 1330 +%bcond_without doc +%else +%bcond_with doc +%endif Name: extra-cmake-modules +Version: 5.41.0 +Release: 0 Summary: CMake modules License: BSD-3-Clause Group: Development/Tools/Other Url: https://projects.kde.org/projects/kdesupport/extra-cmake-modules -Version: 5.40.0 -Release: 0 Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch0: bundle-lang.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 3.0 BuildRequires: gcc-c++ BuildRequires: kf5-filesystem >= 5.6.0 -%if %suse_version != 1315 -BuildRequires: python-Sphinx -%endif Requires: cmake >= 3.0 Requires: gcc-c++ Requires: kf5-filesystem +Recommends: %{name}-doc Provides: kf5umbrella = 4.99.0 Obsoletes: kf5umbrella < 4.99.0 -Recommends: %{name}-doc +%if %{with doc} +BuildRequires: python3-Sphinx +%endif %description Extra modules and scripts for CMake. @@ -74,12 +78,10 @@ This package provides documentation for extra-cmake-modules %kf5_makeinstall -C build %files -%defattr(-,root,root,-) %{_datadir}/ECM/ -%if %suse_version != 1315 +%if %{with doc} %files doc -%defattr(-,root,root,-) %doc %{_datadir}/doc/ECM/ %doc %lang(en) %{_mandir}/man7/ecm*.7* %endif