dani/copr-dani-qgis
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

- fix sip version check so it works with sip 4.10 (#553713)

Browse Source
This commit is contained in:
Kevin Kofler 2010-02-05 21:43:19 +00:00
parent 9e5d9fc6a1
commit 4bf8e371ba
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qgis-1.0.2-sip410.patch Normal file
View File

@ -0,0 +1,14 @@
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}")

10
qgis.spec
View File

@ -2,7 +2,7 @@
Name: qgis Name: qgis
Version: 1.0.2 Version: 1.0.2
Release: 5%{?dist} Release: 6%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering Group: Applications/Engineering
@ -10,6 +10,8 @@ License: GPLv2+
URL: http://qgis.org/ URL: http://qgis.org/
Source0: http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz Source0: http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz
Source1: %{name}.desktop 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstream patches ## upstream patches
@ -106,6 +108,7 @@ Addtional theme for qgis - nkids
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch100 -p1 -b .sip49 %patch100 -p1 -b .sip49
%patch0 -p1 -b .sip410
# fix spurious executable bits # fix spurious executable bits
%{__chmod} -x \ %{__chmod} -x \
@ -252,7 +255,10 @@ desktop-file-install --vendor="fedora" \
%changelog %changelog
* Thu Jan 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.0.2-5 * Fri Feb 05 2010 Kevin Kofler <Kevin@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@fedoraproject.org> - 1.0.2-5
- rebuild (sip) - rebuild (sip)
* Wed Dec 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.2-4 * Wed Dec 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.2-4