[quassel/el6] added patch to change cmake required version, RHEL version has the needed bits

Adam Miller maxamillion at fedoraproject.org
Wed Aug 28 15:54:12 UTC 2013


commit b1f24f0cc06db395429b0a4c980bfee804bb1104
Author: Adam Miller <admiller at redhat.com>
Date:   Wed Aug 28 10:53:58 2013 -0500

    added patch to change cmake required version, RHEL version has the needed bits

 minimum_cmake_version_el6.patch |   11 +++++++++++
 quassel.spec                    |    4 ++++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/minimum_cmake_version_el6.patch b/minimum_cmake_version_el6.patch
new file mode 100644
index 0000000..78da24a
--- /dev/null
+++ b/minimum_cmake_version_el6.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2013-08-28 10:35:29.391001658 -0500
++++ CMakeLists.txt	2013-08-28 10:35:50.198995334 -0500
+@@ -32,7 +32,7 @@
+ include(CheckCXXCompilerFlag)
+ 
+ # For building against Qt5, we check for an even newer cmake version below!
+-cmake_minimum_required(VERSION 2.8.1 FATAL_ERROR)
++cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)
+ 
+ if(COMMAND cmake_policy)
+    cmake_policy(SET CMP0003 NEW)
diff --git a/quassel.spec b/quassel.spec
index c1f09db..fc4e74a 100755
--- a/quassel.spec
+++ b/quassel.spec
@@ -20,6 +20,8 @@ Provides: %{name}-gui = %{version}-%{release}
 
 Requires: %{name}-common = %{version}-%{release}
 
+Patch0: minimum_cmake_version_el6.patch
+
 %description
 Quassel IRC is a modern, distributed IRC client, 
 meaning that one (or multiple) client(s) can attach 
@@ -59,6 +61,7 @@ Quassel client
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 
 %build
 mkdir build
@@ -118,6 +121,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 %changelog
 * Tue Aug 27 2013 Adam Miller <maxamillion at fedoraproject.org> - 0.9.0-1
 - Update to latest upstream release
+- Added patch for cmake version for EL6
 
 * Mon Jan 21 2013 Steven M. Parrish <smparrish at gmail.com> - 0.8.0
 - New release


More information about the scm-commits mailing list