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

[Toshio くらとみ]

commit ba599b2422f41a988071786a22b43ee4e75c643c
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Mar 6 14:13:01 2013 -0800

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

 jmol.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/jmol.spec b/jmol.spec
index 29fd7af..83a4c85 100644
--- a/jmol.spec
+++ b/jmol.spec
@@ -1,6 +1,6 @@
 Name:		jmol
 Version:	12.0.48
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 # most is LGPLv2+, src/com/obrador is combination of IJG and BSD
@@ -129,7 +129,11 @@ install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 %jpackage_script org.openscience.jmol.app.Jmol "" "" Jmol:commons-cli:vecmath:itext jmol true
 
 # Install desktop file
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=fedora jmol.desktop
+desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
+  --vendor=fedora \
+%endif
+  jmol.desktop
 
 # Javadoc files
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -145,7 +149,11 @@ rm -rf %{buildroot}
 %{_javadir}/Jmol.jar
 %{_javadir}/JmolApplet.jar
 %{_datadir}/pixmaps/%{name}.png
+%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
 %{_datadir}/applications/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/%{name}.desktop
+%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -156,6 +164,9 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* Wed Mar  6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 12.0.48-10
+- 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> - 12.0.48-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild