From 6371b075dd7efb1e27a30f28dd46d4c39ad9c212 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Nov 28 2016 11:51:26 +0000 Subject: do not ship vim.desktop --- diff --git a/vim.spec b/vim.spec index 25b960e..72a6a21 100644 --- a/vim.spec +++ b/vim.spec @@ -21,13 +21,12 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh Source2: vim.csh -Source3: gvim.desktop Source4: virc Source5: vimrc Source6: ftp://ftp.vim.org/pub/vim/patches/README.patches @@ -421,11 +420,11 @@ EOF --vendor fedora \ %endif --dir %{buildroot}/%{_datadir}/applications \ - %{SOURCE3} + %{_builddir}/%{vimdir}/runtime/gvim.desktop # --add-category "Development;TextEditor;X-Red-Hat-Base" D\ %else mkdir -p ./%{_sysconfdir}/X11/applnk/Applications - cp %{SOURCE3} ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop + cp %{_builddir}/%{vimdir}/runtime/gvim.desktop ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop %endif # ja_JP.ujis is obsolete, ja_JP.eucJP is recommended. ( cd ./%{_datadir}/%{name}/%{vimdir}/lang; \ @@ -738,6 +737,7 @@ rm -rf %{buildroot} %if "%{desktop_file}" == "1" %{_datadir}/appdata/*.appdata.xml /%{_datadir}/applications/* +%exclude /%{_datadir}/applications/vim.desktop %else /%{_sysconfdir}/X11/applnk/*/gvim.desktop %endif @@ -754,6 +754,9 @@ rm -rf %{buildroot} %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Nov 28 2016 Zdenek Dohnal - 2:8.0.104-2 +- do not ship vim.desktop + * Mon Nov 28 2016 Karsten Hopp 8.0.104-1 - patchlevel 104