rpms/qgis/devel qgis-1.0.2-sip410.patch,NONE,1.1 qgis.spec,1.42,1.43

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/qgis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24163/devel

Modified Files:
	qgis.spec 
Added Files:
	qgis-1.0.2-sip410.patch 
Log Message:
* Fri Feb 05 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.2-6
- fix sip version check so it works with sip 4.10 (#553713)

qgis-1.0.2-sip410.patch:
 Python.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE qgis-1.0.2-sip410.patch ---
diff -ur qgis-1.0.2/cmake/Python.cmake qgis-1.0.2-sip410/cmake/Python.cmake
--- qgis-1.0.2/cmake/Python.cmake	2008-11-11 15:33:01.000000000 +0100
+++ qgis-1.0.2-sip410/cmake/Python.cmake	2010-02-05 22:35:47.000000000 +0100
@@ -64,8 +64,8 @@
     IF (HAVE_SIP_MODULE AND SIP_BINARY_PATH AND SIP_INCLUDE_DIR)
       # check for SIP version
       # minimal version is 4.7 (to support universal builds)
-      SET (SIP_MIN_VERSION 040700)
-      TRY_RUN_PYTHON (RES "import sip\nprint '%x' % sip.SIP_VERSION" SIP_VERSION)
+      SET (SIP_MIN_VERSION 263936) # 0x040700
+      TRY_RUN_PYTHON (RES "import sip\nprint '%d' % sip.SIP_VERSION" SIP_VERSION)
       IF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
         SET (SIP_IS_GOOD TRUE)
       ENDIF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/qgis.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- qgis.spec	7 Jan 2010 22:43:04 -0000	1.42
+++ qgis.spec	5 Feb 2010 21:43:19 -0000	1.43
@@ -2,7 +2,7 @@
 
 Name: qgis
 Version: 1.0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A user friendly Open Source Geographic Information System
 
 Group: Applications/Engineering
@@ -10,6 +10,8 @@ License: GPLv2+
 URL: http://qgis.org/
 Source0: http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz
 Source1: %{name}.desktop
+# fix sip version check so it works with sip 4.10
+Patch0:  qgis-1.0.2-sip410.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
@@ -106,6 +108,7 @@ Addtional theme for qgis - nkids
 %setup -q -n %{name}-%{version}
 
 %patch100 -p1 -b .sip49
+%patch0 -p1 -b .sip410
 
 # fix spurious executable bits
 %{__chmod} -x \
@@ -252,7 +255,10 @@ desktop-file-install --vendor="fedora" \
 
 
 %changelog
-* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-5 
+* Fri Feb 05 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.2-6
+- fix sip version check so it works with sip 4.10 (#553713)
+
+* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-5
 - rebuild (sip)
 
 * Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-4