diff --git a/.gitignore b/.gitignore index 9e34738..4741bb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,3 @@ -/qgis-2.18.0.tar.bz2 -/qgis-2.18.1.tar.bz2 -/qgis-2.18.2.tar.bz2 -/qgis-2.18.3.tar.bz2 -/qgis-2.18.4.tar.bz2 -/qgis-2.18.5.tar.bz2 -/qgis-2.18.6.tar.bz2 -/qgis-2.18.7.tar.bz2 -/qgis-2.18.8.tar.bz2 -/qgis-2.18.9.tar.bz2 -/qgis-2.18.10.tar.bz2 -/qgis-2.18.11.tar.bz2 -/qgis-2.18.12.tar.bz2 -/qgis-2.18.13.tar.bz2 -/qgis-2.18.14.tar.bz2 -/qgis-2.18.15.tar.bz2 -/qgis-2.18.16.tar.bz2 /qgis-2.18.17.tar.bz2 /qgis-2.18.18.tar.bz2 /qgis-2.18.19.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 5a01077..91ceb12 100644 --- a/qgis.spec +++ b/qgis.spec @@ -21,7 +21,7 @@ Name: qgis Version: 2.18.24 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://hub.qgis.org/issues/3789 @@ -83,7 +83,7 @@ BuildRequires: qextserialport-devel BuildRequires: qjson-devel BuildRequires: qscintilla-devel BuildRequires: qscintilla-python -BuildRequires: qscintilla-python-devel +BuildRequires: qscintilla-python2-devel BuildRequires: qt4-devel #BuildRequires: qt-mobility-devel BuildRequires: qt4-webkit-devel @@ -397,8 +397,8 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files -n python2-qgis %{_libdir}/libqgispython.so.* %{_datadir}/%{name}/python/ -%{python_sitearch}/%{name}/ -%{python_sitearch}/PyQt4/uic/widget-plugins/ +%{python2_sitearch}/%{name}/ +%{python2_sitearch}/PyQt4/uic/widget-plugins/ %exclude %{python_sitearch}/%{name}/server/ %exclude %{python_sitearch}/%{name}/_server.so @@ -407,11 +407,14 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %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 +%{python2_sitearch}/%{name}/server/ +%{python2_sitearch}/%{name}/_server.so %changelog +* Thu Nov 8 2018 Daniele ViganĂ² - 2.18.24-2 +- Sync with upstream + * Sat Sep 15 2018 Daniele ViganĂ² - 2.18.24-1 - New upstream release