From cdf98c4b7297f3500475e4e4d4c632b864b0c8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sun, 26 Jun 2011 23:42:43 +0200 Subject: [PATCH] NEW VERSION 1.7 New upstream version Add Mapserver sub-package, handle MIME types and icons --- .gitignore | 1 + qgis-1.6.0-sip.patch | 42 ----- qgis-1.7.0-georef-crash.patch | 33 ++++ qgis-mapserver-README.fedora | 36 ++++ qgis-mapserver-httpd.conf | 19 ++ qgis-mapserver-lighttpd.conf | 12 ++ qgis-mime.xml | 28 +++ qgis.spec | 332 ++++++++++++++++++++++------------ sources | 2 +- 9 files changed, 344 insertions(+), 161 deletions(-) delete mode 100644 qgis-1.6.0-sip.patch create mode 100644 qgis-1.7.0-georef-crash.patch create mode 100644 qgis-mapserver-README.fedora create mode 100644 qgis-mapserver-httpd.conf create mode 100644 qgis-mapserver-lighttpd.conf create mode 100644 qgis-mime.xml diff --git a/.gitignore b/.gitignore index df36fa7..6623916 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ qgis_1.5.0.tar.gz /qgis_1.6.0.tar.gz +/qgis-1.7.0.tar.bz2 diff --git a/qgis-1.6.0-sip.patch b/qgis-1.6.0-sip.patch deleted file mode 100644 index a8264f4..0000000 --- a/qgis-1.6.0-sip.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- qgis-1.6.0/python/core/conversions.sip 2010-10-03 11:11:28.000000000 +0200 -+++ qgis-1.6.0_sip/python/core/conversions.sip 2011-02-02 15:15:46.725572147 +0100 -@@ -15,6 +15,7 @@ - */ - - %Feature QSETINT_CONVERSION -+%Feature QSETTYPE_CONVERSION - - %ModuleHeaderCode - // From Python 2.5, some functions use Py_ssize_t instead of int -@@ -320,7 +321,7 @@ - }; - %End - -- -+%If (QSETTYPE_CONVERSION) - template - %MappedType QSet - { -@@ -394,8 +395,7 @@ - %End - - }; -- -- -+%End - - template - %MappedType QMap > ---- qgis-1.6.0/python/CMakeLists.txt 2010-10-04 22:05:12.000000000 +0200 -+++ qgis-1.6.0_sip/python/CMakeLists.txt 2011-02-02 15:15:46.725572147 +0100 -@@ -43,6 +43,10 @@ - SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION) - ENDIF(NOT PYQT4_VERSION_NUM LESS 263941) - -+IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802 -+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION) -+ENDIF(NOT PYQT4_VERSION_NUM LESS 264194) -+ - # core module - FILE(GLOB sip_files_core core/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${sip_files_core}) diff --git a/qgis-1.7.0-georef-crash.patch b/qgis-1.7.0-georef-crash.patch new file mode 100644 index 0000000..9905d2c --- /dev/null +++ b/qgis-1.7.0-georef-crash.patch @@ -0,0 +1,33 @@ +--- qgis-1.7.0/src/plugins/georeferencer/qgsimagewarper.cpp 2011-06-05 13:59:48.000000000 +0200 ++++ qgis-1.7.0-georef-crash/src/plugins/georeferencer/qgsimagewarper.cpp 2011-06-11 23:42:55.424025275 +0200 +@@ -17,7 +17,6 @@ + #include + #include + #include +-#include + + #include + #include +@@ -30,6 +29,7 @@ + + #include "qgsimagewarper.h" + #include "qgsgeoreftransform.h" ++#include "qgslogger.h" + + #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800 + #define TO8F(x) (x).toUtf8().constData() +@@ -195,8 +195,12 @@ + if ( destResY > 0.0 ) destResY = -destResY; + + // Assert that the north-up convention is fullfiled by GDALSuggestedWarpOutput (should always be the case) +- assert( adfGeoTransform[0] > 0.0 ); +- assert( adfGeoTransform[5] < 0.0 ); ++ // Asserts are bad as they just crash out, changed to just return false. TS ++ if ( adfGeoTransform[0] <= 0.0 || adfGeoTransform[5] >= 0.0 ) ++ { ++ QgsDebugMsg("Image is not north up after GDALSuggestedWarpOutput, bailing out."); ++ return false; ++ } + // Find suggested output image extent (in georeferenced units) + double minX = adfGeoTransform[0]; + double maxX = adfGeoTransform[0] + adfGeoTransform[1] * destPixels; diff --git a/qgis-mapserver-README.fedora b/qgis-mapserver-README.fedora new file mode 100644 index 0000000..5cfd13b --- /dev/null +++ b/qgis-mapserver-README.fedora @@ -0,0 +1,36 @@ +QGIS Mapserver originally has two configuration files, located in the +same directory as the FCGI binary: + + - admin.sld + - wms_metadata.xml + +The binary only accepts them, when they are located in the same directory. + +"admin.sld" uses extended SLD syntax (Style Layer Descriptor) to +describe symbolization of data. It's more comfortable though, to +layout your map in QGIS and just use a .qgs (QGIS project) to describe +your map. This approach also allows for multiple map services, because +the Mapserver accepts the path to a QGIS project as a HTTP Get +parameter. + +A getCapabilities request looks like this, if you use the supplied +sample configuration: + +http://localhost/qgis/qgis_mapserv.fcgi?MAP=/var/www/html/my_first_map.qgs&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities + +/var/www/html/my_first_map.qgs is the assumed location of your QGIS +project file. The actual data can stay where it is. Make sure QGIS +Mapserver can access the project file and don't forget to let Httpd +reload its configuration before sending your requests! + +"wms_metadata.xml" supplies metadata for your WMS. If you serve different +projects, metadata may vary, so that file won't work for you. Try to fill +in on the metadata tab of your QGIS project. It is not that complete +though, but enhancement is planned, Marco Hugentobler said. + +Both configuration files are included as documentation. + +Further information: http://karlinapp.ethz.ch/qgis_wms + + Volker Fröhlich + volker27@gmx.at diff --git a/qgis-mapserver-httpd.conf b/qgis-mapserver-httpd.conf new file mode 100644 index 0000000..dc38afd --- /dev/null +++ b/qgis-mapserver-httpd.conf @@ -0,0 +1,19 @@ +# SAMPLE CONFIG SNIPPETS FOR APACHE WEB SERVER +# Last Modified: 11-26-2005 +# +# This file contains examples of entries that need +# to be incorporated into your Apache web server +# configuration file. Customize the paths, etc. as +# needed to fit your system. + +ScriptAlias /qgis/ "/usr/libexec/qgis" + + + Options ExecCGI + AllowOverride None + Order allow,deny + Allow from all + Order deny,allow + Deny from all + Allow from 127.0.0.1 + diff --git a/qgis-mapserver-lighttpd.conf b/qgis-mapserver-lighttpd.conf new file mode 100644 index 0000000..bb88257 --- /dev/null +++ b/qgis-mapserver-lighttpd.conf @@ -0,0 +1,12 @@ +fastcgi.server = ( "/maps" => + ( "localhost" => + ( + "check-local" => "disable", + "bin-path" => "/usr/libexec/qgis/qgis_mapserv.fcgi", + "socket" => "/var/run/lighttpd/qgis-fastcgi.socket", + "max-load-per-proc" => 4, + ) + ) + ) + +#"socket" => "/tmp/mapserver-fastcgi.socket", diff --git a/qgis-mime.xml b/qgis-mime.xml new file mode 100644 index 0000000..12c521e --- /dev/null +++ b/qgis-mime.xml @@ -0,0 +1,28 @@ + + + + + Quantum GIS Project + Quantum GIS-Projekt + + + + + + + + + + + + Quantum GIS layer settings + Quantum GIS Layer Einstellungen + + + + + + + + + diff --git a/qgis.spec b/qgis.spec index 4dd511b..6fa301a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,53 +2,80 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif +# There is no PPC64 build for libspatialite +%ifnarch ppc64 +%global configure_with_spatialite -D WITH_SPATIALITE:BOOL=TRUE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE +%endif + Name: qgis -Version: 1.6.0 -Release: 7%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering -License: GPLv2+ with exceptions -URL: http://www.qgis.org/ -Source0: http://qgis.org/~timlinux/src/%{name}_%{version}.tar.gz +License: GPLv3+ with exceptions +URL: http://www.qgis.org +Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +# Sample configuration files for QGIS mapserver +Source2: %{name}-mapserver-httpd.conf +Source3: %{name}-mapserver-lighttpd.conf +Source4: %{name}-mapserver-README.fedora + +# MIME definitions +Source5: %{name}-mime.xml # Fix detection problem for GRASS libraries -# Proposed changes for next version: https://trac.osgeo.org/qgis/ticket/2863 Patch0: qgis-1.5.0-grass.patch -# Fix problem with SIP 4.12, see https://trac.osgeo.org/qgis/changeset/14988 -Patch1: qgis-1.6.0-sip.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=712620 +# Avoid segfault when geo-referencing +Patch1: %{name}-1.7.0-georef-crash.patch + +# Leaving it to make life easier for ELGIS, as long as they target RHEL 5 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +# TODO: Pyspatialite is included if you use the bundled libspatialite. +# Do you really need it? +# The license is not totally clear, see: +# http://code.google.com/p/pyspatialite/issues/detail?id=3 +# It also is sort of a fork of pysqlite, which is not elegant. BuildRequires: cmake -BuildRequires: flex bison - +BuildRequires: desktop-file-utils BuildRequires: expat-devel +BuildRequires: fcgi-devel +BuildRequires: flex bison BuildRequires: gdal-devel BuildRequires: geos-devel + +# No GRASS package in EPEL 6 +%if ! 0%{?rhel} +# Grass package contains definitions, the configure script needs. +BuildRequires: grass +BuildRequires: grass-devel +%endif + BuildRequires: gsl-devel + +%ifnarch ppc64 +BuildRequires: libspatialite-devel +%endif + BuildRequires: postgresql-devel BuildRequires: proj-devel -BuildRequires: sqlite-devel -BuildRequires: libspatialite-devel -BuildRequires: chrpath -BuildRequires: desktop-file-utils +BuildRequires: PyQt4-devel +BuildRequires: PyQwt-devel +BuildRequires: python-devel BuildRequires: qt4-devel +BuildRequires: qt4-webkit-devel BuildRequires: qwt-devel -#Note for future EPEL version: -#grass is not in EPEL, qt4-webkit does not exist - -BuildRequires: PyQwt-devel +# Coming soon: https://bugzilla.redhat.com/show_bug.cgi?id=706593 +#BuildRequires: qwtpolar-devel BuildRequires: sip-devel > 4.7 -BuildRequires: python-devel -BuildRequires: PyQt4-devel -BuildRequires: qt4-webkit-devel -BuildRequires: fcgi-devel - -# Grass package contains definitions needed for configure script -BuildRequires: grass, grass-devel +BuildRequires: sqlite-devel Requires: gpsbabel @@ -57,19 +84,20 @@ Obsoletes: qgis-theme-classic < 1.1 Obsoletes: qgis-theme-gis < 1.1 Obsoletes: qgis-theme-nkids < 1.1 -# We don't want to provide private python extension libs +# We don't want to provide private Python extension libs %{?filter_setup: %filter_provides_in %{python_sitearch}/.*\.so$ %filter_setup } %description -Quantum GIS (QGIS) is a user friendly Open Source Geographic Information -System (GIS) that runs on Linux, Unix, Mac OSX, and Windows. -QGIS supports vector, raster, and database formats. QGIS lets you browse -and create map data on your computer. It supports many common spatial data -formats (e.g. ESRI ShapeFile, geotiff). QGIS supports plugins to do things -like display tracks from your GPS. +Geographic Information System (GIS) manages, analyzes, and displays +databases of geographic information. Quantum GIS (QGIS) supports shape file +viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection +on-the-fly, map composition, and a number of other features via a plugin +interface. QGIS also supports display of various geo-referenced raster and +Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, +and USGS ASCII DEM. %package devel Summary: Development Libraries for the Quantum GIS @@ -79,17 +107,20 @@ Requires: %{name} = %{version}-%{release} %description devel Development packages for Quantum GIS including the C header files. +%if ! 0%{?rhel} %package grass Summary: GRASS Support Libraries for Quantum GIS Group: Applications/Engineering Requires: %{name} = %{version}-%{release} +# The plug-in requires more than just the grass-libs. Requires: grass - + %description grass GRASS plugin for Quantum GIS required to interface with the GRASS system. +%endif %package python -Summary: Python integration and plugins for Quantum GIS +Summary: Python integration and plug-ins for Quantum GIS Group: Applications/Engineering Requires: %{name} = %{version}-%{release} Requires: gdal-python @@ -97,30 +128,43 @@ Requires: PyQt4 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} %description python -Python integration and plugins for QGIS. +Python integration and plug-ins for Quantum GIS. + +%package mapserver +Summary: FCGI based OGC web map server +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} +Requires: mod_fcgid + +%description mapserver +This FastCGI OGC web map server implements OGC WMS 1.3.0 and 1.1.1. +The services are prepared as regular projects in QGIS. They're rendered using +the QGIS libraries. The server also supports SLD (Styled Layer Descriptor) +for styling. Sample configurations for Httpd and Lighttpd are included. %prep %setup -q - %patch0 -p1 -b .grass -%patch1 -p1 -b .sip +%patch1 -p1 -b .georef -# Encode man-file to utf-8 -- Solved in 1.7. -iconv -f iso8859-1 -t utf-8 qgis_help.1 > qgis_help.1.conv && mv qgis_help.1.conv qgis_help.1 +# Readme file for QGIS mapserver configuration and Lighttpd sample +install -pm0644 %{SOURCE4} . +install -pm0644 %{SOURCE3} . -# Correct version string in title bar -sed -i 's|Trunk|Copiapo|' CMakeLists.txt +# Delete bundled libspatialite +rm -rf src/core/spatialite -# Remove obsolete translations -- They will be there again in 1.7! -#/usr/bin/lupdate-qt4 -noobsolete -ts i18n/qgis_*.ts +# Coming soon +#rm -rf src/core/gps/qwtpolar + +#find src/core/spatialindex -type d -exec rm -rf {} \; +#rm -rf src/core/spatialindex/rtree +#rm -rf src/core/pal + +# TODO: Unused-direct-shlib-dependencies +# They don't drag in new dependencies though %build - -#GDAL script doesn't work properly - -# Detection doesn't work on it's own -GRASS_PREFIX=%{_libdir} - %cmake \ %{_cmake_skip_rpath} \ -D QGIS_LIB_SUBDIR=%{_lib} \ @@ -128,15 +172,17 @@ GRASS_PREFIX=%{_libdir} -D QGIS_PLUGIN_SUBDIR=%{_lib}/%{name} \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ -D WITH_BINDINGS:BOOL=TRUE \ + -D WITH_MAPSERVER:BOOL=TRUE \ -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \ - -D GRASS_PREFIX=$GRASS_PREFIX \ -D GDAL_INCLUDE_DIR=%{_includedir}/gdal \ -D GDAL_LIBRARY=%{_libdir}/libgdal.so \ + -D ENABLE_TESTS:BOOL=FALSE \ + %{configure_with_spatialite} \ . -# QGIS Mapserver will be off by default in 1.7 -# Parallel make leads to race conditions with PYQT4_WRAP_UI -# https://trac.osgeo.org/qgis/ticket/2880 + #-D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \ + +# Parallel make leads to race conditions #make %{?_smp_mflags} make @@ -144,112 +190,162 @@ make rm -rf %{buildroot} make install DESTDIR=%{buildroot} -%find_lang %{name} --with-qt - - # Add executable perms to python libs so they get stripped chmod +x %{buildroot}%{python_sitearch}/%{name}/*.so -# Remove files packaged by doc or undesired -rm -f %{buildroot}%{_datadir}/%{name}/doc/BUGS \ - %{buildroot}%{_datadir}/%{name}/doc/ChangeLog \ - %{buildroot}%{_datadir}/%{name}/doc/CODING \ - %{buildroot}%{_datadir}/%{name}/doc/COPYING \ - %{buildroot}%{_datadir}/%{name}/doc/INSTALL \ - %{buildroot}%{_datadir}/%{name}/doc/PROVENANCE \ - %{buildroot}%{_datadir}/%{name}/doc/README - # Install desktop file +desktop-file-install --vendor="fedora" \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE1} + +# Install MIME type definitions +install -d %{buildroot}%{_datadir}/mime/packages +install -pm0644 %{SOURCE5} \ + %{buildroot}%{_datadir}/mime/packages/%{name}.xml + +# Install application and MIME icons install -pd %{buildroot}%{_datadir}/pixmaps +install -pd %{buildroot}%{_icons16dir}/%{name} +install -pd %{buildroot}%{_iconsscaldir}/%{name} +install -pd %{buildroot}%{_iconsbasedir}/128x128/mimetypes install -pm0644 \ %{buildroot}%{_datadir}/%{name}/images/icons/%{name}-icon.png \ %{buildroot}%{_datadir}/pixmaps/%{name}.png -desktop-file-install --vendor="fedora" \ ---dir=%{buildroot}/%{_datadir}/applications \ -%{SOURCE1} +install -pm0644 \ + images/icons/%{name}-icon-16x16.png \ + %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png +install -pm0644 \ + images/icons/%{name}_icon.svg \ + %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +install -pm0644 \ + %{buildroot}%{_datadir}/%{name}/images/icons/%{name}-mime-icon.png \ + %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-layer-settings.png +install -pm0644 \ + %{buildroot}%{_datadir}/%{name}/images/icons/%{name}-mime-icon.png \ + %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-project.png + +# Install basic QGIS Mapserver configuration for Apache +install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d +install -pm0644 %{SOURCE2} \ + %{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-mapserver.conf + +# See qgis-mapserver-README.fedora +rm -f %{buildroot}%{_libexecdir}/%{name}/wms_metadata.xml +rm -f %{buildroot}%{_libexecdir}/%{name}/admin.sld + +# Remove files packaged by doc +pushd %{buildroot}%{_datadir}/%{name}/doc + rm -f BUGS \ + ChangeLog \ + CODING \ + COPYING \ + INSTALL \ + PROVENANCE \ + README +popd + +# Name of locale is wrong +mv %{buildroot}/usr/share/qgis/i18n/qgis_sr_CS-Latn.qm \ + %{buildroot}/usr/share/qgis/i18n/qgis_sr@latin.qm + +%find_lang %{name} --with-qt %clean rm -rf %{buildroot} -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +update-mime-database %{_datadir}/mime &> /dev/null || : -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +update-mime-database %{_datadir}/mime &> /dev/null || : +%if ! 0%{?rhel} %post grass -p /sbin/ldconfig %postun grass -p /sbin/ldconfig +%endif %post python -p /sbin/ldconfig %postun python -p /sbin/ldconfig %files -f %{name}.lang -%defattr(-,root,root,-) -%doc BUGS COPYING ChangeLog README CODING PROVENANCE Exception_to_GPL_for_Qt.txt -# Can be viewed in the About-Box: -# CONTRIBUTORS AUTHORS -%{_libdir}/lib%{name}_*.so.* -%{_libdir}/%{name}/ -%{_bindir}/qgis* -%{_mandir}/man1/%{name}* -%{_libexecdir}/%{name} -%dir %{_datadir}/%{name}/ -%{_datadir}/pixmaps/%{name}.png -%{_datadir}/applications/fedora-%{name}.desktop -%dir %{_datadir}/%{name}/i18n/ +#TODO: Update FSF address or ship a GPLv3+ license file +#TODO: Encoding problem on the help page +# CONTRIBUTORS and AUTHORS are intended be viewed in the About-Box +%doc BUGS ChangeLog CODING COPYING Exception_to_GPL_for_Qt.txt PROVENANCE README +# QGIS shows these files in the GUI %{_datadir}/%{name}/doc + +%dir %{_datadir}/%{name}/i18n/ +%lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm +%{_libdir}/lib%{name}*.so.* +%{_libdir}/%{name} +%{_bindir}/%{name} +%{_mandir}/man1/%{name}* +%dir %{_datadir}/%{name}/ +%{_datadir}/mime/packages/qgis.xml +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/16x16/apps/%{name}.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}/applications/fedora-%{name}.desktop %{_datadir}/%{name}/images %{_datadir}/%{name}/resources %{_datadir}/%{name}/svg -%{_datadir}/%{name}/themes -%exclude %{_libdir}/%{name}/*grass* -%exclude %{_datadir}/%{name}/themes/default/grass -%exclude %{_datadir}/%{name}/themes/gis/grass -%exclude %{_datadir}/%{name}/themes/classic/grass +%if ! 0%{?rhel} +%exclude %{_libdir}/libqgisgrass.so.%{version} +%exclude %{_libdir}/%{name}/libgrassprovider.so +%exclude %{_libdir}/%{name}/libgrassrasterprovider.so +%exclude %{_libdir}/%{name}/libgrassplugin.so +%exclude %{_libdir}/%{name}/grass +%endif %files devel -%defattr(-,root,root,-) +%{_datadir}/%{name}/FindQGIS.cmake %{_includedir}/%{name} -%{_libdir}/lib%{name}_*.so -%{_libdir}/lib%{name}python.so -%{_libdir}/lib%{name}grass.so +%{_libdir}/lib%{name}*.so +%if ! 0%{?rhel} %files grass -%defattr(-,root,root,-) %{_libdir}/lib%{name}grass.so.%{version} -%{_libdir}/%{name}/libgrass*.so +%{_libdir}/%{name}/libgrassprovider.so +%{_libdir}/%{name}/libgrassrasterprovider.so +%{_libdir}/%{name}/libgrassplugin.so %{_libdir}/%{name}/grass %{_datadir}/%{name}/grass -%{_datadir}/%{name}/themes/default/grass -%{_datadir}/%{name}/themes/gis/grass -%{_datadir}/%{name}/themes/classic/grass +%{_datadir}/%{name}/themes +%endif %files python -%defattr(-,root,root,-) %{_libdir}/lib%{name}python.so.* %{_datadir}/%{name}/python %{python_sitearch}/%{name} +%files mapserver +%doc src/mapserver/admin.sld src/mapserver/wms_metadata.xml %{name}-mapserver-README.fedora +%doc %{name}-mapserver-lighttpd.conf +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-mapserver.conf +%{_libexecdir}/%{name} + %changelog -* Sat Feb 25 2011 Volker Fröhlich - 1.6.0-7 -- Added buildroot -- Corrected window title -- Removed encoding key from desktop file and corrected categories - -* Tue Feb 08 2011 Fedora Release Engineering - 1.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Feb 02 2011 Volker Fröhlich - 1.6.0-5 -- Remove libspatialite BR -- Forgot to turn off smp-flags - -* Wed Feb 02 2011 Volker Fröhlich - 1.6.0-4 -- Patch for SIP 4.12 -- Changed path for QGIS mapserver -- Simplified files section - -* Wed Nov 24 2010 Volker Fröhlich - 1.6.0-3 -- Rebuild for GRASS 6.4 +* Mon Jun 26 2011 Volker Fröhlich - 1.7.0-1 +- Update for 1.7 +- License is now GPLv3+ (Sqlanyconnect) +- Add mapserver sub-package and require mod_fcgi +- Use upstreams current description text +- Drop now needless iconv +- Rename new Serbian translations +- Install MIME type definitions and icons +- Add Readme file and sample configuration for Mapserver +- Add patch to avoid segfault when geo-referencing +- Add conditional for Spatialite and PPC64 +- Add conditional for GRASS and EPEL +- Delete bundled libspatialite before building +- Removed glob from /usr/bin/qgis in files section * Thu Nov 11 2010 Volker Fröhlich - 1.6.0-2 - Disabled smp-flags again diff --git a/sources b/sources index 380b213..6a9a53d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cac100a4504675102dfc5520cb46fa92 qgis_1.6.0.tar.gz +d8506990f52563d39c7b916f500f282f qgis-1.7.0.tar.bz2