Solve httplib2 import issue and use upstream desktop files

qgis-2.0.1-httplib2.patch

@@ -1,6 +1,6 @@
 diff -Nur qgis-2.0.1/python/plugins/processing/admintools/CMakeLists.txt qgis-2.0.1-httplib2/python/plugins/processing/admintools/CMakeLists.txt
 --- qgis-2.0.1/python/plugins/processing/admintools/CMakeLists.txt	2013-09-11 01:06:52.000000000 +0200
-+++ qgis-2.0.1-httplib2/python/plugins/processing/admintools/CMakeLists.txt	2013-09-23 23:53:56.679847589 +0200
++++ qgis-2.0.1-httplib2/python/plugins/processing/admintools/CMakeLists.txt	2013-09-28 00:07:27.581240299 +0200
 @@ -1,6 +1,5 @@
  FILE(GLOB PY_FILES *.py)
  
@@ -10,3 +10,15 @@ diff -Nur qgis-2.0.1/python/plugins/processing/admintools/CMakeLists.txt qgis-2.
 -PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
 \ No newline at end of file
 +PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
+diff -Nur qgis-2.0.1/python/plugins/processing/admintools/geoserver/catalog.py qgis-2.0.1-httplib2/python/plugins/processing/admintools/geoserver/catalog.py
+--- qgis-2.0.1/python/plugins/processing/admintools/geoserver/catalog.py	2013-09-11 01:06:52.000000000 +0200
++++ qgis-2.0.1-httplib2/python/plugins/processing/admintools/geoserver/catalog.py	2013-09-28 00:08:25.495356845 +0200
+@@ -36,7 +36,7 @@
+ from xml.etree.ElementTree import XML
+ from xml.parsers.expat import ExpatError
+ from urlparse import urlparse
+-from processing.admintools import httplib2
++import httplib2
+ 
+ logger = logging.getLogger("gsconfig.catalog")
+ 

qgis.spec

@@ -19,7 +19,7 @@
 
 Name:           qgis
 Version:        2.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 
 # There are build issues at the moment; working with upstream
@@ -33,13 +33,13 @@ URL:            http://www.qgis.org
 Source0:        http://qgis.org/downloads/%{name}-%{version}.tar.bz2
 # The used sources were released as a tarball, the below is only for work in progress
 #git archive --format=tar --prefix=qgis-1.8.0/ master | bzip2 >../qgis-1.8.0.tar.gz
-Source1:        %{name}.desktop
 
 # Sample configuration files for QGIS mapserver
 Source2:        %{name}-mapserver-httpd.conf
 Source4:        %{name}-mapserver-README.fedora
 
 # MIME definitions
+# Based on debian/qgis.xml but excluding already defined or proprietary types
 Source5:        %{name}-mime.xml
 
 # Fix detection problem for GRASS libraries
@@ -48,7 +48,7 @@ Patch0: %{name}-1.5.0-grass.patch
 # Drop -o option from SIP, as versions older than 4.10 don't have it
 Patch1: %{name}-2.0.0-sip410.patch
 
-# Remove httplib2 from the build system
+# Remove httplib2 from the build system and remove import path
 Patch2: %{name}-2.0.1-httplib2.patch
 
 # Leaving it to make life easier for ELGIS, as long as they target RHEL 5
@@ -217,13 +217,18 @@ make install DESTDIR=%{buildroot}
 # Add executable perms to python libs so they get stripped
 chmod +x %{buildroot}%{python_sitearch}/%{name}/*.so
 
-# Install desktop file
+# Install desktop file without connecting proprietary file types
 desktop-file-install \
 %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
     --vendor="fedora" \
 %endif
+	--remove-mime-type="application/x-raster-ecw" \
+	--remove-mime-type="application/x-raster-mrsid" \
     --dir=%{buildroot}%{_datadir}/applications \
-    %{SOURCE1}
+    debian/qgis.desktop
+
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
+	debian/qbrowser.desktop
 
 # Install MIME type definitions
 install -d %{buildroot}%{_datadir}/mime/packages
@@ -237,13 +242,13 @@ install -pd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
 install -pd %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes
 install -pm0644 \
     %{buildroot}%{_datadir}/%{name}/images/icons/%{name}-icon.png \
-    %{buildroot}%{_datadir}/pixmaps/%{name}.png
+    %{buildroot}%{_datadir}/pixmaps/%{name}-icon.png
 install -pm0644 \
     images/icons/%{name}-icon-16x16.png \
-    %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+    %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}-icon.png
 install -pm0644 \
     images/icons/%{name}_icon.svg \
-    %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+    %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-icon.svg
 install -pm0644 \
     %{buildroot}%{_datadir}/%{name}/images/icons/%{name}-mime-icon.png \
     %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-layer-settings.png
@@ -339,12 +344,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/qbrowser.1*
 %dir %{_datadir}/%{name}/
 %{_datadir}/mime/packages/qgis.xml
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}-icon.png
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/16x16/apps/%{name}-icon.png
 %{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-project.png
 %{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-layer-settings.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/icons/hicolor/scalable/apps/%{name}-icon.svg
 %{_datadir}/applications/*%{name}.desktop
+%{_datadir}/applications/qbrowser.desktop
 %{_datadir}/%{name}/images
 %{_datadir}/%{name}/resources
 %{_datadir}/%{name}/svg
@@ -378,6 +384,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libexecdir}/%{name}
 
 %changelog
+* Fri Sep 27 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-2
+- Remove import path for httplib2 module to use the system version
+- Use upstream desktop files
+
 * Wed Sep 25 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-1
 - New upstream release
 - Exclude ARM for now, due to build issues