[packages/kf5-extra-cmake-modules] - updated to 5.79.0

[witekfl]

commit 3d166c4a98d7fa8234825360ddc3e10f92da6db2
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Sat Mar 6 20:56:41 2021 +0100

    - updated to 5.79.0

 extra-cmake-modules-tests.patch |  8 ++++----
 kdefetchtranslations-test.patch | 11 +++++++++++
 kf5-extra-cmake-modules.spec    | 16 +++++++++++-----
 3 files changed, 26 insertions(+), 9 deletions(-)
---
diff --git a/kf5-extra-cmake-modules.spec b/kf5-extra-cmake-modules.spec
index 1cbce14..ac5e787 100644
--- a/kf5-extra-cmake-modules.spec
+++ b/kf5-extra-cmake-modules.spec
@@ -3,17 +3,18 @@
 %bcond_without	tests		# build without tests
 
 %define		orgname		extra-cmake-modules
-%define		kdeframever	5.71
+%define		kdeframever	5.79
 Summary:	Extra Cmake Modules for KF5
 Summary(pl.UTF-8):	Dodatkowe moduły Cmake'a dla KF5
 Name:		kf5-%{orgname}
-Version:	5.71.0
+Version:	5.79.0
 Release:	1
 License:	BSD
 Group:		Development/Building
 Source0:	http://download.kde.org/stable/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
-# Source0-md5:	39590c81474016b01ce1bc29fb808c3e
+# Source0-md5:	020c6267046a065ee505c9b03d1bbe56
 Patch0:		%{orgname}-tests.patch
+Patch1:		kdefetchtranslations-test.patch
 URL:		http://www.kde.org/
 BuildRequires:	cmake >= 3.5
 BuildRequires:	qt5-assistant >= 5.9.0
@@ -66,6 +67,7 @@ dowolnych programów wykorzystujących system budowania CMake.
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
+%patch1 -p0
 
 # causes make install failure after running tests
 %{__sed} -i -e '/ECMToolchainAndroidTest/d' tests/CMakeLists.txt
@@ -73,8 +75,9 @@ dowolnych programów wykorzystujących system budowania CMake.
 %build
 install -d build
 cd build
-%cmake .. \
-	%{!?with_tests:-DBUILD_TESTING=OFF}
+%cmake \
+	%{!?with_tests:-DBUILD_TESTING=OFF} \
+	..
 
 %{__make}
 
@@ -90,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build -j1 install \
         DESTDIR=$RPM_BUILD_ROOT
 
+sed -i -e 's#/usr/bin/env bash#/bin/bash#' $RPM_BUILD_ROOT%{_datadir}/ECM/kde-modules/kde-git-commit-hooks/pre-commit.in
+sed -i -e 's#/usr/bin/env bash#/bin/bash#' $RPM_BUILD_ROOT%{_datadir}/ECM/kde-modules/kde-git-commit-hooks/clang-format.sh
+
 %{__mv} $RPM_BUILD_ROOT%{_docdir}/ECM ECM-doc
 install -d $RPM_BUILD_ROOT%{_datadir}/qlogging-categories5
 
diff --git a/extra-cmake-modules-tests.patch b/extra-cmake-modules-tests.patch
index 97b5613..a844646 100644
--- a/extra-cmake-modules-tests.patch
+++ b/extra-cmake-modules-tests.patch
@@ -1,7 +1,7 @@
---- extra-cmake-modules-5.39.0/tests/ECMPoQmToolsTest/check.cmake.in.orig	2017-09-09 14:07:55.000000000 +0200
-+++ extra-cmake-modules-5.39.0/tests/ECMPoQmToolsTest/check.cmake.in	2017-12-24 13:35:12.069782068 +0100
-@@ -70,7 +70,7 @@
-         foreach(lang en de fr)
+--- extra-cmake-modules-5.79.0/tests/ECMPoQmToolsTest/check.cmake.in.orig	2021-02-05 16:18:39.000000000 +0100
++++ extra-cmake-modules-5.79.0/tests/ECMPoQmToolsTest/check.cmake.in	2021-03-03 22:34:42.484894802 +0100
+@@ -74,7 +74,7 @@
+         foreach(lang en de de_AT fr)
              execute_process(
                  COMMAND "${CMAKE_COMMAND}" -E env "XDG_DATA_DIRS=${ACTUAL_TREE}/share"
 -                    LANGUAGE=${lang} "${exec}"
diff --git a/kdefetchtranslations-test.patch b/kdefetchtranslations-test.patch
new file mode 100644
index 0000000..dd08477
--- /dev/null
+++ b/kdefetchtranslations-test.patch
@@ -0,0 +1,11 @@
+--- tests/KDEFetchTranslations/CMakeLists.txt.orig	2021-02-05 16:18:39.000000000 +0100
++++ tests/KDEFetchTranslations/CMakeLists.txt	2021-03-06 19:41:09.226109189 +0100
+@@ -19,7 +19,7 @@
+ 
+ _repository_name(name "${CMAKE_CURRENT_SOURCE_DIR}/../../")
+ if (NOT ${name} STREQUAL "frameworks/extra-cmake-modules")
+-    message(FATAL_ERROR "Wrong repository name: ${name}, should be 'frameworks/extra-cmake-modules'")
++#    message(FATAL_ERROR "Wrong repository name: ${name}, should be 'frameworks/extra-cmake-modules'")
+ endif()
+ add_executable(dummy ../ExecuteKDEModules/main.c)
+ ecm_mark_nongui_executable(dummy)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kf5-extra-cmake-modules.git/commitdiff/3d166c4a98d7fa8234825360ddc3e10f92da6db2