From 16f46cee5996a4c24c0e6447ef38d4e9144cbfc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Fri, 27 Sep 2013 08:32:10 +0200 Subject: [PATCH 1/4] Exclude ARM due to build issues for the time being --- qgis.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index a0952c6..4362b21 100644 --- a/qgis.spec +++ b/qgis.spec @@ -22,6 +22,9 @@ Version: 2.0.1 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System +# There are build issues at the moment; working with upstream +ExcludeArch: armv7hl + # Update FSF address or ship a GPLv3+ license file # http://hub.qgis.org/issues/3789 Group: Applications/Engineering @@ -375,8 +378,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libexecdir}/%{name} %changelog -* Tue Sep 24 2013 Volker Fröhlich - 2.0.1-1 +* Wed Sep 25 2013 Volker Fröhlich - 2.0.1-1 - New upstream release +- Exclude ARM for now, due to build issues * Sat Sep 14 2013 Volker Fröhlich - 1.8.0-17 - Rebuild for grass 6.4.3 From dc34bafeae61c58c18259a6a84fa5d6746134135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sat, 28 Sep 2013 00:32:38 +0200 Subject: [PATCH 2/4] Solve httplib2 import issue and use upstream desktop files --- qgis-2.0.1-httplib2.patch | 14 +++++++++++++- qgis.spec | 32 +++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/qgis-2.0.1-httplib2.patch b/qgis-2.0.1-httplib2.patch index 8de8402..dfeb947 100644 --- a/qgis-2.0.1-httplib2.patch +++ b/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") + diff --git a/qgis.spec b/qgis.spec index 4362b21..f09b29a 100644 --- a/qgis.spec +++ b/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}/icons/hicolor/16x16/apps/%{name}.png +%{_datadir}/pixmaps/%{name}-icon.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 - 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 - 2.0.1-1 - New upstream release - Exclude ARM for now, due to build issues From 084dc2a6cb6fa3cc8a5675dff9a121c3dc171b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Tue, 1 Oct 2013 19:13:58 +0200 Subject: [PATCH 3/4] Require a specific Grass version to make breakage visible --- qgis.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index f09b29a..3a4949d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -19,7 +19,7 @@ Name: qgis Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # There are build issues at the moment; working with upstream @@ -130,7 +130,7 @@ Group: Applications/Engineering Requires: %{name}%{?_isa} = %{version}-%{release} # The plug-in requires more than just the grass-libs. #TODO: I think, that is still correct, but the sense of the libs package is questionable -Requires: grass +Requires: grass = 6.4.3 %description grass GRASS plugin for Quantum GIS required to interface with the GRASS system. @@ -384,6 +384,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libexecdir}/%{name} %changelog +* Tue Oct 1 2013 Volker Fröhlich - 2.0.1-3 +- Fix Grass version to make breakage more visible + * Fri Sep 27 2013 Volker Fröhlich - 2.0.1-2 - Remove import path for httplib2 module to use the system version - Use upstream desktop files From 2dc18229f3502007a35f8d45b3243bad383997bb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 16 Oct 2013 16:45:25 -0500 Subject: [PATCH 4/4] rebuild (sip) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 3a4949d..af692ed 100644 --- a/qgis.spec +++ b/qgis.spec @@ -19,7 +19,7 @@ Name: qgis Version: 2.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # There are build issues at the moment; working with upstream @@ -384,6 +384,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libexecdir}/%{name} %changelog +* Wed Oct 16 2013 Rex Dieter 2.0.1-4 +- rebuild (sip) + * Tue Oct 1 2013 Volker Fröhlich - 2.0.1-3 - Fix Grass version to make breakage more visible