pool/cmake
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 139994 from home:cgiboudeaux:branches:devel:tools:building

Browse Source 
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
This commit is contained in:
Ismail Dönmez 2012-11-02 14:31:52 +00:00 committed by Git OBS Bridge
parent 59d711ca56
commit d786652a21
8 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake-2.8.10.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a18b721c547c2ce2ea9378f2687caca4398fc348982ede799e96b26924cc9e04
size 5766728

3
cmake-2.8.9.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9
size 5658837

8
cmake-disable-builtin-chrpath.diff
View File

@ -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.

14
cmake-fix-ruby-test.patch
View File

@ -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)

7
cmake-gui.changes
View File

@ -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

13
cmake-gui.spec
View File

@ -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 \

7
cmake.changes
View File

@ -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

18
cmake.spec
View File

@ -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