From 907e555cfae81f1c02b4b9b6034aaf7822a7fc24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 28 Jul 2017 13:03:43 +0200 Subject: [PATCH] Temporarily disable RunCMake.CPack_RPM, because it fails for the new way RPM handles debug-stuff --- cmake.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 43522cc..ffd6a84 100644 --- a/cmake.spec +++ b/cmake.spec @@ -41,7 +41,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 3%{?relsuf}%{?dist} +Release: 4%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -335,7 +335,13 @@ mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled %endif pushd build #CMake.FileDownload, and CTestTestUpload require internet access -bin/ctest%{?name_suffix} -V -E 'CMake.FileDownload|CTestTestUpload' %{?_smp_mflags} +NO_TEST="CMake.FileDownload|CTestTestUpload" +# RunCMake.CPack_RPM fails for the new way RPM handles debug-stuff +%if 0%{?fedora} >= 27 +NO_TEST="$NO_TEST|RunCMake.CPack_RPM" +%endif +export NO_TEST +bin/ctest%{?name_suffix} -V -E "$NO_TEST" %{?_smp_mflags} popd %if 0%{?rhel} && 0%{?rhel} <= 6 mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake @@ -444,6 +450,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Jul 28 2017 Björn Esser - 3.9.0-4 +- Temporarily disable RunCMake.CPack_RPM, because it fails for the new + way RPM handles debug-stuff + * Wed Jul 26 2017 Fedora Release Engineering - 3.9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild