diff --git a/cmake-gui.changes b/cmake-gui.changes index 94ebbee..cc3c80c 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 18 09:00:40 UTC 2016 - olaf@aepfle.de + +- Remove cmake version from generated files + cmake-version-in-generated-files.patch + ------------------------------------------------------------------- Fri Jan 29 21:57:29 UTC 2016 - foss@grueninger.de diff --git a/cmake-gui.spec b/cmake-gui.spec index 08fc371..690e250 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -31,6 +31,8 @@ Source7: cmake.keyring 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 @@ echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOURC %setup -q -n cmake-%{version} %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build EXTRA_FLAGS="--qt-gui" diff --git a/cmake-version-in-generated-files.patch b/cmake-version-in-generated-files.patch new file mode 100644 index 0000000..73ae960 --- /dev/null +++ b/cmake-version-in-generated-files.patch @@ -0,0 +1,95 @@ +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 << "