commit f13d1e411bdc472a2a9f3f3345276f36a93f81f7
Author: Paweł Sikora <pawel.sik...@agmk.net>
Date: Sat Nov 3 08:50:56 2012 +0100
updated to 2.8.10.
cmake-lib64.patch | 20 ++++++++++----------
cmake.spec | 5 +++--
2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/cmake.spec b/cmake.spec
index e554ae2..acbe3be 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -11,12 +11,12 @@
Summary: Cross-platform, open-source make system
Summary(pl.UTF-8): Wieloplatformowy system make o otwartych źródłach
Name: cmake
-Version: 2.8.9
+Version: 2.8.10
Release: 1
License: BSD
Group: Development/Building
Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
-# Source0-md5: 801f4c87f8b604f727df5bf1f05a59e7
+# Source0-md5: d4aef1eab859df61d2664721a72732c0
Patch0: %{name}-lib64.patch
Patch1: %{name}-helpers.patch
URL: http://www.cmake.org/
@@ -148,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/cmake/Modules/.NoDartCoverage
%{_datadir}/cmake/Modules/*
%{_datadir}/cmake/Templates
+%{_datadir}/cmake/editors
%{_datadir}/cmake/include
%{_aclocaldir}/cmake.m4
diff --git a/cmake-lib64.patch b/cmake-lib64.patch
index ef5eb99..808dd95 100644
--- a/cmake-lib64.patch
+++ b/cmake-lib64.patch
@@ -1,11 +1,11 @@
---- cmake-2.4.8/Modules/KDE3Macros.cmake~ 2008-01-29 00:39:54.000000000
+0100
-+++ cmake-2.4.8/Modules/KDE3Macros.cmake 2008-01-29 00:41:11.559753940
+0100
-@@ -319,7 +319,7 @@
- FILE(APPEND ${_laname} "# Should we warn about portability when linking
against -modules?\nshouldnotlink=yes\n")
- FILE(APPEND ${_laname} "# Files to
dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
- FILE(APPEND ${_laname} "# Directory that this library needs to be
installed in:\n")
-- FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
-+ FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib64/kde3'\n")
+--- cmake-2.4.10/Modules/KDE3Macros.cmake.orig 2012-11-03 08:29:52.205394821
+0100
++++ cmake-2.4.10/Modules/KDE3Macros.cmake 2012-11-03 08:31:27.108749182
+0100
+@@ -336,7 +336,7 @@
+ file(APPEND ${_laname} "# Should we warn about portability when linking
against -modules?\nshouldnotlink=yes\n")
+ file(APPEND ${_laname} "# Files to
dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
+ file(APPEND ${_laname} "# Directory that this library needs to be
installed in:\n")
+- file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
++ file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib64/kde3'\n")
- INSTALL_FILES(${KDE3_LIBTOOL_DIR} FILES ${_laname})
- ENDMACRO(KDE3_INSTALL_LIBTOOL_FILE)
+ install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname})
+ endmacro()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cmake.git/commitdiff/f13d1e411bdc472a2a9f3f3345276f36a93f81f7
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
