From 52f79e9762516e550528f64cdd3ecb0632cb96d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= <volker27@gmx.at>
Date: Wed, 4 Jul 2012 23:12:29 +0200
Subject: [PATCH] Fix build problem on EL

- Patch for older versions of SIP, that don't have a -o option
- Correct locale if clause, that didn't work properly for EL
---
 qgis-1.8.0-sip410.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 qgis.spec               | 10 +++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 qgis-1.8.0-sip410.patch

diff --git a/qgis-1.8.0-sip410.patch b/qgis-1.8.0-sip410.patch
new file mode 100644
index 0000000..ecf8133
--- /dev/null
+++ b/qgis-1.8.0-sip410.patch
@@ -0,0 +1,40 @@
+SIP < 4.10 has no -o option, therefore causing builds to fail
+http://hub.qgis.org/issues/5944
+
+diff -Nur qgis-1.8.0/python/CMakeLists.txt qgis-1.8.0-sip410/python/CMakeLists.txt
+--- qgis-1.8.0/python/CMakeLists.txt	2012-06-12 21:28:18.000000000 +0200
++++ qgis-1.8.0-sip410/python/CMakeLists.txt	2012-07-04 22:21:08.531677519 +0200
+@@ -62,7 +62,7 @@
+ # core module
+ FILE(GLOB sip_files_core core/*.sip)
+ SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
+-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.core.api)
++SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.core.api)
+ ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core)
+ 
+ # additional gui includes
+@@ -77,7 +77,7 @@
+ # gui module
+ FILE(GLOB sip_files_gui gui/*.sip)
+ SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
+-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
++SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
+ ADD_SIP_PYTHON_MODULE(qgis.gui gui/gui.sip qgis_core qgis_gui)
+ 
+ # additional analysis includes
+@@ -91,13 +91,13 @@
+ # analysis module
+ FILE(GLOB sip_files_analysis analysis/*.sip)
+ SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis})
+-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api)
++SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api)
+ ADD_SIP_PYTHON_MODULE(qgis.analysis analysis/analysis.sip qgis_core qgis_analysis)
+ 
+ # network-analysis module
+ FILE(GLOB sip_files_network_analysis analysis/network/*.sip)
+ SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_network_analysis})
+-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.networkanalysis.api)
++SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.networkanalysis.api)
+ ADD_SIP_PYTHON_MODULE(qgis.networkanalysis analysis/network/networkanalysis.sip qgis_core qgis_networkanalysis)
+ 
+ SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)
diff --git a/qgis.spec b/qgis.spec
index f3d6f5d..4523d5f 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -38,6 +38,9 @@ Source5:        %{name}-mime.xml
 # Fix detection problem for GRASS libraries
 Patch0: %{name}-1.5.0-grass.patch
 
+# Drop -o option from SIP, as versions older than 4.10 don't have it
+Patch1: %{name}-1.8.0-sip410.patch
+
 # Leaving it to make life easier for ELGIS, as long as they target RHEL 5
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -143,6 +146,7 @@ Please refer to %{name}-mapserver-README.fedora for details!
 %prep
 %setup -q
 %patch0 -p1 -b .grass~
+%patch1 -p1 -b .sip410~
 
 # Readme file for QGIS mapserver configuration and Lighttpd sample
 install -pm0644 %{SOURCE4} .
@@ -293,7 +297,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}/doc
 
 %dir %{_datadir}/%{name}/i18n/
-%if ! (0%{?fedora} > 14 || 0%{?rhel})
+%if 0%{?rhel}
 %lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm
 %endif
 %{_libdir}/lib%{name}_analysis.so.*
@@ -346,6 +350,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libexecdir}/%{name}
 
 %changelog
+* Thu Jul  4 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-2
+- Correct locale if clause
+- Apply patch for older versions of SIP
+
 * Fri Jun 29 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-1
 - New upstream release
 - Correct provides-filtering as of https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Usage