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

Toshio くらとみ toshio at fedoraproject.org
Tue Feb 26 01:21:31 UTC 2013


commit 487e428891023225d3715365eab4e00336cb4f1c
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Feb 25 17:21:17 2013 -0800

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

 seahorse-adventures.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/seahorse-adventures.spec b/seahorse-adventures.spec
index 4a6760e..2de93b2 100644
--- a/seahorse-adventures.spec
+++ b/seahorse-adventures.spec
@@ -1,6 +1,6 @@
 Name:           seahorse-adventures
 Version:        1.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Help barbie the seahorse float on bubbles to the moon
 Group:          Amusements/Games
 License:        GPL+
@@ -49,7 +49,10 @@ ln -s ../share/%{name}/run_game.py $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 # 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/32x32/apps
@@ -79,11 +82,18 @@ fi
 %doc *.txt Seahorse-Adventures-license.eml
 %{_bindir}/%{name}
 %{_datadir}/%{name}
+%if 0%{?fedora} && 0%{?fedora} < 19
 %{_datadir}/applications/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/%{name}.desktop
+%endif
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Mon Feb 25 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0-12
+- Remove --vendor from desktop-file-install in F19+ https://fedorahosted.org/fesco/ticket/1077
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list