[vim] Only use --vendor for desktop-file-install on F18 or less

Toshio くらとみ toshio at fedoraproject.org
Fri Feb 15 22:20:38 UTC 2013


commit 2a1fde9bf45a6105e75dd48695365b4115a3af46
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Feb 15 14:20:22 2013 -0800

    Only use --vendor for desktop-file-install on F18 or less

 vim.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index da4aaee..966d1a5 100644
--- a/vim.spec
+++ b/vim.spec
@@ -24,7 +24,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -1954,7 +1954,10 @@ install -p -m644 %{SOURCE10} \
   ln -sf gvim ./%{_bindir}/vimx
   %if "%{desktop_file}" == "1"
     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 \
         %{SOURCE3}
         # --add-category "Development;TextEditor;X-Red-Hat-Base" D\
@@ -2269,6 +2272,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Feb 15 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 7.3.797-2
+- Only use --vendor for desktop-file-install on F18 or less
+
 * Thu Jan 31 2013 Karsten Hopp <karsten at redhat.com> 7.3.797-1
 - patchlevel 797
 


More information about the scm-commits mailing list