From ad5557f8e26d77169823f26b9414c425250138484aadcb34941491b5ac13c5cc Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 16 Nov 2016 12:51:15 +0000 Subject: [PATCH 1/5] Accepting request 440576 from home:mathletic:branches:devel:tools:building Update to CMake 3.7 OBS-URL: https://build.opensuse.org/request/show/440576 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=273 --- cmake-3.6.2-SHA-256.txt | 16 ---------- cmake-3.6.2-SHA-256.txt.asc | 17 ----------- cmake-3.6.2.tar.gz | 3 -- cmake-3.7.0-SHA-256.txt | 11 +++++++ cmake-3.7.0-SHA-256.txt.asc | 16 ++++++++++ cmake-3.7.0.tar.gz | 3 ++ cmake-fix-ruby-test.patch | 6 ++-- cmake-gui.changes | 7 +++++ cmake-gui.spec | 11 +++---- cmake-version-in-generated-files.patch | 42 -------------------------- cmake.changes | 22 ++++++++++++++ cmake.spec | 14 ++++----- 12 files changed, 72 insertions(+), 96 deletions(-) delete mode 100644 cmake-3.6.2-SHA-256.txt delete mode 100644 cmake-3.6.2-SHA-256.txt.asc delete mode 100644 cmake-3.6.2.tar.gz create mode 100644 cmake-3.7.0-SHA-256.txt create mode 100644 cmake-3.7.0-SHA-256.txt.asc create mode 100644 cmake-3.7.0.tar.gz delete mode 100644 cmake-version-in-generated-files.patch diff --git a/cmake-3.6.2-SHA-256.txt b/cmake-3.6.2-SHA-256.txt deleted file mode 100644 index e1e7447..0000000 --- a/cmake-3.6.2-SHA-256.txt +++ /dev/null @@ -1,16 +0,0 @@ -09f5bc7493bcd2b0e856295a999cf0d6946050dc7ef9c753e79ddd53f00de23a cmake-3.6.2-Darwin-x86_64.dmg -3875872569f050b674db36793c6e6e2264bd17eaa6c31a700038f48bc1eefcdf cmake-3.6.2-Darwin-x86_64.tar.Z -e3ac82120298095245c9948eb11ddfb4b552f5f056ce0ec3c82e3f3a15c53752 cmake-3.6.2-Darwin-x86_64.tar.gz -222f0c8cc11aec1fd5145a7e467422e9c79065e6bbaa4e0ab7b291b48d8c715a cmake-3.6.2-Linux-i386.sh -2d9dead209e2ef07b029734ed8dbabb683fb3dc080755f1df2ed00cadd978def cmake-3.6.2-Linux-i386.tar.Z -26c2c86ddd54fd143594b6801a677f0a75bbacf7bb006a274d2854d0004f2749 cmake-3.6.2-Linux-i386.tar.gz -f4b8905b90feed3bfa1fac23ef68b76d0f6bbc0374c6048183c7ac536d3013d4 cmake-3.6.2-Linux-x86_64.sh -f4131772a74fa81e450f6fa4ff0ce5a138c3bab72343d293504bd8f77addb169 cmake-3.6.2-Linux-x86_64.tar.Z -5df4b69d9e85093ae78b1070d5cb9f824ce0bdd02528948c3f6a740e240083e5 cmake-3.6.2-Linux-x86_64.tar.gz -3613a4f87eda8bcd5ffb17aaad22499dffff02939a3788e56708a3954868620e cmake-3.6.2-win32-x86.msi -613eec5a8b2e2c49826e0e8e18f516b6f2b481309ae55925d226ce8ab78b0fba cmake-3.6.2-win32-x86.zip -5eb7c09c23b13742161076401bb2f4edabd75ecafe8916c7a401532bc3794dd5 cmake-3.6.2-win64-x64.msi -61337a0528fc3902d7f2f7594959aa6aa48a52863dd2da335a0e248b5eb8acaf cmake-3.6.2-win64-x64.zip -3515b8d77772300d2c438b1320f4d772eb841fc59a2ab4f6d1dc5b12d160c5e0 cmake-3.6.2.tar.Z -189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346 cmake-3.6.2.tar.gz -ccf93db0527c35676ab74319bb3ef1ef4f5149d3b09aab1a58559143c1f4f673 cmake-3.6.2.zip diff --git a/cmake-3.6.2-SHA-256.txt.asc b/cmake-3.6.2-SHA-256.txt.asc deleted file mode 100644 index 868c7fa..0000000 --- a/cmake-3.6.2-SHA-256.txt.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAABCAAGBQJX0DT3AAoJEC0s7xA0khaECTwP/1nmbMuO3SfSsqWVXEeZRvqS -dYhPnWcgKKqV7bXFgXJIXRVaCL0qz6OkErTJJZnSj8cYOOKSB+RX3BZ6E14cWm/Y -eob71JJ79HcBIlA4tfDOGDfgUrLmhKarVUO+eKSwG1eQmqd7RAhJ5L1zCKZh2cNz -mqG/NsjVYVNvyhfHT+H0Sp52NX3lN811hnW6vj4JybZg3xJM7PkRIG2fX3PfiA8p -4XwMkjC3HNR89zfrlSOuq/pUGl+3o4R5xfN9QfQCv6foxDsqteiju8sWnaB/phtj -GmPt88n/JTH5KBO91vyNyhSKpmS4gkedhIzbqleD9LmyJQXxg1L255tCa5BWlxmV -BQISNI6YYnm5Anj4CegFOZEkLJKa8eCTf1WRI7Py0zBfuwo0FkVTlIKKGR16o0uf -2+TDDUbTPMea3PQk2ERcOHMVlRhW9e7aOPkxyxRyJhrn4CITgUG4Aj9oXvPCZKJl -aZCz1WFt5zmOSscIVT+QAjDOzQGOIMNQka/vHW9reINEHx0J503axZJ3493R6FSQ -EQBpa7y8vfqLclAX8v6a/5rfujz2O+D8e0y9Rjzpu92b0RFueGcGjNYjbR6Zcowq -wFVgR+OXs0cXbIdcvAausWO0GLxns0OK+x/imjg9jlQHwbjPrM86QwuJaIP2TOVK -Fq4mzGkORDdKmrZtlDe/ -=/2Ng ------END PGP SIGNATURE----- diff --git a/cmake-3.6.2.tar.gz b/cmake-3.6.2.tar.gz deleted file mode 100644 index 14af689..0000000 --- a/cmake-3.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346 -size 6920069 diff --git a/cmake-3.7.0-SHA-256.txt b/cmake-3.7.0-SHA-256.txt new file mode 100644 index 0000000..a66ca50 --- /dev/null +++ b/cmake-3.7.0-SHA-256.txt @@ -0,0 +1,11 @@ +c5ffa392304bec8fcf08eecfce238356568c792686d839d81cf027f9ab19b312 cmake-3.7.0-Darwin-x86_64.dmg +38ea6955fb8c120eada1ff7985389b61ad5ca60a90a51025024638d92bfb43cf cmake-3.7.0-Darwin-x86_64.tar.gz +e11c0128a9538909e6527df3ac92d9b6620e2c57040be34d72de40a7ad95da47 cmake-3.7.0-Linux-x86_64.sh +e075f63e6a9104b1c3d11666ae9546bc8812f7e791a49c4ce11effc063141b2a cmake-3.7.0-Linux-x86_64.tar.gz +c657a6b3c296ed321a9440c5681b8fb1f17a6fb3ea0be1f91c3c81a730992ad9 cmake-3.7.0-win32-x86.msi +26dc1e0c4e9ba6021ed171463f7c99b241c1c8f8ada4ea652f031ff835c6b928 cmake-3.7.0-win32-x86.zip +c56d59dc74e9baf3879c01bfbc6d999b4b37fab9771aae876bd5f47298ce2cc7 cmake-3.7.0-win64-x64.msi +11a2f8c4d52c5dbb6708a80f54d782fdfb2f5cd96c091ac51500c5607534e660 cmake-3.7.0-win64-x64.zip +a42db3ea60f90454ef7e49e1a081f8c444de806c09fd8f95aaa06727e5dc4675 cmake-3.7.0.tar.Z +ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 cmake-3.7.0.tar.gz +e147c8f95b31b8cb0ef903b39ac21c9f07faf1c2131f7ec54a55e664d70224e7 cmake-3.7.0.zip diff --git a/cmake-3.7.0-SHA-256.txt.asc b/cmake-3.7.0-SHA-256.txt.asc new file mode 100644 index 0000000..0b2278c --- /dev/null +++ b/cmake-3.7.0-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCAAGBQJYJeEMAAoJEC0s7xA0khaEQzEP/RwENAul+QGTKIVdVCN/cA+n +W1gdBjLBabn6Q3GXXwh4TbWohkFsT7XxoX3tPU3QpO/KNPmqHFTZo+BFLJDqJFGw +r+15VUZ9jyrsRjpzntyYJkkFoOsr+9ZINJkbnc5bt7Ss380Titdy1lEtqbOulZtH +c0TwD89cfPxIJQ9T6H0knEnnnQ87Wj0na0iilbIH1z6wteo3I5/uZAgYnDnTtTzf +SXBRrnUsXG1welIIraCcWGlp6wmbmkLXfMDgQ3tx3ww5o/zO8GRA9wpBJx/feHZV +fDQIGQvTPZ5V3lVT+BHn1kBkFI7dT9hKFAaiKbFn4Hq0rqRzmmqKU50KCbAcaio1 +vDexBuTkllPmDUpF9L713murP7D3S/RHpDgU1o6su3P2U/Cm3wKvid6zn4A8BLHA +mgUsi5Ky5ofye0Q83pkBNUj8mC4jGb/QW+kwwtMTate+zE5Iw/BqpFMms3u2ovfV +g84/8bMhAUZjBJAHbN2+EFHTRZ65OEih5mCvhnOcs+r1pzknGrKSl3cOsfA59Pzr +Jk/JB1hov0ulRlEYE33p3IYaYNgaJc2wb5km1pKOS9v+izj4qpB6Sq3KUVz0nxze +DCk9eGZQfCEcWvfXYl5OQY/lsf3yTMz1gdtXix1Nk3KGT45QVyjq911ClSCR9FCF +CB3utSpOrmrnnOPfARsT +=re2Q +-----END PGP SIGNATURE----- diff --git a/cmake-3.7.0.tar.gz b/cmake-3.7.0.tar.gz new file mode 100644 index 0000000..ce3520b --- /dev/null +++ b/cmake-3.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 +size 7359368 diff --git a/cmake-fix-ruby-test.patch b/cmake-fix-ruby-test.patch index b2f9f1c..750c496 100644 --- a/cmake-fix-ruby-test.patch +++ b/cmake-fix-ruby-test.patch @@ -1,6 +1,6 @@ ---- cmake-3.0.0-rc2.orig/Modules/FindRuby.cmake 2014-03-17 19:18:29.000000000 +0100 -+++ cmake-3.0.0-rc2/Modules/FindRuby.cmake 2014-03-20 02:44:47.693351223 +0100 -@@ -118,7 +118,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO +--- a/Modules/FindRuby.cmake 2016-11-15 23:00:54.832228081 +0100 ++++ b/Modules/FindRuby.cmake 2016-11-15 23:01:55.201700739 +0100 +@@ -107,7 +107,7 @@ _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) # vendor_ruby available ? diff --git a/cmake-gui.changes b/cmake-gui.changes index 6df9dff..bde636b 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 16 00:03:32 UTC 2016 - foss@grueninger.de + +- update to CMake 3.7.0 + no changes specific to CMake-GUI for Linux + full changelog: https://blog.kitware.com/cmake-3-7-0-available-for-download/ + ------------------------------------------------------------------- Tue Sep 13 21:29:33 UTC 2016 - foss@grueninger.de diff --git a/cmake-gui.spec b/cmake-gui.spec index 031ed70..bcfadc8 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -17,22 +17,20 @@ Name: cmake-gui -Version: 3.6.2 +Version: 3.7.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.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 +Source0: http://www.cmake.org/files/v3.7cmake-%{version}.tar.gz +Source5: http://www.cmake.org/files/v3.7cmake-%{version}-SHA-256.txt +Source6: http://www.cmake.org/files/v3.7cmake-%{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-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 BuildRequires: gcc-c++ @@ -72,7 +70,6 @@ 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 export CFLAGS="%{optflags}" diff --git a/cmake-version-in-generated-files.patch b/cmake-version-in-generated-files.patch deleted file mode 100644 index 64a72fd..0000000 --- a/cmake-version-in-generated-files.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c376c5bca204a689b5bcfec88291b8bc7f226e7f Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Christoph=20Gr=C3=BCninger?= -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/cmExportFileGenerator.cxx | 2 +- - Source/cmExportLibraryDependenciesCommand.cxx | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -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"; -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\n\n"; - fout << "if(" << vertest << ")\n"; - fout << " # Information for CMake 2.6 and above.\n"; - for (std::map::const_iterator i = --- -1.7.10.4 diff --git a/cmake.changes b/cmake.changes index be9d6c8..df3e29c 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Nov 15 23:42:45 UTC 2016 - foss@grueninger.de + +- update to CMake 3.7.0 + * CMake now supports Cross Compiling for Android with simple + toolchain files. + * The Ninja generator learned to conditionally support Fortran + when using a ninja tool that has the necessary features. + * The try_compile() command source file signature now honors + configuration-specific flags in the generated test project. + * CTest now supports test fixtures through the new FIXTURES_SETUP, + FIXTURES_CLEANUP and FIXTURES_REQUIRED test properties. When using + regular expressions or –rerun-failed to limit the tests to be run, + a fixture’s setup and cleanup tests will automatically be added to + the execution set if any test requires that fixture. + * Vim support files cmake-indent.vim, cmake-syntax.vim, and + cmake-help.vim have been removed in favor of the files now + provided from the vim-cmake-syntax project. + full changelog: https://blog.kitware.com/cmake-3-7-0-available-for-download/ +- drop patch cmake-version-in-generated-files.patch as it is part of 3.7.0 +- update patch cmake-fix-ruby-test.patch + ------------------------------------------------------------------- Tue Nov 15 08:23:14 UTC 2016 - alarrosa@suse.com diff --git a/cmake.spec b/cmake.spec index bf1b178..c501302 100644 --- a/cmake.spec +++ b/cmake.spec @@ -17,33 +17,32 @@ Name: cmake -Version: 3.6.2 +Version: 3.7.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.6/%{name}-%{version}.tar.gz +Source0: http://www.cmake.org/files/v3.7/%{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.6/%{name}-%{version}-SHA-256.txt -Source6: http://www.cmake.org/files/v3.6/%{name}-%{version}-SHA-256.txt.asc +Source5: http://www.cmake.org/files/v3.7/%{name}-%{version}-SHA-256.txt +Source6: http://www.cmake.org/files/v3.7/%{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-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 BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libbz2-devel BuildRequires: libexpat-devel +BuildRequires: libuv-devel BuildRequires: ncurses-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 @@ -69,7 +68,6 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOU %patch2 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %build export CFLAGS="%{optflags}" @@ -107,7 +105,7 @@ install -p -m0755 -D %{SOURCE4} %{buildroot}%{_libexecdir}/rpm/cmake.prov # if any other app installs then this test is bogus # suse specific brp-25-symlink cramps the symlinks, hence the CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne) fail ./bin/ctest --force-new-ctest-process --output-on-failure %{?_smp_mflags} \ - -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2|CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne))" + -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2|CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne)|CPack_RPM)" %files %defattr(-,root,root) From 7403450a0e4231a48290e0c20ab064f412052c7820e1f2803402a28a6331d3c0 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 17 Nov 2016 17:49:04 +0000 Subject: [PATCH 2/5] Accepting request 440698 from home:mathletic:branches:devel:tools:building use libuv from CMake tarball if not Leap or Tumbleweed OBS-URL: https://build.opensuse.org/request/show/440698 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=274 --- cmake-gui.changes | 6 ++++++ cmake.changes | 6 ++++++ cmake.spec | 11 ++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cmake-gui.changes b/cmake-gui.changes index bde636b..77c4d78 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 16 14:28:58 UTC 2016 - foss@grueninger.de + +- use libuv which is shipped in CMake's tarball for older systems + that do not provide this lib on their own + ------------------------------------------------------------------- Wed Nov 16 00:03:32 UTC 2016 - foss@grueninger.de diff --git a/cmake.changes b/cmake.changes index df3e29c..f86138a 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 16 14:30:02 UTC 2016 - foss@grueninger.de + +- use libuv which is shipped in CMake's tarball for older systems + that do not provide this lib on their own + ------------------------------------------------------------------- Tue Nov 15 23:42:45 UTC 2016 - foss@grueninger.de diff --git a/cmake.spec b/cmake.spec index c501302..63b56f9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -42,7 +42,14 @@ BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libbz2-devel BuildRequires: libexpat-devel +# use libuv package for Leap and Tumbleweed +%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1320 && 0%{?is_opensuse})) BuildRequires: libuv-devel +%define use_system_uvlib ON +# otherwise use libuv part of CMake tarball +%else +%define use_system_uvlib OFF +%endif BuildRequires: ncurses-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 @@ -82,7 +89,9 @@ export CXXFLAGS="%{optflags}" --no-system-jsoncpp \ --parallel=0%{jobs} \ --verbose \ - --no-qt-gui + --no-qt-gui \ + -- \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib} make VERBOSE=1 %{?_smp_mflags} %install From bbdafe840f31ce2b19035d89621f4b97b3bcbc1155ebf2ce9783b9563cc1af4f Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 17 Nov 2016 18:00:42 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=275 --- cmake-gui.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake-gui.spec b/cmake-gui.spec index bcfadc8..a0a87cc 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -23,9 +23,9 @@ 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.7cmake-%{version}.tar.gz -Source5: http://www.cmake.org/files/v3.7cmake-%{version}-SHA-256.txt -Source6: http://www.cmake.org/files/v3.7cmake-%{version}-SHA-256.txt.asc +Source0: http://www.cmake.org/files/v3.7/cmake-%{version}.tar.gz +Source5: http://www.cmake.org/files/v3.7/cmake-%{version}-SHA-256.txt +Source6: http://www.cmake.org/files/v3.7/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 From 26a5163b0294c12259babb045e54c11977bae2c1951f79df13e6ad0c538de9b5 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Fri, 18 Nov 2016 03:18:32 +0000 Subject: [PATCH 4/5] Accepting request 440783 from home:simotek:branches:devel:tools:building Fix typo'd version number, apply the same libuv change to cmake-gui OBS-URL: https://build.opensuse.org/request/show/440783 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=276 --- cmake-gui.changes | 5 +++++ cmake-gui.spec | 13 ++++++++++++- cmake.spec | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cmake-gui.changes b/cmake-gui.changes index 77c4d78..583dff7 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 17 21:25:36 UTC 2016 - sflees@suse.de + +- Fix typo in libuv detection + ------------------------------------------------------------------- Wed Nov 16 14:28:58 UTC 2016 - foss@grueninger.de diff --git a/cmake-gui.spec b/cmake-gui.spec index a0a87cc..b60aac3 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -37,6 +37,14 @@ BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libexpat-devel BuildRequires: openssl-devel +# use libuv package for Leap and Tumbleweed +%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})) +BuildRequires: libuv-devel +%define use_system_uvlib ON +# otherwise use libuv part of CMake tarball +%else +%define use_system_uvlib OFF +%endif # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 #BuildRequires: pkgconfig(jsoncpp) @@ -84,7 +92,10 @@ export CXXFLAGS="%{optflags}" --system-libs \ --no-system-jsoncpp \ --parallel=0%{jobs} \ - --qt-gui + --verbose \ + --qt-gui \ + -- \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib} make VERBOSE=1 %{?_smp_mflags} %install diff --git a/cmake.spec b/cmake.spec index 63b56f9..7e33eca 100644 --- a/cmake.spec +++ b/cmake.spec @@ -43,7 +43,7 @@ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libbz2-devel BuildRequires: libexpat-devel # use libuv package for Leap and Tumbleweed -%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1320 && 0%{?is_opensuse})) +%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})) BuildRequires: libuv-devel %define use_system_uvlib ON # otherwise use libuv part of CMake tarball From 60f21c96d97f498d7711fbf12366dedcd4f7e01cf3fc0fc904f451a0da51b067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 18 Nov 2016 13:14:56 +0000 Subject: [PATCH 5/5] Accepting request 440807 from home:alarrosa:branches:devel:tools:building - Do not mix tabs and spaces in cmake.prov OBS-URL: https://build.opensuse.org/request/show/440807 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=277 --- cmake.changes | 5 +++++ cmake.prov | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/cmake.changes b/cmake.changes index f86138a..0fcb8eb 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 18 09:30:47 UTC 2016 - alarrosa@suse.com + +- Do not mix tabs and spaces in cmake.prov + ------------------------------------------------------------------- Wed Nov 16 14:30:02 UTC 2016 - foss@grueninger.de diff --git a/cmake.prov b/cmake.prov index eb7850c..1156923 100644 --- a/cmake.prov +++ b/cmake.prov @@ -32,8 +32,8 @@ class CMakeParser: paths = map(lambda x: x.rstrip(), filelist.readlines()) for path in paths: for (modulePath, cmakeModule, lowercase) in self.parseCmakeModuleConfig(path): - version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase) - + version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase) + if version: print("cmake(%s) = %s" % (cmakeModule, version)) else: @@ -46,15 +46,15 @@ class CMakeParser: result = [] for configFile in glob.glob("%s/*Config.cmake" % modulePath): - moduleName = configFile[len(modulePath) + 1:-len("Config.cmake")] - result.append( (modulePath, moduleName, False) ) + moduleName = configFile[len(modulePath) + 1:-len("Config.cmake")] + result.append( (modulePath, moduleName, False) ) for configFile in glob.glob("%s/*-config.cmake" % modulePath): - moduleName = configFile[len(modulePath) + 1:-len("-config.cmake")] + moduleName = configFile[len(modulePath) + 1:-len("-config.cmake")] if (modulePath, moduleName, False) not in result: - result.append( (modulePath, moduleName, True) ) + result.append( (modulePath, moduleName, True) ) - return result + return result def resolveCMakeModuleVersion(self, modulePath, cmakeModule, lowercase): versionFile = ("%s/%s-config-version.cmake" if lowercase else "%s/%sConfigVersion.cmake") % (modulePath, cmakeModule)