[pioneers] Removed --vendor from desktop-file-install for F19+ https://fedorahosted.org/fesco/ticket/1077
Toshio くらとみ
toshio at fedoraproject.org
Tue Feb 19 01:26:31 UTC 2013
commit f0a0235933e0bce00b9e8b64934c9508fd61f13c
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Mon Feb 18 17:26:19 2013 -0800
Removed --vendor from desktop-file-install for F19+ https://fedorahosted.org/fesco/ticket/1077
pioneers.spec | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/pioneers.spec b/pioneers.spec
index ef46f32..4eb49c8 100644
--- a/pioneers.spec
+++ b/pioneers.spec
@@ -1,6 +1,6 @@
Name: pioneers
Version: 14.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Turnbased board strategy game (colonize an island)
Group: Amusements/Games
License: GPLv2+
@@ -60,7 +60,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}/splash.png
# Reinstall the .desktop files
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --delete-original \
+%if 0%{?fedora} && 0%{?fedora} < 19
+ --vendor fedora \
+%endif
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}-editor.desktop \
@@ -98,8 +101,13 @@ scrollkeeper-update -q || :
%{_datadir}/omf/%{name}
%{_datadir}/gnome/help/%{name}
%{_mandir}/man6/%{name}*.6.gz
+%if 0%{?fedora} && 0%{?fedora} < 19
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/applications/fedora-%{name}-server.desktop
+%else
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{name}-server.desktop
+%endif
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/pixmaps/%{name}-server.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
@@ -110,12 +118,19 @@ scrollkeeper-update -q || :
%files editor
%defattr(-,root,root,-)
%{_bindir}/%{name}-editor
+%if 0%{?fedora} && 0%{?fedora} < 19
%{_datadir}/applications/fedora-%{name}-editor.desktop
+%else
+%{_datadir}/applications/%{name}-editor.desktop
+%endif
%{_datadir}/pixmaps/%{name}-editor.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}-editor.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}-editor.svg
%changelog
+* Mon Feb 18 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 14.1-4
+- Removed --vendor from desktop-file-install for F19+ https://fedorahosted.org/fesco/ticket/1077
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list