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

Merge branch 'master' of ssh://pkgs.fedoraproject.org/qgis

Browse Source 
Conflicts:
	qgis.spec
This commit is contained in:
Volker Fröhlich 2013-10-19 21:19:50 +02:00
commit 63c8814a75
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qgis-2.0.1-httplib2.patch
View File

@ -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 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/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 @@ @@ -1,6 +1,5 @@
FILE(GLOB PY_FILES *.py) 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}) -PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
\ No newline at end of file \ No newline at end of file
+PLUGIN_INSTALL(processing ./admintools ${PY_FILES}) +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")

46
qgis.spec
View File

@ -19,9 +19,12 @@
Name: qgis Name: qgis
Version: 2.0.1 Version: 2.0.1
Release: 2%{?dist} Release: 5%{?dist}
Summary: A user friendly Open Source Geographic Information System 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 # Update FSF address or ship a GPLv3+ license file
# http://hub.qgis.org/issues/3789 # http://hub.qgis.org/issues/3789
Group: Applications/Engineering Group: Applications/Engineering
@ -30,13 +33,13 @@ URL: http://www.qgis.org
Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 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 # 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 #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 # Sample configuration files for QGIS mapserver
Source2: %{name}-mapserver-httpd.conf Source2: %{name}-mapserver-httpd.conf
Source4: %{name}-mapserver-README.fedora Source4: %{name}-mapserver-README.fedora
# MIME definitions # MIME definitions
# Based on debian/qgis.xml but excluding already defined or proprietary types
Source5: %{name}-mime.xml Source5: %{name}-mime.xml
# Fix detection problem for GRASS libraries # Fix detection problem for GRASS libraries
@ -136,7 +139,7 @@ Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
# The plug-in requires more than just the grass-libs. # 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 #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 %description grass
GRASS plugin for Quantum GIS required to interface with the GRASS system. GRASS plugin for Quantum GIS required to interface with the GRASS system.
@ -224,13 +227,18 @@ make install DESTDIR=%{buildroot}
# Add executable perms to python libs so they get stripped # Add executable perms to python libs so they get stripped
chmod +x %{buildroot}%{python_sitearch}/%{name}/*.so chmod +x %{buildroot}%{python_sitearch}/%{name}/*.so
# Install desktop file # Install desktop file without connecting proprietary file types
desktop-file-install \ desktop-file-install \
%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
--vendor="fedora" \ --vendor="fedora" \
%endif %endif
--remove-mime-type="application/x-raster-ecw" \
--remove-mime-type="application/x-raster-mrsid" \
--dir=%{buildroot}%{_datadir}/applications \ --dir=%{buildroot}%{_datadir}/applications \
%{SOURCE1} debian/qgis.desktop
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
debian/qbrowser.desktop
# Install MIME type definitions # Install MIME type definitions
install -d %{buildroot}%{_datadir}/mime/packages install -d %{buildroot}%{_datadir}/mime/packages
@ -244,13 +252,13 @@ install -pd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
install -pd %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes install -pd %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes
install -pm0644 \ install -pm0644 \
%{buildroot}%{_datadir}/%{name}/images/icons/%{name}-icon.png \ %{buildroot}%{_datadir}/%{name}/images/icons/%{name}-icon.png \
%{buildroot}%{_datadir}/pixmaps/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}-icon.png
install -pm0644 \ install -pm0644 \
images/icons/%{name}-icon-16x16.png \ 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 \ install -pm0644 \
images/icons/%{name}_icon.svg \ images/icons/%{name}_icon.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-icon.svg
install -pm0644 \ install -pm0644 \
%{buildroot}%{_datadir}/%{name}/images/icons/%{name}-mime-icon.png \ %{buildroot}%{_datadir}/%{name}/images/icons/%{name}-mime-icon.png \
%{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-layer-settings.png %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-layer-settings.png
@ -346,12 +354,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man1/qbrowser.1* %{_mandir}/man1/qbrowser.1*
%dir %{_datadir}/%{name}/ %dir %{_datadir}/%{name}/
%{_datadir}/mime/packages/qgis.xml %{_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-project.png
%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-layer-settings.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/*%{name}.desktop
%{_datadir}/applications/qbrowser.desktop
%{_datadir}/%{name}/images %{_datadir}/%{name}/images
%{_datadir}/%{name}/resources %{_datadir}/%{name}/resources
%{_datadir}/%{name}/svg %{_datadir}/%{name}/svg
@ -385,13 +394,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libexecdir}/%{name} %{_libexecdir}/%{name}
%changelog %changelog
* Tue Sep 24 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-2 * Tue Sep 24 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-5
- Patch QGIS #8507 -- QGIS trunk failed to compile with sip 4.15 - Patch QGIS #8507 -- QGIS trunk failed to compile with sip 4.15
- Patch QGIS #8601 -- sip: QgsFieldValidator::fixup has versioned and - Patch QGIS #8601 -- sip: QgsFieldValidator::fixup has versioned and
unversioned overloads unversioned overloads
* Tue Sep 24 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-1 * Wed Oct 16 2013 Rex Dieter <rdieter@fedoraproject.org> 2.0.1-4
- rebuild (sip)
* Tue Oct 1 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-3
- Fix Grass version to make breakage more visible
* 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 - New upstream release
- Exclude ARM for now, due to build issues
* Sat Sep 14 2013 Volker Fröhlich <volker27@gmx.at> - 1.8.0-17 * Sat Sep 14 2013 Volker Fröhlich <volker27@gmx.at> - 1.8.0-17
- Rebuild for grass 6.4.3 - Rebuild for grass 6.4.3