Update to 2.8.6 RC 2
Drop aclocal patch
This commit is contained in:
parent
2c740a1e9c
commit
5fa4687978
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,3 +11,4 @@ cmake-2.8.2.tar.gz
|
|||||||
/cmake-2.8.5-rc3.tar.gz
|
/cmake-2.8.5-rc3.tar.gz
|
||||||
/cmake-2.8.5.tar.gz
|
/cmake-2.8.5.tar.gz
|
||||||
/cmake-2.8.6-rc1.tar.gz
|
/cmake-2.8.6-rc1.tar.gz
|
||||||
|
/cmake-2.8.6-rc2.tar.gz
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
From a2a0a8e0d5f8ad5e464363b952220f716c8fba14 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Cole <david.cole@kitware.com>
|
|
||||||
Date: Fri, 26 Aug 2011 13:51:32 -0400
|
|
||||||
Subject: [PATCH] cmake.m4: Use modern signature of install(FILES ...)
|
|
||||||
|
|
||||||
The older install_files command uses a leading slash in front
|
|
||||||
of the destination directory, whereas the modern signature does
|
|
||||||
not. Use the modern signature since that's what the CMake devs
|
|
||||||
are now used to.
|
|
||||||
---
|
|
||||||
Utilities/CMakeLists.txt | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
|
|
||||||
index 85db367..798c163 100644
|
|
||||||
--- a/Utilities/CMakeLists.txt
|
|
||||||
+++ b/Utilities/CMakeLists.txt
|
|
||||||
@@ -126,7 +126,7 @@ ADD_CUSTOM_COMMAND(
|
|
||||||
|
|
||||||
INSTALL_FILES(${CMAKE_MAN_DIR}/man1 FILES ${MAN_FILES})
|
|
||||||
INSTALL_FILES(${CMAKE_DOC_DIR} FILES ${HTML_FILES} ${TEXT_FILES})
|
|
||||||
-INSTALL_FILES(share/aclocal FILES cmake.m4)
|
|
||||||
+INSTALL(FILES cmake.m4 DESTINATION share/aclocal)
|
|
||||||
|
|
||||||
# Drive documentation generation.
|
|
||||||
ADD_CUSTOM_TARGET(documentation ALL DEPENDS ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/cmake.txt )
|
|
||||||
--
|
|
||||||
1.7.0
|
|
||||||
|
|
11
cmake.spec
11
cmake.spec
@ -4,11 +4,11 @@
|
|||||||
# Set to bcond_with or use --without gui to disable qt4 gui build
|
# Set to bcond_with or use --without gui to disable qt4 gui build
|
||||||
%bcond_without gui
|
%bcond_without gui
|
||||||
# Set to RC version if building RC, else %{nil}
|
# Set to RC version if building RC, else %{nil}
|
||||||
%define rcver -rc1
|
%define rcver -rc2
|
||||||
|
|
||||||
Name: cmake
|
Name: cmake
|
||||||
Version: 2.8.6
|
Version: 2.8.6
|
||||||
Release: 0.1.rc1%{?dist}
|
Release: 0.2.rc2%{?dist}
|
||||||
Summary: Cross-platform make system
|
Summary: Cross-platform make system
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
@ -18,8 +18,6 @@ Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
|
|||||||
Source2: macros.cmake
|
Source2: macros.cmake
|
||||||
# Patch to find DCMTK in Fedora (bug #720140)
|
# Patch to find DCMTK in Fedora (bug #720140)
|
||||||
Patch0: cmake-dcmtk.patch
|
Patch0: cmake-dcmtk.patch
|
||||||
# Upstream patch to fix aclocal install location
|
|
||||||
Patch1: cmake-aclocal.patch
|
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
@ -61,7 +59,6 @@ The %{name}-gui package contains the Qt based GUI for CMake.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}%{?rcver}
|
%setup -q -n %{name}-%{version}%{?rcver}
|
||||||
%patch0 -p1 -b .dcmtk
|
%patch0 -p1 -b .dcmtk
|
||||||
%patch1 -p1 -b .aclocal
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -163,6 +160,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 6 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.6-0.2.rc2
|
||||||
|
- Update to 2.8.6 RC 2
|
||||||
|
- Drop aclocal patch
|
||||||
|
|
||||||
* Mon Aug 29 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.6-0.1.rc1
|
* Mon Aug 29 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.6-0.1.rc1
|
||||||
- Update to 2.8.6 RC 1
|
- Update to 2.8.6 RC 1
|
||||||
- Update dcmtk patch
|
- Update dcmtk patch
|
||||||
|
Loading…
Reference in New Issue
Block a user