[kbilliards] Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077

Toshio くらとみ toshio at fedoraproject.org
Wed Mar 6 21:57:10 UTC 2013


commit b7fdadd500b3d3f4bd2e21dfab14bd2614c780bc
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Mar 6 13:57:03 2013 -0800

    Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077

 kbilliards.spec |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/kbilliards.spec b/kbilliards.spec
index c69964b..2d5be08 100644
--- a/kbilliards.spec
+++ b/kbilliards.spec
@@ -1,6 +1,9 @@
 Name:           kbilliards
+# Note: the "b" in 0.8.7b is supposed to go in the Release tag.
+# Keep that in mind when/if you next upgrade the package
+# https://fedoraproject.org/wiki/Packaging:NamingGuidelines
 Version:        0.8.7b
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        A Fun Billiards Simulator Game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -47,7 +50,11 @@ popd
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+  --vendor fedora \
+%endif
+  --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications --remove-key=DocPath \
   --add-category Simulation \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Games/%{name}.desktop
@@ -77,11 +84,18 @@ fi
 %doc AUTHORS COPYING ChangeLog TODO src/NOATUN_AUTHORS
 %{_bindir}/%{name}
 %{_datadir}/apps/%{name}
+%if 0%{?fedora} && 0%{?fedora} < 19
 %{_datadir}/applications/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/%{name}.desktop
+%endif
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 
 %changelog
+* Wed Mar  6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.7b-16
+- Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7b-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list