[packages/vim] use upstream vim.desktop
glen
glen at pld-linux.org
Mon Dec 28 07:17:04 CET 2015
commit 79079f3d946d7187d81eca676e03960d19a59f9d
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Dec 28 08:16:27 2015 +0200
use upstream vim.desktop
however use previous Categories, just in case
desktop.patch | 10 ++++++++++
vim.desktop | 18 ------------------
vim.spec | 5 ++---
3 files changed, 12 insertions(+), 21 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index b7ea6c4..97214d2 100644
--- a/vim.spec
+++ b/vim.spec
@@ -59,7 +59,6 @@ Source10: g%{name}-athena.desktop
Source11: g%{name}-motif.desktop
Source12: g%{name}-gtk.desktop
Source13: g%{name}-gnome.desktop
-Source14: %{name}.desktop
Source15: update-source.sh
# syntax files
# http://www.vim.org/scripts/script.php?script_id=1491 (0.7.5)
@@ -112,6 +111,7 @@ Patch36: %{name}-ft-lib-udevrules.patch
Patch37: %{name}-ft-mysql.patch
Patch38: %{name}-ft-gyp.patch
Patch39: %{name}-revert-7.4.165-noundo.patch
+Patch40: desktop.patch
URL: http://www.vim.org/
BuildRequires: acl-devel
BuildRequires: autoconf
@@ -779,6 +779,7 @@ jak również GUI GTK+2.
%patch37 -p1
%patch38 -p1
%patch39 -p1
+%patch40 -p1
cp -p %{SOURCE20} runtime/syntax
cp -p %{SOURCE22} runtime/syntax
@@ -1020,8 +1021,6 @@ ln -sf vi $RPM_BUILD_ROOT/bin/ex
ln -sf vi $RPM_BUILD_ROOT/bin/view
ln -sf vi $RPM_BUILD_ROOT/bin/rview
-cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_desktopdir}
-
%if %{with athena}
install -p src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena
cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_desktopdir}
diff --git a/desktop.patch b/desktop.patch
new file mode 100644
index 0000000..898c5b9
--- /dev/null
+++ b/desktop.patch
@@ -0,0 +1,10 @@
+--- vim-7.4.979/runtime/vim.desktop~ 2015-12-19 16:28:18.000000000 +0200
++++ vim-7.4.979/runtime/vim.desktop 2015-12-28 08:15:06.355590605 +0200
+@@ -75,6 +75,6 @@
+ Terminal=true
+ Type=Application
+ Icon=gvim
+-Categories=Utility;TextEditor;
++Categories=ConsoleOnly;TextEditor;
+ StartupNotify=false
+ MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
diff --git a/vim.desktop b/vim.desktop
deleted file mode 100644
index 2653c35..0000000
--- a/vim.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Vim
-Comment=Vi IMproved - a Vi clone
-Comment[de]=VIsual editor iMproved
-Comment[es]=Editor visual incrementado
-Comment[fr]=Editeur VIM : VIsual editor iMproved
-Comment[pl]=Vi IMproved - klon edytora Vi
-Comment[pt_BR]=Editor visual incrementado
-Comment[ru]=Visual editor IMproved - ĺÄÉÎÓÔ×ĹÎÎĎ đŇÁ×ÉĚŘÎŮĘ ňĹÄÁËÔĎŇ :)
-Comment[tr]=Geliţmiţ bir vi sürümü
-Comment[uk]=Visual editor IMproved - ´ÄÉÎĎ ÷ŚŇÎÉĘ ňĹÄÁËÔĎŇ :)
-Exec=vim
-Icon=vim
-MimeType=text/plain;
-Terminal=true
-Type=Application
-Categories=ConsoleOnly;TextEditor;
-# vi: encoding=utf-8
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/79079f3d946d7187d81eca676e03960d19a59f9d
More information about the pld-cvs-commit
mailing list