diff --git a/.gitignore b/.gitignore index 468a77d..d362b1e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /extra-cmake-modules-5.86.0.tar.xz /extra-cmake-modules-5.87.0.tar.xz /extra-cmake-modules-5.88.0.tar.xz +/extra-cmake-modules-5.89.0.tar.xz diff --git a/extra-cmake-modules-5.47.0-qt_prefix.patch b/extra-cmake-modules-5.47.0-qt_prefix.patch deleted file mode 100644 index a0ec9db..0000000 --- a/extra-cmake-modules-5.47.0-qt_prefix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake.qt_prefix extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake ---- extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake.qt_prefix 2018-05-31 03:10:15.000000000 -0500 -+++ extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake 2018-06-02 15:41:25.948999508 -0500 -@@ -461,7 +461,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQmake - set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF) - if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS) - query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY) -- if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") -+ if( (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") OR ( ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") AND (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_FULL_LIBDIR}/qt5")) ) - message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.") - set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON) - endif() diff --git a/extra-cmake-modules-5.89.0-qt_prefix.patch b/extra-cmake-modules-5.89.0-qt_prefix.patch new file mode 100644 index 0000000..2c291f2 --- /dev/null +++ b/extra-cmake-modules-5.89.0-qt_prefix.patch @@ -0,0 +1,13 @@ +diff -up extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake.qt_prefix extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake +--- extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake.qt_prefix 2021-12-02 00:14:53.000000000 -0600 ++++ extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake 2021-12-08 09:23:47.194443267 -0600 +@@ -236,7 +236,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQmake + set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF) + if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS) + query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY) +- if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") ++ if( (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") OR ( ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") AND (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_FULL_LIBDIR}/qt5")) ) + message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.") + set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON) + endif() +diff -up extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs6.cmake.qt_prefix extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs6.cmake diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index 4b488b7..d33c27e 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -8,7 +8,7 @@ Name: extra-cmake-modules Summary: Additional modules for CMake build system -Version: 5.88.0 +Version: 5.89.0 Release: 1%{?dist} License: BSD @@ -40,7 +40,7 @@ BuildRequires: python2-PyQt5-devel # do not unconditionally link in base/core libpoppler library Patch2: extra-cmake-modules-5.39.0-poppler_overlinking.patch # https://bugzilla.redhat.com/1435525 -Patch3: extra-cmake-modules-5.47.0-qt_prefix.patch +Patch3: extra-cmake-modules-5.89.0-qt_prefix.patch BuildRequires: kf5-rpm-macros BuildRequires: make @@ -126,6 +126,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* Wed Dec 08 2021 Rex Dieter - 5.89.0-1 +- 5.89.0 + * Mon Nov 08 2021 Marc Deop - 5.88.0-1 - 5.88.0 diff --git a/sources b/sources index c0821ac..adaf4ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (extra-cmake-modules-5.88.0.tar.xz) = e560aa84dbbc1f1673bb51b7c384a64899244f255c7a20e6f5c4046334a6bbfa4632d01ec75b219cb129f0ac37c328a10fe1ea5bbd05bc4c839d797fa965ce3b +SHA512 (extra-cmake-modules-5.89.0.tar.xz) = 94e12ee5bc9405664ae6a91c1c9ef13193aa90937f6ae5609c19aabb63666f4e7d287f0f791a8d7d435bb9f537d2fd7355ffae9aa6a9d352321fddfe9f943a85