This commit is contained in:
Toshio Kuratomi 2013-02-22 23:33:56 -08:00
parent bf308a193d
commit 94d070b31e

View File

@ -15,7 +15,7 @@
Name: qgis Name: qgis
Version: 1.8.0 Version: 1.8.0
Release: 12%{?dist} Release: 13%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
# Update FSF address or ship a GPLv3+ license file # Update FSF address or ship a GPLv3+ license file
@ -209,7 +209,10 @@ make install DESTDIR=%{buildroot}
chmod +x %{buildroot}%{python_sitearch}/%{name}/*.so chmod +x %{buildroot}%{python_sitearch}/%{name}/*.so
# Install desktop file # Install desktop file
desktop-file-install --vendor="fedora" \ desktop-file-install \
%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
--vendor="fedora" \
%endif
--dir=%{buildroot}%{_datadir}/applications \ --dir=%{buildroot}%{_datadir}/applications \
%{SOURCE1} %{SOURCE1}
@ -330,7 +333,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_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}.svg %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/applications/*%{name}.desktop
%{_datadir}/%{name}/images %{_datadir}/%{name}/images
%{_datadir}/%{name}/resources %{_datadir}/%{name}/resources
%{_datadir}/%{name}/svg %{_datadir}/%{name}/svg
@ -364,6 +367,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libexecdir}/%{name} %{_libexecdir}/%{name}
%changelog %changelog
* Fri Feb 22 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 1.8.0-13
- Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-12 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild