[dd2] Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077

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


commit 93281771af3032d541873623799df2d5e1ae4bf0
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Feb 18 17:31:01 2013 -0800

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

 dd2.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/dd2.spec b/dd2.spec
index 5b044b7..62d3e35 100644
--- a/dd2.spec
+++ b/dd2.spec
@@ -1,6 +1,6 @@
 Name:           dd2
 Version:        0.2.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Dodgin' Diamond 2 - Shoot'em up arcade game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -44,7 +44,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-hiscore \
 
 # 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/24x24/apps
@@ -74,12 +77,19 @@ fi
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %attr(2755,root,games) %{_bindir}/%{name}
 %{_datadir}/%{name}
+%if 0%{?fedora} && 0%{?fedora} < 19
 %{_datadir}/applications/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/fedora-%{name}.desktop
+%endif
 %{_datadir}/icons/hicolor/24x24/apps/%{name}.png
 %config(noreplace) %attr (0664,root,games) %{_var}/games/%{name}-hiscore
 
 
 %changelog
+* Mon Feb 18 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2.2-10
+- Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list