From 997d60cf1b1e01f483f127e92b8c70a1f0da7cfc2411ded86a5bf22033a527da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 14 Aug 2012 10:26:12 +0000 Subject: [PATCH] Accepting request 130773 from home:cgiboudeaux:branches:devel:tools:building Update to 2.8.9 OBS-URL: https://build.opensuse.org/request/show/130773 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=95 --- cmake-2.8.8.tar.gz | 3 --- cmake-2.8.9.tar.gz | 3 +++ cmake-gui.changes | 6 ++++++ cmake-gui.spec | 2 +- cmake-pkgconfig.patch | 44 ------------------------------------------- cmake.changes | 6 ++++++ cmake.spec | 6 ++---- 7 files changed, 18 insertions(+), 52 deletions(-) delete mode 100644 cmake-2.8.8.tar.gz create mode 100644 cmake-2.8.9.tar.gz delete mode 100644 cmake-pkgconfig.patch diff --git a/cmake-2.8.8.tar.gz b/cmake-2.8.8.tar.gz deleted file mode 100644 index fd341bd..0000000 --- a/cmake-2.8.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46 -size 5691656 diff --git a/cmake-2.8.9.tar.gz b/cmake-2.8.9.tar.gz new file mode 100644 index 0000000..5bcdfde --- /dev/null +++ b/cmake-2.8.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9 +size 5658837 diff --git a/cmake-gui.changes b/cmake-gui.changes index 75c59d4..beffd01 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 14 09:07:10 UTC 2012 - cgiboudeaux@gmx.com + +- Update to 2.8.9 + - see /usr/share/doc/packages/cmake/Changelog for changes + ------------------------------------------------------------------- Wed Apr 18 23:00:30 UTC 2012 - cgiboudeaux@gmx.com diff --git a/cmake-gui.spec b/cmake-gui.spec index be46aea..b33e077 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -17,7 +17,7 @@ Name: cmake-gui -Version: 2.8.8 +Version: 2.8.9 Release: 0 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz diff --git a/cmake-pkgconfig.patch b/cmake-pkgconfig.patch deleted file mode 100644 index 610e52c..0000000 --- a/cmake-pkgconfig.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake -index 5d93ab1..3090fa3 100644 ---- a/Modules/FindPkgConfig.cmake -+++ b/Modules/FindPkgConfig.cmake -@@ -13,11 +13,10 @@ - # When the 'QUIET' argument is set, no status messages will be printed. - # - # It sets the following variables: --# PKG_CONFIG_FOUND ... true if pkg-config works on the system -+# PKG_CONFIG_FOUND ... if pkg-config executable was found - # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program - # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found - # (since CMake 2.8.8) --# PKG_CONFIG_FOUND ... if pkg-config executable was found - # - # For the following variables two sets of values exist; first one is the - # common one and has the given PREFIX. The second set contains flags -@@ -100,7 +99,7 @@ if (PKG_CONFIG_EXECUTABLE) - endif (PKG_CONFIG_EXECUTABLE) - - include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) --find_package_handle_standard_args(PkgConfig -+find_package_handle_standard_args(PKG_CONFIG - REQUIRED_VARS PKG_CONFIG_EXECUTABLE - VERSION_VAR PKG_CONFIG_VERSION_STRING) - -diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt -index 6604208..fc65e58 100644 ---- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt -+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt -@@ -71,7 +71,7 @@ endmacro(check_version_string) - # reported. - - foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL -- JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB) -+ JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB) - check_version_string(${VTEST} ${VTEST}_VERSION_STRING) - endforeach(VTEST) - -@@ -82,4 +82,3 @@ endforeach(VTEST) - - check_version_string(PYTHONINTERP PYTHON_VERSION_STRING) - check_version_string(SUBVERSION Subversion_VERSION_SVN) --check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING) diff --git a/cmake.changes b/cmake.changes index 141939a..b399348 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 14 09:07:10 UTC 2012 - cgiboudeaux@gmx.com + +- Update to 2.8.9 + - see /usr/share/doc/packages/cmake/Changelog for changes + ------------------------------------------------------------------- Wed May 30 09:51:04 UTC 2012 - coolo@suse.com diff --git a/cmake.spec b/cmake.spec index 3b57a5b..4c6da2c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -17,13 +17,12 @@ Name: cmake -Version: 2.8.8 +Version: 2.8.9 Release: 0 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz Patch1: cmake-disable-builtin-chrpath.diff -Patch2: cmake-pkgconfig.patch -Patch3: cmake-fix-ruby-test.patch +Patch2: cmake-fix-ruby-test.patch Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building @@ -53,7 +52,6 @@ CMake is a cross-platform, open-source make system %setup -q %patch1 %patch2 -p1 -%patch3 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS"