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

Toshio くらとみ toshio at fedoraproject.org
Fri Feb 15 16:36:46 UTC 2013


commit eb3a23e0d0f4e40ae93b9eef27bb9482840d3b89
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Feb 15 08:36:37 2013 -0800

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

 magicmaze.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/magicmaze.spec b/magicmaze.spec
index 97e9255..482a4a9 100644
--- a/magicmaze.spec
+++ b/magicmaze.spec
@@ -1,6 +1,6 @@
 Name:           magicmaze
 Version:        1.0.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Board game featuring a maze which the players change each turn
 Group:          Amusements/Games
 License:        zlib and Redistributable, no modification permitted
@@ -49,7 +49,10 @@ make -f makefile.unx install PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
 # 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
@@ -75,11 +78,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc license.txt docs/readme.txt docs/todo.txt
 %{_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
+* Fri Feb 15 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.2-10
+- Remove --vendor from desktop-file-install on F19+ https://fedorahosted.org/fesco/ticket/1077
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list