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

Resolve sub-package dependency issue and 2.14.1

Browse Source 
- Resolve the false sub-package dependency of python on server
This commit is contained in:
Volker Fröhlich 2016-03-27 15:01:28 +02:00
parent d0a180c9dc
commit 831fcfc35f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qgis.spec
View File

@ -14,8 +14,8 @@
#TODO: Run test suite (see debian/rules) #TODO: Run test suite (see debian/rules)
Name: qgis Name: qgis
Version: 2.14.0 Version: 2.14.1
Release: 5%{?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
@ -35,9 +35,6 @@ Source4: %{name}-server-README.fedora
# Based on debian/qgis.xml but excluding already defined or proprietary types # Based on debian/qgis.xml but excluding already defined or proprietary types
Source5: %{name}-mime.xml 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) # Some plug-ins need Pyspatialite (bundled)
# The license is not totally clear, see: # The license is not totally clear, see:
# http://code.google.com/p/pyspatialite/issues/detail?id=3 # http://code.google.com/p/pyspatialite/issues/detail?id=3
@ -178,8 +175,6 @@ Please refer to %{name}-server-README.fedora for details!
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .~mssql
# 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 {} \+
@ -397,15 +392,23 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_datadir}/%{name}/python/ %{_datadir}/%{name}/python/
%{python_sitearch}/%{name}/ %{python_sitearch}/%{name}/
%{python_sitearch}/PyQt4/uic/widget-plugins/ %{python_sitearch}/PyQt4/uic/widget-plugins/
%exclude %{python_sitearch}/%{name}/server/
%exclude %{python_sitearch}/%{name}/_server.so
%files server %files server
%doc src/server/admin.sld src/server/wms_metadata.xml %{name}-server-README.fedora %doc src/server/admin.sld src/server/wms_metadata.xml %{name}-server-README.fedora
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf
%{_libdir}/lib%{name}_server.so.* %{_libdir}/lib%{name}_server.so.*
%{_libexecdir}/%{name}/ %{_libexecdir}/%{name}/
%{python_sitearch}/%{name}/server/
%{python_sitearch}/%{name}/_server.so
%changelog %changelog
* Sun Mar 27 2016 Volker Froehlich <volker27@gmx.at> - 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 <devrim@gunduz.org> - 2.14.0-5 * Fri Mar 25 2016 Devrim Gündüz <devrim@gunduz.org> - 2.14.0-5
- Depend exclusively against GRASS => 7.0.3 - Depend exclusively against GRASS => 7.0.3