commit 3ed3142acd297c8cefc7099700b53d692608c630
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Jul 16 20:03:09 2018 +0200
- up to 8.1.0191
desktop.patch | 48 +++++++++++++++++++++++++++++-----------------
vim-localedir.patch | 5 +++--
vim-man_installation.patch | 8 +++++---
vim.spec | 4 ++--
4 files changed, 40 insertions(+), 25 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index 274c673..c699685 100644
--- a/vim.spec
+++ b/vim.spec
@@ -29,7 +29,7 @@
# wget ftp://ftp.vim.org/pub/editors/vim/patches/8.0/MD5SUMS -O - | tail -n1 |
awk '{print $2}'
# VCS Commits: https://github.com/vim/vim/commits/master
-%define ver 8.1.0042
+%define ver 8.1.0191
%define rel 1
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
@@ -50,7 +50,7 @@ License: Charityware
Group: Applications/Editors/Vim
#Source0: ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2
Source0: https://github.com/vim/vim/archive/v%{ver}.tar.gz
-# Source0-md5: 624f83d03fdc7aff666b42d948ca5194
+# Source0-md5: 5b1d5e0b490dc9d7830f66eab6ac5b70
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: bc4d1e115ca506ad7751b9bd2b773a7f
Source2: http://skawina.eu.org/mikolaj/usr_doc_pl.zip
diff --git a/desktop.patch b/desktop.patch
index ae1cbb8..f4ebd27 100644
--- a/desktop.patch
+++ b/desktop.patch
@@ -12,11 +12,11 @@
+++ vim-7.4.979/gvim-athena.desktop 2015-12-28 08:24:02.106735918 +0200
@@ -1,5 +1,5 @@
[Desktop Entry]
--Name=GVim
-+Name=GVim Athena
+-Name=gVim
++Name=gVim Athena
GenericName=Text Editor
+ GenericName[da]=Teksteditor
GenericName[de]=Texteditor
- Comment=Edit text files
@@ -71,7 +71,7 @@
Comment[zh_CN]=编辑文本文件
Comment[zh_TW]=編輯文字檔
@@ -29,22 +29,26 @@
Icon=gvim
--- vim-7.4.979/gvim-gnome.desktop~ 2015-12-28 08:32:38.000000000 +0200
+++ vim-7.4.979/gvim-gnome.desktop 2015-12-28 08:33:14.285396908 +0200
-@@ -1,8 +1,8 @@
+@@ -1,12 +1,12 @@
[Desktop Entry]
--Name=GVim
-+Name=GVim GNOME
+-Name=gVim
++Name=gVim GNOME
GenericName=Text Editor
+ GenericName[da]=Teksteditor
GenericName[de]=Texteditor
+ GenericName[eo]=Tekstoredaktilo
+ GenericName[fr]=Éditeur de texte
+ GenericName[pl]=Edytor tekstu
-Comment=Edit text files
+Comment=The vi editor for X Window System with GNOME L&F
Comment[af]=Redigeer tekslêers
Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
Comment[ar]=حرّر ملفات نصية
-@@ -50,7 +50,7 @@
+@@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
Comment[no]=Rediger tekstfiler
Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
--Comment[pl]=Edytor plików tekstowych
+-Comment[pl]=Edytuj pliki tekstowe
+Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja GNOME
Comment[pt]=Editar ficheiros de texto
Comment[pt_BR]=Edite arquivos de texto
@@ -66,22 +70,26 @@
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++;
--- vim-7.4.979/gvim-gtk.desktop~ 2015-12-19 16:28:18.000000000 +0200
+++ vim-7.4.979/gvim-gtk.desktop 2015-12-28 08:29:28.577015888 +0200
-@@ -1,8 +1,8 @@
+@@ -1,12 +1,12 @@
[Desktop Entry]
--Name=GVim
-+Name=GVim GTK
+-Name=gVim
++Name=gVim GTK
GenericName=Text Editor
+ GenericName[da]=Teksteditor
GenericName[de]=Texteditor
+ GenericName[eo]=Tekstoredaktilo
+ GenericName[fr]=Éditeur de texte
+ GenericName[pl]=Edytor tekstu
-Comment=Edit text files
+Comment=The vi editor for X Window System with GTK L&F
Comment[af]=Redigeer tekslêers
Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
Comment[ar]=حرّر ملفات نصية
-@@ -50,7 +50,7 @@
+@@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
Comment[no]=Rediger tekstfiler
Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
--Comment[pl]=Edytor plików tekstowych
+-Comment[pl]=Edytuj pliki tekstowe
+Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja GTK
Comment[pt]=Editar ficheiros de texto
Comment[pt_BR]=Edite arquivos de texto
@@ -103,22 +111,26 @@
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++;
--- vim-7.4.979/gvim-motif.desktop~ 2015-12-19 16:28:18.000000000 +0200
+++ vim-7.4.979/gvim-motif.desktop 2015-12-28 08:31:11.245677767 +0200
-@@ -1,8 +1,8 @@
+@@ -1,12 +1,12 @@
[Desktop Entry]
--Name=GVim
-+Name=GVim Motif
+-Name=gVim
++Name=gVim Motif
GenericName=Text Editor
+ GenericName[da]=Teksteditor
GenericName[de]=Texteditor
+ GenericName[eo]=Tekstoredaktilo
+ GenericName[fr]=Éditeur de texte
+ GenericName[pl]=Edytor tekstu
-Comment=Edit text files
+Comment=The vi editor for X Window System with Motif L&F
Comment[af]=Redigeer tekslêers
Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
Comment[ar]=حرّر ملفات نصية
-@@ -50,7 +50,7 @@
+@@ -55,7 +55,7 @@ Comment[nn]=Rediger tekstfiler
Comment[no]=Rediger tekstfiler
Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
--Comment[pl]=Edytor plików tekstowych
+-Comment[pl]=Edytuj pliki tekstowe
+Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja Motif
Comment[pt]=Editar ficheiros de texto
Comment[pt_BR]=Edite arquivos de texto
diff --git a/vim-localedir.patch b/vim-localedir.patch
index 0a24c44..46f3732 100644
--- a/vim-localedir.patch
+++ b/vim-localedir.patch
@@ -79,11 +79,12 @@
if test -d $(LANGSOURCE); then \
--- vim73/src/po/Makefile~ 2013-02-22 17:28:18.000000000 +0200
+++ vim73/src/po/Makefile 2013-02-22 17:46:40.771918175 +0200
-@@ -151,6 +151,7 @@
+@@ -38,6 +38,7 @@ check: $(CHECKFILES)
install: $(MOFILES) $(MOCONVERTED)
@$(MAKE) prefixcheck
+ install -d $(LOCALEDIR); \
- for lang in $(LANGUAGES) $(CONVERTED); do \
+ for lang in $(LANGUAGES); do \
dir=$(LOCALEDIR)/$$lang/; \
if test ! -x "$$dir"; then \
+
diff --git a/vim-man_installation.patch b/vim-man_installation.patch
index 223107f..bfd014f 100644
--- a/vim-man_installation.patch
+++ b/vim-man_installation.patch
@@ -119,14 +119,16 @@
-$(SHELL) ./installman.sh uninstall $(DEST_MAN_RU_U) ""
$(INSTALLMANARGS)
-$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
$(DEST_MAN) $(INSTALLMLARGS)
-@@ -2307,12 +2307,14 @@
+@@ -2672,6 +2672,8 @@ uninstall_runtime:
$(DEST_MAN_RU) $(INSTALLMLARGS)
-$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
$(DEST_MAN_RU_U) $(INSTALLMLARGS)
+ -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
+ $(DEST_MAN_RU_K) $(INSTALLMLARGS)
-rm -f $(DEST_MAN)/xxd.1
- -rm -f $(DEST_MAN_FR)/xxd.1 $(DEST_MAN_FR_I)/xxd.1
$(DEST_MAN_FR_U)/xxd.1
+ -rm -f $(DEST_MAN_DA)/xxd.1 $(DEST_MAN_DA_I)/xxd.1
$(DEST_MAN_DA_U)/xxd.1
+ -rm -f $(DEST_MAN_DE)/xxd.1 $(DEST_MAN_DE_I)/xxd.1
$(DEST_MAN_DE_U)/xxd.1
+@@ -2679,7 +2681,7 @@ uninstall_runtime:
-rm -f $(DEST_MAN_IT)/xxd.1 $(DEST_MAN_IT_I)/xxd.1
$(DEST_MAN_IT_U)/xxd.1
-rm -f $(DEST_MAN_JA_U)/xxd.1
-rm -f $(DEST_MAN_PL)/xxd.1 $(DEST_MAN_PL_I)/xxd.1
$(DEST_MAN_PL_U)/xxd.1
@@ -134,7 +136,7 @@
+ -rm -f $(DEST_MAN_RU)/xxd.1 $(DEST_MAN_RU_U)/xxd.1
$(DEST_MAN_RU_K)/xxd.1
-rm -f $(DEST_HELP)/*.txt $(DEST_HELP)/tags $(DEST_HELP)/*.pl
-rm -f $(DEST_HELP)/*.??x $(DEST_HELP)/tags-??
- -rm -f $(SYS_MENU_FILE) $(SYS_SYNMENU_FILE) $(SYS_DELMENU_FILE)
+ -rm -f $(SYS_RGB_FILE)
--- vim70/src/main.aap~ 2006-06-06 14:59:26.000000000 +0200
+++ vim70/src/main.aap 2006-06-06 14:59:26.000000000 +0200
@@ -658,9 +658,11 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/3ed3142acd297c8cefc7099700b53d692608c630
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
