From ea3d6f962b57bb14b4939292c48fdee2010d3fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Wed, 6 Jul 2011 22:46:39 +0200 Subject: [PATCH] LIBQGISPYTHON GOES INTO PYHTON SUB-PACKAGE - libqgispython was in the main package before - Correct FSF address - Remove icon path macros --- qgis.spec | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/qgis.spec b/qgis.spec index 8687bc1..1071ec4 100644 --- a/qgis.spec +++ b/qgis.spec @@ -9,7 +9,7 @@ Name: qgis Version: 1.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -153,8 +153,10 @@ Please refer to %{name}-mapserver-README.fedora for details! %patch1 -p1 -b .georef %patch2 -p1 -b .histogram -#TODO: Update FSF address or ship a GPLv3+ license file +# Update FSF address or ship a GPLv3+ license file # http://hub.qgis.org/issues/3789 +sed -i 's/59 Temple Place, Suite 330/51 Franklin Street, Fifth Floor/' COPYING +sed -i 's/02111-1307/02110-1301/' COPYING # Readme file for QGIS mapserver configuration and Lighttpd sample install -pm0644 %{SOURCE4} . @@ -215,9 +217,9 @@ install -pm0644 %{SOURCE5} \ # 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 -pd %{buildroot}%{_datadir}/icons/hicolor/16x16/apps +install -pd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps +install -pd %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes install -pm0644 \ %{buildroot}%{_datadir}/%{name}/images/icons/%{name}-icon.png \ %{buildroot}%{_datadir}/pixmaps/%{name}.png @@ -299,7 +301,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_datadir}/%{name}/i18n/ %lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm -%{_libdir}/lib%{name}*.so.* +%{_libdir}/lib%{name}_analysis.so.%{version} +%{_libdir}/lib%{name}_core.so.%{version} +%{_libdir}/lib%{name}_gui.so.%{version} +%{_libdir}/lib%{name}sqlanyconnection.so.%{version} %{_libdir}/%{name} %{_bindir}/%{name} %{_mandir}/man1/%{name}* @@ -339,7 +344,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %files python -%{_libdir}/lib%{name}python.so.* +%{_libdir}/libqgispython.so.%{version} %{_datadir}/%{name}/python %{python_sitearch}/%{name} @@ -349,6 +354,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libexecdir}/%{name} %changelog +* Mon Jul 06 2011 Volker Fröhlich - 1.7.0-4 +- Remove icon path macros, that don't work in EPEL +- Avoid creating unnecessary directories there +- Be explicit about the shared lib names in the files section +- Put libqgispython.so.1.7.0 in Python sub-package +- Correct FSF address + * Mon Jul 06 2011 Volker Fröhlich - 1.7.0-3 - Withdraw immature Lighty configuration - Update README and provide a better sample configuration,