[cmake] Update to 2.8.6 RC 2 Drop aclocal patch

Orion Poplawski orion at fedoraproject.org
Tue Sep 6 22:34:58 UTC 2011


commit 5fa4687978a857d74e06a79d7e96e949ae103afd
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Sep 6 16:34:44 2011 -0600

    Update to 2.8.6 RC 2
    Drop aclocal patch

 .gitignore          |    1 +
 cmake-aclocal.patch |   29 -----------------------------
 cmake.spec          |   11 ++++++-----
 sources             |    2 +-
 4 files changed, 8 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 36b346d..160d375 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ cmake-2.8.2.tar.gz
 /cmake-2.8.5-rc3.tar.gz
 /cmake-2.8.5.tar.gz
 /cmake-2.8.6-rc1.tar.gz
+/cmake-2.8.6-rc2.tar.gz
diff --git a/cmake.spec b/cmake.spec
index c7c6614..674b2c7 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -4,11 +4,11 @@
 # Set to bcond_with or use --without gui to disable qt4 gui build
 %bcond_without gui
 # Set to RC version if building RC, else %{nil}
-%define rcver -rc1
+%define rcver -rc2
 
 Name:           cmake
 Version:        2.8.6
-Release:        0.1.rc1%{?dist}
+Release:        0.2.rc2%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -18,8 +18,6 @@ Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
 Source2:        macros.cmake
 # Patch to find DCMTK in Fedora (bug #720140)
 Patch0:         cmake-dcmtk.patch
-# Upstream patch to fix aclocal install location
-Patch1:         cmake-aclocal.patch
 
 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
 %setup -q -n %{name}-%{version}%{?rcver}
 %patch0 -p1 -b .dcmtk
-%patch1 -p1 -b .aclocal
 
 
 %build
@@ -163,6 +160,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Sep 6 2011 Orion Poplawski <orion at 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 at cora.nwra.com> - 2.8.6-0.1.rc1
 - Update to 2.8.6 RC 1
 - Update dcmtk patch
diff --git a/sources b/sources
index 9ed3dfb..ad44464 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82d546a0b8a7d75dc42776bd583622ed  cmake-2.8.6-rc1.tar.gz
+f127d07974a56c6dbfb9b597563cc2d3  cmake-2.8.6-rc2.tar.gz


More information about the scm-commits mailing list