From d786652a21f719a05f45c0eafe142dfb38fb39dac8b88f9588287cef683028ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 2 Nov 2012 14:31:52 +0000 Subject: [PATCH 1/2] Accepting request 139994 from home:cgiboudeaux:branches:devel:tools:building Update to 2.8.10 OBS-URL: https://build.opensuse.org/request/show/139994 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=98 --- cmake-2.8.10.tar.gz | 3 +++ cmake-2.8.9.tar.gz | 3 --- cmake-disable-builtin-chrpath.diff | 8 +++----- cmake-fix-ruby-test.patch | 14 ++++++-------- cmake-gui.changes | 7 +++++++ cmake-gui.spec | 13 ++++++------- cmake.changes | 7 +++++++ cmake.spec | 18 +++++++++--------- 8 files changed, 41 insertions(+), 32 deletions(-) create mode 100644 cmake-2.8.10.tar.gz delete mode 100644 cmake-2.8.9.tar.gz diff --git a/cmake-2.8.10.tar.gz b/cmake-2.8.10.tar.gz new file mode 100644 index 0000000..d71436d --- /dev/null +++ b/cmake-2.8.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a18b721c547c2ce2ea9378f2687caca4398fc348982ede799e96b26924cc9e04 +size 5766728 diff --git a/cmake-2.8.9.tar.gz b/cmake-2.8.9.tar.gz deleted file mode 100644 index 5bcdfde..0000000 --- a/cmake-2.8.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9 -size 5658837 diff --git a/cmake-disable-builtin-chrpath.diff b/cmake-disable-builtin-chrpath.diff index 93b12ac..1b01a2f 100644 --- a/cmake-disable-builtin-chrpath.diff +++ b/cmake-disable-builtin-chrpath.diff @@ -1,8 +1,6 @@ -Index: Source/cmTarget.cxx -=================================================================== ---- Source/cmTarget.cxx.orig 2010-06-28 17:15:59.000000000 +0200 -+++ Source/cmTarget.cxx 2010-07-20 22:27:13.000000000 +0200 -@@ -3785,7 +3785,7 @@ bool cmTarget::IsChrpathUsed(const char* +--- Source/cmTarget.cxx.orig 2012-11-02 14:39:11.177148019 +0100 ++++ Source/cmTarget.cxx 2012-11-02 14:39:21.777018932 +0100 +@@ -4130,7 +4130,7 @@ } // Allow the user to disable builtin chrpath explicitly. diff --git a/cmake-fix-ruby-test.patch b/cmake-fix-ruby-test.patch index 6be05c9..bc9ab6d 100644 --- a/cmake-fix-ruby-test.patch +++ b/cmake-fix-ruby-test.patch @@ -1,13 +1,11 @@ -Index: cmake-2.8.8/Modules/FindRuby.cmake -=================================================================== ---- cmake-2.8.8.orig/Modules/FindRuby.cmake 2012-04-18 20:10:54.000000000 +0200 -+++ cmake-2.8.8/Modules/FindRuby.cmake 2012-05-14 15:42:52.137253084 +0200 -@@ -93,7 +93,7 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_VERSIO +--- Modules/FindRuby.cmake.orig 2012-11-02 14:34:25.497624983 +0100 ++++ Modules/FindRuby.cmake 2012-11-02 14:36:22.893205108 +0100 +@@ -93,7 +93,7 @@ _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) # vendor_ruby available ? -- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" -+ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless Config::CONFIG['vendorarchdir'].nil?" +- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" ++ execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless Config::CONFIG['vendorarchdir'].nil?" OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) - IF(RUBY_HAS_VENDOR_RUBY) + if(RUBY_HAS_VENDOR_RUBY) diff --git a/cmake-gui.changes b/cmake-gui.changes index 3139098..382a81f 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 2 13:28:33 UTC 2012 - cgiboudeaux@gmx.com + +- Update to 2.8.10 + * See /usr/share/doc/packages/cmake/Changelog for changes +- Minor spec cleanup + ------------------------------------------------------------------- Tue Aug 14 09:07:10 UTC 2012 - cgiboudeaux@gmx.com diff --git a/cmake-gui.spec b/cmake-gui.spec index b33e077..a849825 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -17,7 +17,7 @@ Name: cmake-gui -Version: 2.8.9 +Version: 2.8.10 Release: 0 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz @@ -27,10 +27,11 @@ License: BSD-3-Clause Group: Development/Tools/Building BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} -BuildRequires: libexpat-devel -%if 0%{?suse_version} > 1110 BuildRequires: fdupes +%if 0%{?sles_version} != 10 +BuildRequires: libarchive-devel %endif +BuildRequires: libexpat-devel %else BuildRequires: expat-devel %endif @@ -40,9 +41,7 @@ BuildRequires: libqt4-devel BuildRequires: openssl-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel -%if 0%{?suse_version} > 1130 -BuildRequires: libarchive-devel -%endif + Requires: cmake %description @@ -62,7 +61,7 @@ export CFLAGS="$CXXFLAGS" --datadir=/share/cmake \ --docdir=/share/doc/packages/cmake \ --mandir=/share/man \ -%if 0%{?suse_version} > 1130 +%if 0%{?suse_version} && !0%{?sles_version} --system-libs \ %else --system-curl \ diff --git a/cmake.changes b/cmake.changes index 2ba53e2..c577d66 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 2 13:28:27 UTC 2012 - cgiboudeaux@gmx.com + +- Update to 2.8.10 + * See /usr/share/doc/packages/cmake/Changelog for changes +- Minor spec cleanup + ------------------------------------------------------------------- Tue Aug 14 09:07:10 UTC 2012 - cgiboudeaux@gmx.com diff --git a/cmake.spec b/cmake.spec index 4c6da2c..09602bc 100644 --- a/cmake.spec +++ b/cmake.spec @@ -17,7 +17,7 @@ Name: cmake -Version: 2.8.9 +Version: 2.8.10 Release: 0 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz @@ -28,10 +28,11 @@ License: BSD-3-Clause Group: Development/Tools/Building BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} -BuildRequires: libexpat-devel -%if 0%{?suse_version} > 1110 BuildRequires: fdupes +%if 0%{?sles_version} != 10 +BuildRequires: libarchive-devel %endif +BuildRequires: libexpat-devel %else BuildRequires: expat-devel %endif @@ -40,9 +41,7 @@ BuildRequires: gcc-c++ BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: zlib-devel -%if 0%{?suse_version} > 1130 -BuildRequires: libarchive-devel -%endif + Requires: make %description @@ -51,7 +50,7 @@ CMake is a cross-platform, open-source make system %prep %setup -q %patch1 -%patch2 -p1 +%patch2 %build export CXXFLAGS="$RPM_OPT_FLAGS" @@ -61,7 +60,7 @@ export CFLAGS="$CXXFLAGS" --datadir=/share/%{name} \ --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ -%if 0%{?suse_version} > 1130 +%if 0%{?suse_version} && !0%{?sles_version} --system-libs \ %else --system-curl \ @@ -79,7 +78,8 @@ make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_libdir}/cmake find %{buildroot}/usr/share/cmake -type f -print0 | xargs -0 chmod 644 cp ChangeLog.manual %{buildroot}/usr/share/doc/packages/%{name}/Changelog -%if 0%{?suse_version} > 1110 + +%if 0%{?suse_version} %fdupes %buildroot/usr/share/cmake %endif From ed4a6a8513647301a1043d5b79b00a4dd417542e814534b183d25fe03fa6bb3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 8 Nov 2012 05:17:00 +0000 Subject: [PATCH 2/2] Accepting request 140596 from home:cgiboudeaux:branches:devel:tools:building Update to 2.8.10.1 Improve the 2.8.10 changelog OBS-URL: https://build.opensuse.org/request/show/140596 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=99 --- cmake-2.8.10.1.tar.gz | 3 +++ cmake-2.8.10.tar.gz | 3 --- cmake-gui.changes | 18 ++++++++++++++++-- cmake-gui.spec | 2 +- cmake.changes | 16 +++++++++++++++- cmake.spec | 2 +- 6 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 cmake-2.8.10.1.tar.gz delete mode 100644 cmake-2.8.10.tar.gz diff --git a/cmake-2.8.10.1.tar.gz b/cmake-2.8.10.1.tar.gz new file mode 100644 index 0000000..c51fcb4 --- /dev/null +++ b/cmake-2.8.10.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbfb9d609e8fdb6f0947993246c11e2ee5d47944d6e7bd9314463b31e420e6e0 +size 5767574 diff --git a/cmake-2.8.10.tar.gz b/cmake-2.8.10.tar.gz deleted file mode 100644 index d71436d..0000000 --- a/cmake-2.8.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a18b721c547c2ce2ea9378f2687caca4398fc348982ede799e96b26924cc9e04 -size 5766728 diff --git a/cmake-gui.changes b/cmake-gui.changes index 382a81f..fdc770c 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,8 +1,22 @@ ------------------------------------------------------------------- -Fri Nov 2 13:28:33 UTC 2012 - cgiboudeaux@gmx.com +Wed Nov 7 21:24:45 UTC 2012 - cgiboudeaux@gmx.com + +- Update to 2.8.10.1 This is a bugfix release + * Fix kitware#0013651: FindSDL.cmake is broken + * Fix kitware#0013638: ./configure reports Copyright 2000-2011 + Complete changelog: http://public.kitware.com/Bug/changelog_page.php?version_id=105 + +------------------------------------------------------------------- +Fri Nov 2 13:28:27 UTC 2012 - cgiboudeaux@gmx.com - Update to 2.8.10 - * See /usr/share/doc/packages/cmake/Changelog for changes + * file(DOWNLOAD now handles "https" URLs -- the pre-built binaries available from Kitware link to OpenSSL + * Automoc: fix kitware#13572: issue with symbolic links + * Uniform compiler "id" and version number variables available for nearly all known compilers and platforms + * New way to arrange exported targets that depend on other targets into "export sets" + * New generator expressions + * Generator expressions available in more contexts, namely in the INCLUDE_DIRECTORIES and COMPILE_DEFINITIONS target properties + See /usr/share/doc/packages/cmake/Changelog for the complete changelog - Minor spec cleanup ------------------------------------------------------------------- diff --git a/cmake-gui.spec b/cmake-gui.spec index a849825..c6bd47b 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -17,7 +17,7 @@ Name: cmake-gui -Version: 2.8.10 +Version: 2.8.10.1 Release: 0 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz diff --git a/cmake.changes b/cmake.changes index c577d66..8f6caab 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,8 +1,22 @@ +------------------------------------------------------------------- +Wed Nov 7 21:24:45 UTC 2012 - cgiboudeaux@gmx.com + +- Update to 2.8.10.1 This is a bugfix release + * Fix kitware#0013651: FindSDL.cmake is broken + * Fix kitware#0013638: ./configure reports Copyright 2000-2011 + Complete changelog: http://public.kitware.com/Bug/changelog_page.php?version_id=105 + ------------------------------------------------------------------- Fri Nov 2 13:28:27 UTC 2012 - cgiboudeaux@gmx.com - Update to 2.8.10 - * See /usr/share/doc/packages/cmake/Changelog for changes + * file(DOWNLOAD now handles "https" URLs -- the pre-built binaries available from Kitware link to OpenSSL + * Automoc: fix kitware#13572: issue with symbolic links + * Uniform compiler "id" and version number variables available for nearly all known compilers and platforms + * New way to arrange exported targets that depend on other targets into "export sets" + * New generator expressions + * Generator expressions available in more contexts, namely in the INCLUDE_DIRECTORIES and COMPILE_DEFINITIONS target properties + See /usr/share/doc/packages/cmake/Changelog for the complete changelog - Minor spec cleanup ------------------------------------------------------------------- diff --git a/cmake.spec b/cmake.spec index 09602bc..eced0d8 100644 --- a/cmake.spec +++ b/cmake.spec @@ -17,7 +17,7 @@ Name: cmake -Version: 2.8.10 +Version: 2.8.10.1 Release: 0 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz