From 14f808f149b854081d13dd6b16bbdc07ea41dd63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= <volker27@gmx.at>
Date: Thu, 8 Nov 2012 00:58:56 +0100
Subject: [PATCH] Use system Qextserialport and update httpd config

- httpd config now works with 2.4 (BZ#871471)
- Un-bundle Qextserialport
---
 qgis-mapserver-httpd.conf | 20 ++++++++++++++++----
 qgis.spec                 | 15 ++++++++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/qgis-mapserver-httpd.conf b/qgis-mapserver-httpd.conf
index 81e583f..ce4e4bc 100644
--- a/qgis-mapserver-httpd.conf
+++ b/qgis-mapserver-httpd.conf
@@ -6,11 +6,23 @@ RewriteRule ^/wms/(.+)$ /qgis/qgis_mapserv.fcgi?map=/var/www/wms/$1.qgs [QSA,PT]
 
 ScriptAlias /qgis/ "/usr/libexec/qgis/"
 
+
 <Directory "/usr/libexec/qgis/">
+
   Options ExecCGI
   Options FollowSymLinks
-  Order deny,allow
-  Deny from all
-  Allow from 127.0.0.1
+  
+  <IfModule mod_authz_core.c>
+     # Apache 2.4
+     Require local
+   </IfModule>
+   
+   <IfModule !mod_authz_core.c>
+     # Apache 2.2
+     Order deny,allow
+     Deny from all
+     Allow from 127.0.0.1
+     Allow from ::1
+   </IfModule>
+
 </Directory>
- 
diff --git a/qgis.spec b/qgis.spec
index bb5ef44..6152dc7 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -15,7 +15,7 @@
 
 Name:           qgis
 Version:        1.8.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 
 # Update FSF address or ship a GPLv3+ license file
@@ -45,6 +45,10 @@ Patch1: %{name}-1.8.0-sip410.patch
 # Crash when datasource is moved or deleted
 Patch2: %{name}-1.8.0-datasource-crash.patch
 
+#TODO: Upstream
+# Use system version of qextserialport library
+Patch3: %{name}-1.8.0-qextserialport.patch
+
 # Leaving it to make life easier for ELGIS, as long as they target RHEL 5
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -64,6 +68,7 @@ BuildRequires:  geos-devel
 BuildRequires:  grass-devel
 BuildRequires:  gsl-devel
 
+#TODO: F19?
 %ifnarch ppc ppc64
 BuildRequires:  libspatialite-devel
 %endif
@@ -78,6 +83,7 @@ BuildRequires:  qt4-devel
 BuildRequires:  qt4-webkit-devel
 BuildRequires:  qwt-devel
 
+BuildRequires:  qextserialport-devel
 BuildRequires:  qwtpolar-devel
 BuildRequires:  sip-devel > 4.7
 BuildRequires:  spatialindex-devel
@@ -152,6 +158,7 @@ Please refer to %{name}-mapserver-README.fedora for details!
 %patch0 -p1 -b .grass~
 %patch1 -p1 -b .sip410~
 %patch2 -p1 -b .datasource~
+%patch3 -p1 -b .qextserialport~
 
 # Readme file for QGIS mapserver configuration and Lighttpd sample
 install -pm0644 %{SOURCE4} .
@@ -159,6 +166,7 @@ install -pm0644 %{SOURCE4} .
 # Delete bundled libs
 rm -rf src/core/spatialite
 rm -rf src/core/gps/qwtpolar
+rm -rf src/core/gps/qextserialport
 
 %build
 
@@ -179,6 +187,7 @@ rm -rf src/core/gps/qwtpolar
       -D GDAL_LIBRARY=%{_libdir}/libgdal.so \
       -D ENABLE_TESTS:BOOL=FALSE \
       -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
+      -D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
       -D WITH_PYSPATIALITE:BOOL=FALSE \
       %{configure_with_spatialite} \
       .
@@ -355,6 +364,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libexecdir}/%{name}
 
 %changelog
+* Thu Nov  8 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-9
+- Build with system version of qextserialport
+- Update config file to fit httpd 2.4 (BZ#871471)
+
 * Wed Oct 03 2012 Rex Dieter <rdieter@fedoraproject.org> 1.8.0-8
 - rebuild (sip)