forked from pool/cmake
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
This commit is contained in:
Ismail Dönmez
Git OBS Bridge
parent
7b648ff1c4
commit
997d60cf1b
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46
|
|
||||||
size 5691656
|
|
||||||
3
cmake-2.8.9.tar.gz
Normal file
3
cmake-2.8.9.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9
|
||||||
|
size 5658837
|
||||||
@ -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
|
Wed Apr 18 23:00:30 UTC 2012 - cgiboudeaux@gmx.com
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: cmake-gui
|
Name: cmake-gui
|
||||||
Version: 2.8.8
|
Version: 2.8.9
|
||||||
Release: 0
|
Release: 0
|
||||||
Url: http://www.cmake.org/
|
Url: http://www.cmake.org/
|
||||||
Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz
|
Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz
|
||||||
|
|||||||
@ -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)
|
|
||||||
@ -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
|
Wed May 30 09:51:04 UTC 2012 - coolo@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -17,13 +17,12 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: cmake
|
Name: cmake
|
||||||
Version: 2.8.8
|
Version: 2.8.9
|
||||||
Release: 0
|
Release: 0
|
||||||
Url: http://www.cmake.org/
|
Url: http://www.cmake.org/
|
||||||
Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
|
Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
|
||||||
Patch1: cmake-disable-builtin-chrpath.diff
|
Patch1: cmake-disable-builtin-chrpath.diff
|
||||||
Patch2: cmake-pkgconfig.patch
|
Patch2: cmake-fix-ruby-test.patch
|
||||||
Patch3: cmake-fix-ruby-test.patch
|
|
||||||
Summary: Cross-platform, open-source make system
|
Summary: Cross-platform, open-source make system
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: Development/Tools/Building
|
Group: Development/Tools/Building
|
||||||
@ -53,7 +52,6 @@ CMake is a cross-platform, open-source make system
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1
|
%patch1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CXXFLAGS="$RPM_OPT_FLAGS"
|
export CXXFLAGS="$RPM_OPT_FLAGS"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user