From 831fcfc35f4c1c9c756acdbd839e7b568cf50777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sun, 27 Mar 2016 15:01:28 +0200 Subject: [PATCH] Resolve sub-package dependency issue and 2.14.1 - Resolve the false sub-package dependency of python on server --- qgis.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/qgis.spec b/qgis.spec index 74072a0..8c452ce 100644 --- a/qgis.spec +++ b/qgis.spec @@ -14,8 +14,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.14.0 -Release: 5%{?dist} +Version: 2.14.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -35,9 +35,6 @@ Source4: %{name}-server-README.fedora # Based on debian/qgis.xml but excluding already defined or proprietary types Source5: %{name}-mime.xml -# https://github.com/qgis/QGIS/commit/30449e577f0cd432bd8c60787743fba54c1e51b9.patch -Patch0: %{name}-2.14.0-mssql-attributes.patch - # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: # http://code.google.com/p/pyspatialite/issues/detail?id=3 @@ -178,8 +175,6 @@ Please refer to %{name}-server-README.fedora for details! %prep %setup -q -%patch0 -p1 -b .~mssql - # Remove executable permissions from source code files find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ @@ -397,15 +392,23 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/%{name}/python/ %{python_sitearch}/%{name}/ %{python_sitearch}/PyQt4/uic/widget-plugins/ +%exclude %{python_sitearch}/%{name}/server/ +%exclude %{python_sitearch}/%{name}/_server.so %files server %doc src/server/admin.sld src/server/wms_metadata.xml %{name}-server-README.fedora %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf %{_libdir}/lib%{name}_server.so.* %{_libexecdir}/%{name}/ +%{python_sitearch}/%{name}/server/ +%{python_sitearch}/%{name}/_server.so %changelog +* Sun Mar 27 2016 Volker Froehlich - 2.14.1-1 +- New upstream release +- Resolve the false sub-package dependency of python on server + * Fri Mar 25 2016 Devrim Gündüz - 2.14.0-5 - Depend exclusively against GRASS => 7.0.3