Update to 2.8.1 and rename mapserver sub-package

This commit is contained in:
Volker Fröhlich 2015-03-09 08:42:47 +01:00
parent a130d8efeb
commit 553816f6a4
5 changed files with 42 additions and 39 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ qgis_1.5.0.tar.gz
/qgis-2.4.0.tar.bz2 /qgis-2.4.0.tar.bz2
/qgis-2.6.0.tar.bz2 /qgis-2.6.0.tar.bz2
/qgis-2.6.1.tar.bz2 /qgis-2.6.1.tar.bz2
/qgis-2.8.1.tar.bz2

View File

@ -1,14 +1,14 @@
================================================== ==================================================
QGIS Mapserver (might be renamed to "QGIS server") QGIS server
================================================== ==================================================
QGIS Mapserver allows you to publish your QGIS projects as Web Map QGIS server allows you to publish your QGIS projects as Web Map
Services (WMS). Simply layout your map in QGIS. The WMS will look Services (WMS). Simply layout your map in QGIS. The WMS will look
exactly the same, because QGIS Mapserver uses the same libraries for exactly the same, because QGIS server uses the same libraries for
rendering, as the desktop application does. rendering, as the desktop application does.
A sample configuration file for Httpd is installed under A sample configuration file for Httpd is installed under
/etc/httpd/conf.d/qgis-mapserver.conf. /etc/httpd/conf.d/qgis-server.conf.
This configuration expects QGIS project files under /var/www/wms. To This configuration expects QGIS project files under /var/www/wms. To
use it, reload the Httpd configuration and place the files you want to use it, reload the Httpd configuration and place the files you want to
@ -21,7 +21,7 @@ http://localhost/wms/my_qgis_project?SERVICE=WMS&REQUEST=GetCapabilities&VERSION
QGIS project is "/var/www/wms/my_qgis_project.qgs". The sample QGIS project is "/var/www/wms/my_qgis_project.qgs". The sample
configuration automatically adds the project file extension for you. configuration automatically adds the project file extension for you.
The actual data can stay where it is. Make sure QGIS Mapserver can The actual data can stay where it is. Make sure QGIS server can
access the project file and don't forget to let Httpd reload its access the project file and don't forget to let Httpd reload its
configuration before sending your requests! configuration before sending your requests!
@ -31,7 +31,7 @@ You can easily test your WMS by adding it as a WMS layer in QGIS.
================================================== ==================================================
The traditional QGIS Mapserver configuration is less comfortable and The traditional QGIS server configuration is less comfortable and
I don't encourage it, unless you have a good reason to use it: I don't encourage it, unless you have a good reason to use it:
This approach only allows for a single map service. This approach only allows for a single map service.

View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=Quantum GIS
GenericName=Geographic Information System
Comment=
Exec=qgis
Icon=qgis
Terminal=false
Type=Application
Categories=Education;Geography;Science;

View File

@ -12,8 +12,8 @@
#TODO: Run test suite (see debian/rules) #TODO: Run test suite (see debian/rules)
Name: qgis Name: qgis
Version: 2.6.1 Version: 2.8.1
Release: 2%{?dist} Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering Group: Applications/Engineering
@ -25,9 +25,9 @@ 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
# Sample configuration files for QGIS mapserver # Sample configuration files for QGIS server
Source2: %{name}-mapserver-httpd.conf Source2: %{name}-server-httpd.conf
Source4: %{name}-mapserver-README.fedora Source4: %{name}-server-README.fedora
# MIME definitions # MIME definitions
# Based on debian/qgis.xml but excluding already defined or proprietary types # Based on debian/qgis.xml but excluding already defined or proprietary types
@ -153,19 +153,21 @@ Requires: qscintilla-python
%description python %description python
Python integration and plug-ins for QGIS. Python integration and plug-ins for QGIS.
%package mapserver %package server
Summary: FCGI based OGC web map server Summary: FCGI-based OGC web map server
Group: Applications/Engineering Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: mod_fcgid Requires: mod_fcgid
Provides: mapserver = %{version}-%{release}
Obsoletes: mapserver < 2.8.1-1
%description mapserver %description server
This FastCGI OGC web map server implements OGC WMS 1.3.0 and 1.1.1. 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 services are prepared as regular projects in QGIS. They're rendered using
the QGIS libraries. The server also supports SLD (Styled Layer Descriptor) the QGIS libraries. The server also supports SLD (Styled Layer Descriptor)
for styling. Sample configurations for Httpd and Lighttpd are included. for styling. Sample configurations for Httpd and Lighttpd are included.
Please refer to %{name}-mapserver-README.fedora for details! Please refer to %{name}-server-README.fedora for details!
%prep %prep
%setup -q %setup -q
@ -174,7 +176,7 @@ Please refer to %{name}-mapserver-README.fedora for details!
# Remove executable permissions from source code files # Remove executable permissions from source code files
find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
# Readme file for QGIS mapserver configuration and Lighttpd example # Readme file for QGIS server configuration and Lighttpd example
install -pm0644 %{SOURCE4} . install -pm0644 %{SOURCE4} .
# Delete bundled libs # Delete bundled libs
@ -219,6 +221,7 @@ gzip ChangeLog
-D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \ -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
-D WITH_INTERNAL_SIX:BOOL=FALSE \ -D WITH_INTERNAL_SIX:BOOL=FALSE \
-D WITH_PYSPATIALITE:BOOL=FALSE \ -D WITH_PYSPATIALITE:BOOL=FALSE \
-D WITH_SERVER:BOOL=TRUE \
-D WITH_TOUCH:BOOL=TRUE \ -D WITH_TOUCH:BOOL=TRUE \
%{configure_with_spatialite} \ %{configure_with_spatialite} \
. .
@ -260,13 +263,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}-icon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -pm0644 \ install -pm0644 \
images/icons/%{name}-icon-16x16.png \ images/icons/%{name}-icon-16x16.png \
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}-icon.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
install -pm0644 \ install -pm0644 \
images/icons/%{name}_icon.svg \ images/icons/%{name}_icon.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.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
@ -277,9 +280,9 @@ install -pm0644 \
# Install basic QGIS Mapserver configuration for Apache # Install basic QGIS Mapserver configuration for Apache
install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d
install -pm0644 %{SOURCE2} \ install -pm0644 %{SOURCE2} \
%{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-mapserver.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-server.conf
# See qgis-mapserver-README.fedora # See qgis-server-README.fedora
rm -f %{buildroot}%{_libexecdir}/%{name}/wms_metadata.xml rm -f %{buildroot}%{_libexecdir}/%{name}/wms_metadata.xml
rm -f %{buildroot}%{_libexecdir}/%{name}/admin.sld rm -f %{buildroot}%{_libexecdir}/%{name}/admin.sld
@ -331,6 +334,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
# QGIS shows the following files in the GUI, including the license text # QGIS shows the following files in the GUI, including the license text
%doc %{_datadir}/%{name}/doc/ %doc %{_datadir}/%{name}/doc/
%dir %{_datadir}/%{name}/i18n/ %dir %{_datadir}/%{name}/i18n/
%lang(zh-Hans) %{_datadir}/%{name}/i18n/%{name}_zh-Hans.qm
%if 0%{?rhel} %if 0%{?rhel}
%lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm %lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm
%endif %endif
@ -338,6 +342,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_libdir}/lib%{name}_core.so.* %{_libdir}/lib%{name}_core.so.*
%{_libdir}/lib%{name}_gui.so.* %{_libdir}/lib%{name}_gui.so.*
%{_libdir}/lib%{name}_networkanalysis.so.* %{_libdir}/lib%{name}_networkanalysis.so.*
%{_libdir}/lib%{name}_server.so.*
%{_libdir}/%{name}/ %{_libdir}/%{name}/
%{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so %{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so
%{_bindir}/%{name} %{_bindir}/%{name}
@ -346,11 +351,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /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}-icon.png %{_datadir}/pixmaps/%{name}.png
%{_datadir}/icons/hicolor/16x16/apps/%{name}-icon.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-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}-icon.svg %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/applications/*%{name}.desktop %{_datadir}/applications/*%{name}.desktop
%{_datadir}/applications/qbrowser.desktop %{_datadir}/applications/qbrowser.desktop
%{_datadir}/%{name}/images/ %{_datadir}/%{name}/images/
@ -382,13 +387,19 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{python_sitearch}/%{name}/ %{python_sitearch}/%{name}/
%{python_sitearch}/PyQt4/uic/widget-plugins/ %{python_sitearch}/PyQt4/uic/widget-plugins/
%files mapserver %files server
%doc src/mapserver/admin.sld src/mapserver/wms_metadata.xml %{name}-mapserver-README.fedora %doc src/server/admin.sld src/server/wms_metadata.xml %{name}-server-README.fedora
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-mapserver.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf
%{_libexecdir}/%{name}/ %{_libexecdir}/%{name}/
%changelog %changelog
* Sun Mar 8 2015 Volker Fröhlich <volker27@gmx.at> - 2.8.1-1
- New upstream release, remove included patch change
- Rename mapserver sub-package to server
- Add a new locale not found by find_lang
- Partly solve the icon file naming issue (BZ#1166977)
* Thu Feb 19 2015 Dave Johansen <davejohansen@gmail.com> 2.6.1-2 * Thu Feb 19 2015 Dave Johansen <davejohansen@gmail.com> 2.6.1-2
- Rebuild for gcc 5.0 C++ ABI change - Rebuild for gcc 5.0 C++ ABI change

View File

@ -1 +1 @@
e6d4233b5f8d4c7a77e289a9c794089f qgis-2.6.1.tar.bz2 3f8d66edc81afd7386338430fad4527b qgis-2.8.1.tar.bz2