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

Toshio くらとみ toshio at fedoraproject.org
Thu Mar 7 00:11:24 UTC 2013


commit f43b6b4d4c40b8dbbd5cea05275e6e252c68aaba
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Mar 6 16:11:13 2013 -0800

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

 pikloops.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/pikloops.spec b/pikloops.spec
index 3a7a3a1..2d9820e 100644
--- a/pikloops.spec
+++ b/pikloops.spec
@@ -1,6 +1,6 @@
 Name:		pikloops
 Version:	0.2.5
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Code generator for PIC delays
 Summary(fr):	Générateur de code de temporisation pour PIC
 
@@ -35,7 +35,10 @@ de développement Pikdev ou Piklab.
 %{__make} DESTDIR=%{buildroot} install
 %{__rm} -f %{buildroot}%{_datadir}/applnk/Applications/%{name}.desktop
 
-desktop-file-install --vendor=fedora \
+desktop-file-install \
+%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
+  --vendor=fedora \
+%endif
   --dir %{buildroot}%{_datadir}/applications \
   --delete-original \
   src/%{name}.desktop
@@ -75,12 +78,19 @@ fi
 %defattr(-, root, root)
 %doc AUTHORS COPYING
 %{_bindir}/*
+%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
 %{_datadir}/applications/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/%{name}.desktop
+%endif
 %{_datadir}/apps/%{name}/
 %{_datadir}/doc/HTML/*/%{name}/
 %{_datadir}/icons/crystalsvg/*/apps/%{name}.png
 
 %changelog
+* Wed Mar  6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2.5-11
+- 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.2.5-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list