[cmake] - Update to 2.8.4 RC 1 - Drop qt4 patch

Orion Poplawski orion at fedoraproject.org
Tue Jan 18 22:27:24 UTC 2011


commit 7a78b9f212bcbe70d719773f97fa2b4208b32bb5
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Jan 18 15:27:15 2011 -0700

    - Update to 2.8.4 RC 1
    - Drop qt4 patch

 .gitignore |    1 +
 cmake.spec |   13 +++++++------
 sources    |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac86f31..3bf4c42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ cmake-2.8.2.tar.gz
 /cmake-2.8.3-rc3.tar.gz
 /cmake-2.8.3-rc4.tar.gz
 /cmake-2.8.3.tar.gz
+/cmake-2.8.4-rc1.tar.gz
diff --git a/cmake.spec b/cmake.spec
index fcec42e..d7a6a5b 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 %{nil}
+%define rcver -rc1
 
 Name:           cmake
-Version:        2.8.3
-Release:        2%{?dist}
+Version:        2.8.4
+Release:        0.1.rc1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -16,8 +16,6 @@ License:        BSD
 URL:            http://www.cmake.org
 Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
 Source2:        macros.cmake
-#Patch from upstream git to fix bug 652886
-Patch0:         cmake-2.8.3-qt4.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,7 +56,6 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 
 %prep
 %setup -q -n %{name}-%{version}%{?rcver}
-%patch0 -p1
 
 
 %build
@@ -157,6 +154,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Jan 18 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.4-0.1.rc1
+- Update to 2.8.4 RC 1
+- Drop qt4 patch
+
 * Thu Dec 16 2010 Orion Poplawski <orion at cora.nwra.com> - 2.8.3-2
 - Add patch from upstream git to fix bug 652886 (qt3/qt4 detection)
 
diff --git a/sources b/sources
index 0586022..a222477 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a76a44b93acf5e3badda9de111385921  cmake-2.8.3.tar.gz
+594c207ca1a36034dedb7213da934dd9  cmake-2.8.4-rc1.tar.gz


More information about the scm-commits mailing list