Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2016-06-13 21:48:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-04-22 16:16:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2016-06-13 21:48:41.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 8 07:48:02 UTC 2016 - [email protected] + +- Add libarchive-version.patch to fix version detecting for + libarchive 3.2 + +------------------------------------------------------------------- New: ---- libarchive-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.PlWiCC/_old 2016-06-13 21:48:42.000000000 +0200 +++ /var/tmp/diff_new_pack.PlWiCC/_new 2016-06-13 21:48:42.000000000 +0200 @@ -37,6 +37,8 @@ Patch5: system-libs.patch # PATCH-FIX-SUSE cmake-version-in-generated-files.patch -- version number to be found in OBS Patch6: cmake-version-in-generated-files.patch +# PATCH-FIX-UPSTREAM libarchive-version.patch -- Fix version detecting for libarchive 3.2 +Patch7: libarchive-version.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -68,6 +70,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build export CXXFLAGS="%{optflags}" ++++++ libarchive-version.patch ++++++ From: Orion Poplawski <[email protected]> Date: Fri, 3 Jun 2016 15:37:03 +0000 (-0600) Subject: FindLibArchive: Support libarchive 3.2 version string format X-Git-Url: https://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=38d18bab FindLibArchive: Support libarchive 3.2 version string format --- diff --git a/Modules/FindLibArchive.cmake b/Modules/FindLibArchive.cmake index 471a4f1..dd93041 100644 --- a/Modules/FindLibArchive.cmake +++ b/Modules/FindLibArchive.cmake @@ -42,14 +42,15 @@ mark_as_advanced(LibArchive_INCLUDE_DIR LibArchive_LIBRARY) # Extract the version number from the header. if(LibArchive_INCLUDE_DIR AND EXISTS "${LibArchive_INCLUDE_DIR}/archive.h") - # The version string appears in one of two known formats in the header: + # The version string appears in one of three known formats in the header: # #define ARCHIVE_LIBRARY_VERSION "libarchive 2.4.12" # #define ARCHIVE_VERSION_STRING "libarchive 2.8.4" - # Match either format. - set(_LibArchive_VERSION_REGEX "^#define[ \t]+ARCHIVE[_A-Z]+VERSION[_A-Z]*[ \t]+\"libarchive +([0-9]+)\\.([0-9]+)\\.([0-9]+)[^\"]*\".*$") + # #define ARCHIVE_VERSION_ONLY_STRING "3.2.0" + # Match any format. + set(_LibArchive_VERSION_REGEX "^#define[ \t]+ARCHIVE[_A-Z]+VERSION[_A-Z]*[ \t]+\"(libarchive +)?([0-9]+)\\.([0-9]+)\\.([0-9]+)[^\"]*\".*$") file(STRINGS "${LibArchive_INCLUDE_DIR}/archive.h" _LibArchive_VERSION_STRING LIMIT_COUNT 1 REGEX "${_LibArchive_VERSION_REGEX}") if(_LibArchive_VERSION_STRING) - string(REGEX REPLACE "${_LibArchive_VERSION_REGEX}" "\\1.\\2.\\3" LibArchive_VERSION "${_LibArchive_VERSION_STRING}") + string(REGEX REPLACE "${_LibArchive_VERSION_REGEX}" "\\2.\\3.\\4" LibArchive_VERSION "${_LibArchive_VERSION_STRING}") endif() unset(_LibArchive_VERSION_REGEX) unset(_LibArchive_VERSION_STRING)
