[stormbaancoureur] Remove --vendor from desktop-file-install in F19+. https://fedorahosted.org/fesco/ticket/1077

Toshio くらとみ toshio at fedoraproject.org
Sun Feb 24 22:33:31 UTC 2013


commit 3b1f5254155a1d30caa6f752a3f99d1ffa27974d
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Sun Feb 24 14:33:22 2013 -0800

    Remove --vendor from desktop-file-install in F19+. https://fedorahosted.org/fesco/ticket/1077

 stormbaancoureur.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/stormbaancoureur.spec b/stormbaancoureur.spec
index 62406f7..eb52c48 100644
--- a/stormbaancoureur.spec
+++ b/stormbaancoureur.spec
@@ -1,6 +1,6 @@
 Name:           stormbaancoureur
 Version:        2.1.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simulated obstacle course for automobiles
 Group:          Amusements/Games
 License:        GPLv2+
@@ -61,7 +61,10 @@ ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora            \
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+  --vendor fedora            \
+%endif
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
@@ -93,11 +96,18 @@ fi
 %doc src-%{name}/debian/changelog
 %{_bindir}/%{name}*
 %{_datadir}/%{name}
+%if 0%{?fedora} && 0%{?fedora} < 19
 %{_datadir}/applications/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/%{name}.desktop
+%endif
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %changelog
+* Sun Feb 24 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 2.1.6-3
+- Remove --vendor from desktop-file-install in F19+. https://fedorahosted.org/fesco/ticket/1077
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list