Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2016-03-01 09:35:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-11 12:36:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2016-03-01 09:35:24.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 18 09:00:40 UTC 2016 - [email protected] + +- Remove cmake version from generated files + cmake-version-in-generated-files.patch + +------------------------------------------------------------------- cmake.changes: same change New: ---- cmake-version-in-generated-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.Z24yKR/_old 2016-03-01 09:35:26.000000000 +0100 +++ /var/tmp/diff_new_pack.Z24yKR/_new 2016-03-01 09:35:26.000000000 +0100 @@ -31,6 +31,8 @@ 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 +Patch6: cmake-version-in-generated-files.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -73,6 +75,7 @@ %setup -q -n cmake-%{version} %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build EXTRA_FLAGS="--qt-gui" ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.Z24yKR/_old 2016-03-01 09:35:26.000000000 +0100 +++ /var/tmp/diff_new_pack.Z24yKR/_new 2016-03-01 09:35:26.000000000 +0100 @@ -35,6 +35,8 @@ 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 +Patch6: cmake-version-in-generated-files.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -64,6 +66,7 @@ %patch2 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build export CXXFLAGS="%{optflags}" ++++++ cmake-version-in-generated-files.patch ++++++ Enclosing the cmake version will cause a republish of generated files --- 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(-) 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; // Protect that file against use with older CMake versions. - 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: // 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\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 @@ -883,9 +883,7 @@ void cmGlobalNinjaGenerator::WriteDiscla 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(cmTarget* 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"; } //----------------------------------------------------------------------------
