Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2015-05-16 07:14:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2015-05-15 09:55:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2015-05-16 07:14:08.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 14 18:42:34 UTC 2015 - o...@aepfle.de + +- CPack/RPM architecture test fixup (SLE11/11.4) (cmake bug#15442) + cmake.git-4552bc8.patch + +------------------------------------------------------------------- New: ---- cmake.git-4552bc8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.lzedGr/_old 2015-05-16 07:14:09.000000000 +0200 +++ /var/tmp/diff_new_pack.lzedGr/_new 2015-05-16 07:14:09.000000000 +0200 @@ -36,6 +36,8 @@ # PATCH-FIX-UPSTREAM cmake-fix-pie-binaries.patch -- new "file" is reporting PIE binaries a bit differently # I sent this by email to cmake-developers. Patch6: cmake-fix-pie-binaries.patch +# PATCH-FIX-UPSTREAM cmake.git-4552bc8.patch -- CPack/RPM architecture test fixup +Patch11: cmake.git-4552bc8.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -65,6 +67,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch11 -p1 %build export CXXFLAGS="%{optflags}" @@ -137,8 +140,7 @@ %files %defattr(-,root,root) %config %{_sysconfdir}/rpm/macros.cmake -%{_prefix}/lib/rpm/fileattrs/cmake.attr -%{_prefix}/lib/rpm/cmake.prov +%{_prefix}/lib/rpm %{_bindir}/cpack %{_bindir}/cmake %{_bindir}/ctest ++++++ cmake.git-4552bc8.patch ++++++ >From 4552bc886d1bd8966f6ef2f7790835dfdb2e6d8b Mon Sep 17 00:00:00 2001 From: Domen Vrankar <domen.vran...@gmail.com> Date: Sun, 15 Mar 2015 20:37:16 +0100 Subject: [PATCH] CPack/RPM relocation paths test fixup Patch fixes bug in test reported with id 15442 - older versions of rpm print out package info a bit differently so we should ignore white spaces --- Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake index c7ec709..079b819 100644 --- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake +++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake @@ -162,28 +162,30 @@ if(CPackGen MATCHES "RPM") ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + set(whitespaces "[\\t\\n\\r ]*") + if(check_file_libraries_match) set(check_file_match_expected_summary ".*${CPACK_RPM_libraries_PACKAGE_SUMMARY}.*") set(check_file_match_expected_description ".*${CPACK_RPM_libraries_PACKAGE_DESCRIPTION}.*") - set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") + set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") set(spec_regex "*libraries*") set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/lib.*\n/usr/foo/bar/lib.*/libmylib.a$") elseif(check_file_headers_match) set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*") set(check_file_match_expected_description ".*${CPACK_COMPONENT_HEADERS_DESCRIPTION}.*") - set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") + set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") set(spec_regex "*headers*") set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/include\n/usr/foo/bar/include/mylib.h$") elseif(check_file_applications_match) set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*") set(check_file_match_expected_description ".*${CPACK_COMPONENT_APPLICATIONS_DESCRIPTION}.*") - set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}.*") set(spec_regex "*applications*") set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/bin\n/usr/foo/bar/bin/mylibapp$") elseif(check_file_Unspecified_match) set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*") set(check_file_match_expected_description ".*DESCRIPTION.*") - set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") set(spec_regex "*Unspecified*") set(check_content_list "^/usr/foo/bar /usr/foo/bar/bin -- 1.7.10.4