Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2016-07-18 21:19:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-gui.changes 2016-07-01 09:55:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2016-07-18 21:19:38.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Jul 12 05:26:59 UTC 2016 - f...@grueninger.de + +- While upstreaming cmake-version-in-generated-files.patch, the + CMake developer Brad King reduced the patch + +------------------------------------------------------------------- +Mon Jul 11 17:28:35 UTC 2016 - mplus...@suse.com + +- Remove PIE from macro + +------------------------------------------------------------------- +Sun Jul 10 08:18:57 UTC 2016 - f...@grueninger.de + +- update to CMake 3.6.0 + no changes specific to CMake-GUI + full changelog: https://blog.kitware.com/cmake-3-6-0-available-for-download/ +- update patch cmake-version-in-generated-files.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2016-07-01 09:55:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2016-07-18 21:19:39.000000000 +0200 @@ -1,0 +2,39 @@ +Tue Jul 12 05:13:19 UTC 2016 - f...@grueninger.de + +- While upstreaming cmake-version-in-generated-files.patch, the + CMake developer Brad King reduced the patch + +------------------------------------------------------------------- +Mon Jul 11 17:28:01 UTC 2016 - mplus...@suse.com + +- Remove PIE from macros + +------------------------------------------------------------------- +Sun Jul 10 08:13:00 UTC 2016 - f...@grueninger.de + +- update to CMake 3.6.0 + * The “list()” command gained a “FILTER” sub-command to filter + list elements by regular expression. + * A “CMAKE_TRY_COMPILE_TARGET_TYPE” variable was added to optionally + tell the “try_compile()” command to build a static library instead + of an executable. + * A “<LANG>_CLANG_TIDY” target property and supporting + “CMAKE_<LANG>_CLANG_TIDY” variable were introduced to tell the + Makefile Generators and the “Ninja” generator to run “clang-tidy” + along with the compiler for “C” and “CXX” languages. + * The “ExternalProject” module leared the “GIT_SHALLOW 1” option to + perform a shallow clone of a Git repository. + * The “ExternalProject” module learned to initialize Git submodules + recursively and also to initialize new submodules on updates. + * The “InstallRequiredSystemLibraries” module learned a new + “CMAKE_INSTALL_UCRT_LIBRARIES” option to enable app-local deployment + of the Windows Universal CRT libraries with Visual Studio 2015. + * The “Compile Features” functionality is now aware of features + supported by Intel C++ compilers versions 12.1 through 16.0 on UNIX + platforms. + * The “CMakeForceCompiler” module and its macros are now deprecated. + full changelog: https://blog.kitware.com/cmake-3-6-0-available-for-download/ +- drop patch libarchive-version.patch which is included upstream +- update patch cmake-version-in-generated-files.patch + +------------------------------------------------------------------- @@ -1082 +1120,0 @@ - Old: ---- cmake-3.5.2-SHA-256.txt cmake-3.5.2-SHA-256.txt.asc cmake-3.5.2.tar.gz libarchive-version.patch New: ---- cmake-3.6.0-SHA-256.txt cmake-3.6.0-SHA-256.txt.asc cmake-3.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.9ij466/_old 2016-07-18 21:19:40.000000000 +0200 +++ /var/tmp/diff_new_pack.9ij466/_new 2016-07-18 21:19:40.000000000 +0200 @@ -17,21 +17,21 @@ Name: cmake-gui -Version: 3.5.2 +Version: 3.6.0 Release: 0 Summary: CMake graphical user interface License: BSD-3-Clause Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: http://www.cmake.org/files/v3.5/cmake-%{version}.tar.gz -Source5: http://www.cmake.org/files/v3.5/cmake-%{version}-SHA-256.txt -Source6: http://www.cmake.org/files/v3.5/cmake-%{version}-SHA-256.txt.asc +Source0: http://www.cmake.org/files/v3.6/cmake-%{version}.tar.gz +Source5: http://www.cmake.org/files/v3.6/cmake-%{version}-SHA-256.txt +Source6: http://www.cmake.org/files/v3.6/cmake-%{version}-SHA-256.txt.asc Source7: cmake.keyring # PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes Patch4: form.patch # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs Patch5: system-libs.patch -# PATCH-FIX-SUSE cmake-version-in-generated-files.patch -- version number to be found in OBS +# PATCH-FIX-UPSTREAM cmake-version-in-generated-files.patch -- version number to be found in OBS Patch6: cmake-version-in-generated-files.patch BuildRequires: curl-devel BuildRequires: fdupes @@ -81,9 +81,6 @@ %build EXTRA_FLAGS="--qt-gui" -export CXXFLAGS="%{optflags} -fPIE" -export CFLAGS="%{optflags} -fPIE" -export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" # FIXME: you should use the %%configure macro ./configure \ --prefix=%{_prefix} \ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.9ij466/_old 2016-07-18 21:19:40.000000000 +0200 +++ /var/tmp/diff_new_pack.9ij466/_new 2016-07-18 21:19:40.000000000 +0200 @@ -17,29 +17,27 @@ Name: cmake -Version: 3.5.2 +Version: 3.6.0 Release: 0 Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: http://www.cmake.org/files/v3.5/%{name}-%{version}.tar.gz +Source0: http://www.cmake.org/files/v3.6/%{name}-%{version}.tar.gz Source1: cmake.macros # bnc#947585 - Let CMake produces automatic RPM provides Source3: cmake.attr Source4: cmake.prov -Source5: http://www.cmake.org/files/v3.5/%{name}-%{version}-SHA-256.txt -Source6: http://www.cmake.org/files/v3.5/%{name}-%{version}-SHA-256.txt.asc +Source5: http://www.cmake.org/files/v3.6/%{name}-%{version}-SHA-256.txt +Source6: http://www.cmake.org/files/v3.6/%{name}-%{version}-SHA-256.txt.asc Source7: cmake.keyring Patch2: cmake-fix-ruby-test.patch # PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes Patch4: form.patch # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs Patch5: system-libs.patch -# PATCH-FIX-SUSE cmake-version-in-generated-files.patch -- version number to be found in OBS +# PATCH-FIX-UPSTREAM 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++ @@ -72,12 +70,8 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %build -export CXXFLAGS="%{optflags} -fPIE" -export CFLAGS="%{optflags} -fPIE" -export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" # FIXME: you should use the %%configure macro ./configure \ --prefix=%{_prefix} \ @@ -85,9 +79,6 @@ --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ --system-libs \ -%if 0%{?suse_version} <= 1110 - --no-system-libarchive \ -%endif --no-system-jsoncpp \ --parallel=0%{jobs} \ --verbose \ ++++++ cmake-3.5.2-SHA-256.txt -> cmake-3.6.0-SHA-256.txt ++++++ --- /work/SRC/openSUSE:Factory/cmake/cmake-3.5.2-SHA-256.txt 2016-04-22 16:16:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-3.6.0-SHA-256.txt 2016-07-18 21:19:37.000000000 +0200 @@ -1,14 +1,16 @@ -630a9a930518c840c931f6d54b6bdd87693072c1291f1c63e6b9474c351e0b80 cmake-3.5.2-Darwin-x86_64.dmg -ce96b92eef838c7a568e89c841b95e07dd0ac39fe7a93f25b759bbfd9968eb62 cmake-3.5.2-Darwin-x86_64.tar.Z -0263be8f59ba1ae88172d5db769c2af69bcd8b2cbd4a9b1a981c406ce609a4ca cmake-3.5.2-Darwin-x86_64.tar.gz -c0e8aef366791fe40ca0698a3a6a03b72bfcc541b2ba0e4a60fcfa0694ffa240 cmake-3.5.2-Linux-i386.sh -9b921b65d5e91ac315a00f15eed7e460716e9916247bd995a3e73a37db3b11eb cmake-3.5.2-Linux-i386.tar.Z -053d158dfc1393ec2c4b7f142868b6c92b3e10297068c9ff73bc9e654821c304 cmake-3.5.2-Linux-i386.tar.gz -2999af0a9e0f8173fe84a494e8a7e183e81c3e57e95c0d867aa1c76af0269760 cmake-3.5.2-Linux-x86_64.sh -6eb6468b7c28c99f98dc9ff82b2a07b740f2f548f4c183eded1783240c564f1a cmake-3.5.2-Linux-x86_64.tar.Z -5f7aeaebe33521647625e0411467de71a2886743e4aa2c179e04c9e141c6c8cd cmake-3.5.2-Linux-x86_64.tar.gz -32a7d80fd69f37de7cbc03ce633d3d33cee16dd241145c0147ffc771306ac81e cmake-3.5.2-win32-x86.msi -671073aee66b3480a564d0736792e40570a11e861bb34819bb7ae7858bbdfb80 cmake-3.5.2-win32-x86.zip -93d5cd50283fb661f21dfa586e91363952b023816aab647926a7172ac80ea6cd cmake-3.5.2.tar.Z -92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a cmake-3.5.2.tar.gz -43273227405d2f6f609d86e1c7cef4bd7d731193001316999640fabe93b2f557 cmake-3.5.2.zip +3f7a5b46009de2ed1a5444ec1b54745a4dfd0d267ba9c027d054dce278ed2abd cmake-3.6.0-Darwin-x86_64.dmg +4b1acbf9cb5b83c0eee39ee15055d5fba60207f06533d2a436f6923b54702c90 cmake-3.6.0-Darwin-x86_64.tar.Z +195db78ed916e04237de4e2ba063cda384214f1f4a0bd1a37c0fafa3da44eca2 cmake-3.6.0-Darwin-x86_64.tar.gz +10d4758cd1b2ac807d1108e65396a25b5b114b82d9aa02a46557ff4aad229f3c cmake-3.6.0-Linux-i386.sh +726b27df079445555f5d750c20db18207a7f2f77f8a38d4f2b886405dc284b25 cmake-3.6.0-Linux-i386.tar.Z +20fcddb0c888615b3a6663cd1ce5a04aebdecba1ab13a13cfeec70661f7143c3 cmake-3.6.0-Linux-i386.tar.gz +29c5085fba1128587c0a0b6e9a90d882401e74780de2660544b0e1c1fe22fe31 cmake-3.6.0-Linux-x86_64.sh +bf57e4dd7e0d46b39a57db96689a9a463cb154a9e290114606cd8a7e299360ea cmake-3.6.0-Linux-x86_64.tar.Z +46cd2b5f72895fd6aeef94c7c159dbec9e7db89ad7d873b4b7843be86cf55505 cmake-3.6.0-Linux-x86_64.tar.gz +e147960cb02aaef00876ff613e7004bcabb3878812d8c44dbeb70d6e0320f214 cmake-3.6.0-win32-x86.msi +2ef3b4103ebc3a5d3e489f7ac77795387b5e6e080fee90549cdec31d9ef429f7 cmake-3.6.0-win32-x86.zip +ab491f3d925a2251be04752d16a81bcaf90b88abb48ac8b5760fb090d540b11f cmake-3.6.0-win64-x64.msi +24c6fe91991ece9deae9a926bc925ec0b9d5702ffe174ed85062dc5a6fccf0f4 cmake-3.6.0-win64-x64.zip +09bdf31cd38c57f7815221d28da99267fd2c19c71920901217c715bbd38f62c7 cmake-3.6.0.tar.Z +fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670 cmake-3.6.0.tar.gz +9e170d01370018adf7eec4eade875d6a9b19289ab0721716ce639bdecc486b8c cmake-3.6.0.zip ++++++ cmake-3.5.2.tar.gz -> cmake-3.6.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/cmake/cmake-3.5.2.tar.gz /work/SRC/openSUSE:Factory/.cmake.new/cmake-3.6.0.tar.gz differ: char 5, line 1 ++++++ cmake-version-in-generated-files.patch ++++++ --- /var/tmp/diff_new_pack.9ij466/_old 2016-07-18 21:19:40.000000000 +0200 +++ /var/tmp/diff_new_pack.9ij466/_new 2016-07-18 21:19:40.000000000 +0200 @@ -1,95 +1,42 @@ -Enclosing the cmake version will cause a republish of generated files +From c376c5bca204a689b5bcfec88291b8bc7f226e7f Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Christoph=20Gr=C3=BCninger?= <f...@grueninger.de> +Date: Sun, 10 Jul 2016 15:35:24 +0200 +Subject: [PATCH] Do not place CMake version in export files +Files generated by `install(EXPORT)` and `export_library_dependencies()` +may be installed with packages and consumed by dependents. In order to +avoid re-building dependents only because the version of CMake changed, +drop the CMake version from the export file content. --- - Source/CPack/IFW/cmCPackIFWGenerator.cxx | 2 +- Source/cmExportFileGenerator.cxx | 2 +- Source/cmExportLibraryDependenciesCommand.cxx | 2 +- - Source/cmGlobalGhsMultiGenerator.cxx | 4 ++-- - Source/cmGlobalNinjaGenerator.cxx | 4 +--- - Source/cmLocalUnixMakefileGenerator3.cxx | 4 +--- - 6 files changed, 7 insertions(+), 11 deletions(-) + 2 files changed, 2 insertions(+), 2 deletions(-) -Index: cmake-3.4.3/Source/CPack/IFW/cmCPackIFWGenerator.cxx -=================================================================== ---- cmake-3.4.3.orig/Source/CPack/IFW/cmCPackIFWGenerator.cxx -+++ cmake-3.4.3/Source/CPack/IFW/cmCPackIFWGenerator.cxx -@@ -614,7 +614,7 @@ cmCPackIFWPackage* cmCPackIFWGenerator:: - //---------------------------------------------------------------------------- - void cmCPackIFWGenerator::WriteGeneratedByToStrim(cmGeneratedFileStream &xout) - { -- xout << "<!-- Generated by CPack " << CMake_VERSION << " IFW generator " -+ xout << "<!-- Generated by CPack IFW generator " - << "for QtIFW "; - if(IsVersionLess("2.0")) - { -Index: cmake-3.4.3/Source/cmExportFileGenerator.cxx -=================================================================== ---- cmake-3.4.3.orig/Source/cmExportFileGenerator.cxx -+++ cmake-3.4.3/Source/cmExportFileGenerator.cxx -@@ -107,7 +107,7 @@ bool cmExportFileGenerator::GenerateImpo - std::ostream& os = *foutPtr; +diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx +index d93e406..e00af5e 100644 +--- a/Source/cmExportFileGenerator.cxx ++++ b/Source/cmExportFileGenerator.cxx +@@ -93,7 +93,7 @@ bool cmExportFileGenerator::GenerateImportFile() // Protect that file against use with older CMake versions. + /* clang-format off */ - os << "# Generated by CMake " << cmVersion::GetCMakeVersion() << "\n\n"; + os << "# Generated by CMake\n\n"; os << "if(\"${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}\" LESS 2.5)\n" << " message(FATAL_ERROR \"CMake >= 2.6.0 required\")\n" << "endif()\n"; -Index: cmake-3.4.3/Source/cmExportLibraryDependenciesCommand.cxx -=================================================================== ---- cmake-3.4.3.orig/Source/cmExportLibraryDependenciesCommand.cxx -+++ cmake-3.4.3/Source/cmExportLibraryDependenciesCommand.cxx -@@ -168,7 +168,7 @@ void cmExportLibraryDependenciesCommand: +diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx +index c8272cb..b422a2c 100644 +--- a/Source/cmExportLibraryDependenciesCommand.cxx ++++ b/Source/cmExportLibraryDependenciesCommand.cxx +@@ -152,7 +152,7 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const // versions. const char* vertest = "\"${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}\" GREATER 2.4"; -- fout << "# Generated by CMake " << cmVersion::GetCMakeVersion() << "\n\n"; +- fout << "# Generated by CMake " << cmVersion::GetCMakeVersion() << "\n\n"; + fout << "# Generated by CMake\n\n"; fout << "if(" << vertest << ")\n"; fout << " # Information for CMake 2.6 and above.\n"; - for(std::map<std::string, std::string>::const_iterator -Index: cmake-3.4.3/Source/cmGlobalGhsMultiGenerator.cxx -=================================================================== ---- cmake-3.4.3.orig/Source/cmGlobalGhsMultiGenerator.cxx -+++ cmake-3.4.3/Source/cmGlobalGhsMultiGenerator.cxx -@@ -365,8 +365,8 @@ void cmGlobalGhsMultiGenerator::WriteDis - (*os) << "#" << std::endl - << "# CMAKE generated file: DO NOT EDIT!" << std::endl - << "# Generated by \"" << GetActualName() << "\"" -- << " Generator, CMake Version " << cmVersion::GetMajorVersion() << "." -- << cmVersion::GetMinorVersion() << std::endl -+ << " Generator, CMake" -+ << std::endl - << "#" << std::endl; - } - -Index: cmake-3.4.3/Source/cmGlobalNinjaGenerator.cxx -=================================================================== ---- cmake-3.4.3.orig/Source/cmGlobalNinjaGenerator.cxx -+++ cmake-3.4.3/Source/cmGlobalNinjaGenerator.cxx -@@ -903,9 +903,7 @@ - os - << "# CMAKE generated file: DO NOT EDIT!\n" - << "# Generated by \"" << this->GetName() << "\"" -- << " Generator, CMake Version " -- << cmVersion::GetMajorVersion() << "." -- << cmVersion::GetMinorVersion() << "\n\n"; -+ << " Generator, CMake\n\n"; - } - - void cmGlobalNinjaGenerator::AddDependencyToAll(cmGeneratorTarget* target) -Index: cmake-3.4.3/Source/cmLocalUnixMakefileGenerator3.cxx -=================================================================== ---- cmake-3.4.3.orig/Source/cmLocalUnixMakefileGenerator3.cxx -+++ cmake-3.4.3/Source/cmLocalUnixMakefileGenerator3.cxx -@@ -2111,9 +2111,7 @@ void cmLocalUnixMakefileGenerator3::Writ - os - << "# CMAKE generated file: DO NOT EDIT!\n" - << "# Generated by \"" << this->GlobalGenerator->GetName() << "\"" -- << " Generator, CMake Version " -- << cmVersion::GetMajorVersion() << "." -- << cmVersion::GetMinorVersion() << "\n\n"; -+ << " Generator, CMake\n\n"; - } - - //---------------------------------------------------------------------------- + for (std::map<std::string, std::string>::const_iterator i = +-- +1.7.10.4 ++++++ cmake.macros ++++++ --- /var/tmp/diff_new_pack.9ij466/_old 2016-07-18 21:19:40.000000000 +0200 +++ /var/tmp/diff_new_pack.9ij466/_new 2016-07-18 21:19:40.000000000 +0200 @@ -18,12 +18,12 @@ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ -DCMAKE_BUILD_TYPE=None \\\ - -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -fPIE -DNDEBUG" \\\ - -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -fPIE -DNDEBUG" \\\ - -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -fPIE -DNDEBUG" \\\ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \\\ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \\\ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \\\ + -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\ + -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\ + -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \\\ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ %if "%{?_lib}" == "lib64" \ -DLIB_SUFFIX=64 \\\ %endif \
