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

Toshio くらとみ toshio at fedoraproject.org
Wed Mar 6 23:26:42 UTC 2013


commit a84f7a2db1024c18cad07a731f519e9f92e21a2d
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Mar 6 15:26:31 2013 -0800

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

 pyvnc2swf.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/pyvnc2swf.spec b/pyvnc2swf.spec
index ddae87f..fd8e23a 100644
--- a/pyvnc2swf.spec
+++ b/pyvnc2swf.spec
@@ -3,7 +3,7 @@
 Summary: VNC screen recorder
 Name:    pyvnc2swf
 Version: 0.9.5
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group:   System Environment/Base
 URL:     http://www.unixuser.org/~euske/vnc2swf/pyvnc2swf.html
@@ -64,7 +64,10 @@ install -p -m 644 %{SOURCE1} \
         %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 mkdir -p %{buildroot}%{_datadir}/applications
-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 %{SOURCE2}
 desktop-file-install \
     --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
@@ -96,7 +99,11 @@ update-desktop-database &> /dev/null || :
 %{python_sitelib}/pyvnc2swf
 %{_bindir}/vnc2swf*
 %{_bindir}/recordwin.sh
+%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
 %{_datadir}/applications/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/%{name}.desktop
+%endif
 %{_datadir}/applications/%{name}-play.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
@@ -104,6 +111,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Wed Mar  6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.9.5-14
+- 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.9.5-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list