update to upstream version 5.90.0

This commit is contained in:
pei-jiankang 2022-02-11 16:51:32 +08:00
parent fbc30e3e29
commit 8a0da18fe3
4 changed files with 19 additions and 7 deletions

Binary file not shown.

View File

@ -1,7 +1,7 @@
diff -up extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake.qt_prefix extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake 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.47.0/kde-modules/KDEInstallDirs.cmake.qt_prefix 2018-05-31 03:10:15.000000000 -0500 --- extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake.qt_prefix 2021-12-02 00:14:53.000000000 -0600
+++ extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake 2018-06-02 15:41:25.948999508 -0500 +++ extra-cmake-modules-5.89.0/kde-modules/KDEInstallDirs5.cmake 2021-12-08 09:23:47.194443267 -0600
@@ -461,7 +461,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQmake @@ -236,7 +236,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQmake
set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF) set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF)
if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS) if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY) query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
@ -10,3 +10,4 @@ diff -up extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake.qt_prefix e
message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.") message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.")
set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON) set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON)
endif() 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

Binary file not shown.

View File

@ -1,12 +1,20 @@
Name: extra-cmake-modules Name: extra-cmake-modules
Summary: Additional modules for CMake build system Summary: Additional modules for CMake build system
Version: 5.88.0 Version: 5.90.0
Release: 1 Release: 1
License: BSD License: BSD
URL: https://api.kde.org/ecm/ URL: https://api.kde.org/ecm/
Source0: http://download.kde.org/stable/frameworks/5.88/extra-cmake-modules-%{version}.tar.xz
%global versiondir %(echo %{version} | cut -d. -f1-2)
%global revision %(echo %{version} | cut -d. -f3)
%if %{revision} >= 50
%global stable unstable
%else
%global stable stable
%endif
Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{name}-%{version}.tar.xz
Patch01: extra-cmake-modules-5.39.0-poppler_overlinking.patch Patch01: extra-cmake-modules-5.39.0-poppler_overlinking.patch
Patch02: extra-cmake-modules-5.47.0-qt_prefix.patch Patch02: extra-cmake-modules-5.89.0-qt_prefix.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: kf5-rpm-macros qt5-qttools-devel python3-sphinx BuildRequires: kf5-rpm-macros qt5-qttools-devel python3-sphinx
Requires: kf5-rpm-macros qt5-linguist Requires: kf5-rpm-macros qt5-linguist
@ -44,6 +52,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
%changelog %changelog
* Fri Feb 11 2022 pei-jiankang<peijiankang@kylinos.com> - 5.90.0-1
- update to upstream version 5.90.0
* Wed Jan 12 2022 pei-jiankang<peijiankang@kylinos.com> - 5.88.0-1 * Wed Jan 12 2022 pei-jiankang<peijiankang@kylinos.com> - 5.88.0-1
- update to upstream version 5.88.0 - update to upstream version 5.88.0