commit 0c77eadb2814e6ccd4ef269b710a9b2ce7fc0e52
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Wed Dec 4 21:37:15 2024 +0100
Up to 9.1.0905
vim-filetypes.patch | 8 +--
vim-po-syntax.patch | 24 ++++----
vim-tutor-lessdeps.patch | 30 ----------
vim.spec | 142 +++++++++++++++++++++++------------------------
4 files changed, 87 insertions(+), 117 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index f666314..ae7f45f 100644
--- a/vim.spec
+++ b/vim.spec
@@ -31,7 +31,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 9.1.0766
+%define ver 9.1.0905
%define rel 1
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
@@ -52,7 +52,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: 26241b738a06be8ee67b9e7e5f8bb967
+# Source0-md5: f5af4939c322cabe3ed72fba56fbb9c1
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
@@ -1023,8 +1023,8 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/vim,%{_bindir}}
\
%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/gvim.desktop
# fix nb/no
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/tutor/tutor.n{o,b}
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/tutor/tutor.n{o,b}.utf-8
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/tutor/tutor1.n{o,b}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/tutor/tutor1.n{o,b}.utf-8
%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/lang/menu_n{o,b}.latin1.vim
%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/lang/menu_n{o,b}.utf-8.vim
%{__mv} $RPM_BUILD_ROOT%{_datadir}/vim/lang/menu_n{o,b}_no.latin1.vim
@@ -1449,80 +1449,80 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/vimtutor
%dir %{_datadir}/vim/tutor
-%{_datadir}/vim/tutor/tutor
+%{_datadir}/vim/tutor/tutor1
%{_datadir}/vim/tutor/README.txt
%{_datadir}/vim/tutor/tutor.vim
-%{_datadir}/vim/tutor/tutor.utf-8
+%{_datadir}/vim/tutor/tutor1.utf-8
%lang(el) %{_datadir}/vim/tutor/README.el.cp737.txt
%lang(el) %{_datadir}/vim/tutor/README.el.txt
%lang(ru) %{_datadir}/vim/tutor/README.ru.utf-8.txt
-%lang(de) %{_datadir}/vim/tutor/tutor.bar
-%lang(de) %{_datadir}/vim/tutor/tutor.bar.utf-8
-%lang(bg) %{_datadir}/vim/tutor/tutor.bg.utf-8
-%lang(ca) %{_datadir}/vim/tutor/tutor.ca
-%lang(ca) %{_datadir}/vim/tutor/tutor.ca.utf-8
-%lang(cs) %{_datadir}/vim/tutor/tutor.cs
-%lang(cs) %{_datadir}/vim/tutor/tutor.cs.cp1250
-%lang(cs) %{_datadir}/vim/tutor/tutor.cs.utf-8
-%lang(da) %{_datadir}/vim/tutor/tutor.da
-%lang(da) %{_datadir}/vim/tutor/tutor.da.utf-8
-%lang(de) %{_datadir}/vim/tutor/tutor.de
-%lang(de) %{_datadir}/vim/tutor/tutor.de.utf-8
-%lang(el) %{_datadir}/vim/tutor/tutor.el
-%lang(el) %{_datadir}/vim/tutor/tutor.el.cp737
-%lang(el) %{_datadir}/vim/tutor/tutor.el.utf-8
-%lang(eo) %{_datadir}/vim/tutor/tutor.eo
-%lang(eo) %{_datadir}/vim/tutor/tutor.eo.utf-8
-%lang(es) %{_datadir}/vim/tutor/tutor.es
-%lang(es) %{_datadir}/vim/tutor/tutor.es.utf-8
-%lang(fr) %{_datadir}/vim/tutor/tutor.fr
-%lang(fr) %{_datadir}/vim/tutor/tutor.fr.utf-8
-%lang(hr) %{_datadir}/vim/tutor/tutor.hr
-%lang(hr) %{_datadir}/vim/tutor/tutor.hr.cp1250
-%lang(hr) %{_datadir}/vim/tutor/tutor.hr.utf-8
-%lang(hu) %{_datadir}/vim/tutor/tutor.hu
-%lang(hu) %{_datadir}/vim/tutor/tutor.hu.cp1250
-%lang(hu) %{_datadir}/vim/tutor/tutor.hu.utf-8
-%lang(it) %{_datadir}/vim/tutor/tutor.it
-%lang(it) %{_datadir}/vim/tutor/tutor.it.utf-8
-%lang(ja) %{_datadir}/vim/tutor/tutor.ja.euc
-%lang(ja) %{_datadir}/vim/tutor/tutor.ja.sjis
-%lang(ja) %{_datadir}/vim/tutor/tutor.ja.utf-8
-%lang(ko) %{_datadir}/vim/tutor/tutor.ko
-%lang(ko) %{_datadir}/vim/tutor/tutor.ko.euc
-%lang(ko) %{_datadir}/vim/tutor/tutor.ko.utf-8
-%lang(lt) %{_datadir}/vim/tutor/tutor.lt.utf-8
-%lang(lv) %{_datadir}/vim/tutor/tutor.lv.utf-8
-%lang(nl) %{_datadir}/vim/tutor/tutor.nl
-%lang(nl) %{_datadir}/vim/tutor/tutor.nl.utf-8
-%lang(nb) %{_datadir}/vim/tutor/tutor.nb
-%lang(nb) %{_datadir}/vim/tutor/tutor.nb.utf-8
-%lang(pl) %{_datadir}/vim/tutor/tutor.pl
-%lang(pl) %{_datadir}/vim/tutor/tutor.pl.cp1250
-%lang(pl) %{_datadir}/vim/tutor/tutor.pl.utf-8
-%lang(pt) %{_datadir}/vim/tutor/tutor.pt
-%lang(pt) %{_datadir}/vim/tutor/tutor.pt.utf-8
-%lang(ru) %{_datadir}/vim/tutor/tutor.ru
-%lang(ru) %{_datadir}/vim/tutor/tutor.ru.cp1251
-%lang(ru) %{_datadir}/vim/tutor/tutor.ru.utf-8
-%lang(sk) %{_datadir}/vim/tutor/tutor.sk
-%lang(sk) %{_datadir}/vim/tutor/tutor.sk.cp1250
-%lang(sk) %{_datadir}/vim/tutor/tutor.sk.utf-8
-%lang(sr) %{_datadir}/vim/tutor/tutor.sr.cp1250
-%lang(sr) %{_datadir}/vim/tutor/tutor.sr.utf-8
-%lang(sv) %{_datadir}/vim/tutor/tutor.sv
-%lang(sv) %{_datadir}/vim/tutor/tutor.sv.utf-8
-%lang(tr) %{_datadir}/vim/tutor/tutor.tr.iso9
-%lang(tr) %{_datadir}/vim/tutor/tutor.tr.utf-8
-%lang(uk) %{_datadir}/vim/tutor/tutor.uk.utf-8
-%lang(vi) %{_datadir}/vim/tutor/tutor.vi.utf-8
-%lang(zh_CN) %{_datadir}/vim/tutor/tutor.zh_cn.utf-8
-%lang(zh_TW) %{_datadir}/vim/tutor/tutor.zh.big5
-%lang(zh_TW) %{_datadir}/vim/tutor/tutor.zh.euc
-%lang(zh_TW) %{_datadir}/vim/tutor/tutor.zh.utf-8
-%lang(zh_TW) %{_datadir}/vim/tutor/tutor.zh_tw.utf-8
+%lang(de) %{_datadir}/vim/tutor/tutor1.bar
+%lang(de) %{_datadir}/vim/tutor/tutor1.bar.utf-8
+%lang(bg) %{_datadir}/vim/tutor/tutor1.bg.utf-8
+%lang(ca) %{_datadir}/vim/tutor/tutor1.ca
+%lang(ca) %{_datadir}/vim/tutor/tutor1.ca.utf-8
+%lang(cs) %{_datadir}/vim/tutor/tutor1.cs
+%lang(cs) %{_datadir}/vim/tutor/tutor1.cs.cp1250
+%lang(cs) %{_datadir}/vim/tutor/tutor1.cs.utf-8
+%lang(da) %{_datadir}/vim/tutor/tutor1.da
+%lang(da) %{_datadir}/vim/tutor/tutor1.da.utf-8
+%lang(de) %{_datadir}/vim/tutor/tutor1.de
+%lang(de) %{_datadir}/vim/tutor/tutor1.de.utf-8
+%lang(el) %{_datadir}/vim/tutor/tutor1.el
+%lang(el) %{_datadir}/vim/tutor/tutor1.el.cp737
+%lang(el) %{_datadir}/vim/tutor/tutor1.el.utf-8
+%lang(eo) %{_datadir}/vim/tutor/tutor1.eo
+%lang(eo) %{_datadir}/vim/tutor/tutor1.eo.utf-8
+%lang(es) %{_datadir}/vim/tutor/tutor1.es
+%lang(es) %{_datadir}/vim/tutor/tutor1.es.utf-8
+%lang(fr) %{_datadir}/vim/tutor/tutor1.fr
+%lang(fr) %{_datadir}/vim/tutor/tutor1.fr.utf-8
+%lang(hr) %{_datadir}/vim/tutor/tutor1.hr
+%lang(hr) %{_datadir}/vim/tutor/tutor1.hr.cp1250
+%lang(hr) %{_datadir}/vim/tutor/tutor1.hr.utf-8
+%lang(hu) %{_datadir}/vim/tutor/tutor1.hu
+%lang(hu) %{_datadir}/vim/tutor/tutor1.hu.cp1250
+%lang(hu) %{_datadir}/vim/tutor/tutor1.hu.utf-8
+%lang(it) %{_datadir}/vim/tutor/tutor1.it
+%lang(it) %{_datadir}/vim/tutor/tutor1.it.utf-8
+%lang(ja) %{_datadir}/vim/tutor/tutor1.ja.euc
+%lang(ja) %{_datadir}/vim/tutor/tutor1.ja.sjis
+%lang(ja) %{_datadir}/vim/tutor/tutor1.ja.utf-8
+%lang(ko) %{_datadir}/vim/tutor/tutor1.ko
+%lang(ko) %{_datadir}/vim/tutor/tutor1.ko.euc
+%lang(ko) %{_datadir}/vim/tutor/tutor1.ko.utf-8
+%lang(lt) %{_datadir}/vim/tutor/tutor1.lt.utf-8
+%lang(lv) %{_datadir}/vim/tutor/tutor1.lv.utf-8
+%lang(nl) %{_datadir}/vim/tutor/tutor1.nl
+%lang(nl) %{_datadir}/vim/tutor/tutor1.nl.utf-8
+%lang(nb) %{_datadir}/vim/tutor/tutor1.nb
+%lang(nb) %{_datadir}/vim/tutor/tutor1.nb.utf-8
+%lang(pl) %{_datadir}/vim/tutor/tutor1.pl
+%lang(pl) %{_datadir}/vim/tutor/tutor1.pl.cp1250
+%lang(pl) %{_datadir}/vim/tutor/tutor1.pl.utf-8
+%lang(pt) %{_datadir}/vim/tutor/tutor1.pt
+%lang(pt) %{_datadir}/vim/tutor/tutor1.pt.utf-8
+%lang(ru) %{_datadir}/vim/tutor/tutor1.ru
+%lang(ru) %{_datadir}/vim/tutor/tutor1.ru.cp1251
+%lang(ru) %{_datadir}/vim/tutor/tutor1.ru.utf-8
+%lang(sk) %{_datadir}/vim/tutor/tutor1.sk
+%lang(sk) %{_datadir}/vim/tutor/tutor1.sk.cp1250
+%lang(sk) %{_datadir}/vim/tutor/tutor1.sk.utf-8
+%lang(sr) %{_datadir}/vim/tutor/tutor1.sr.cp1250
+%lang(sr) %{_datadir}/vim/tutor/tutor1.sr.utf-8
+%lang(sv) %{_datadir}/vim/tutor/tutor1.sv
+%lang(sv) %{_datadir}/vim/tutor/tutor1.sv.utf-8
+%lang(tr) %{_datadir}/vim/tutor/tutor1.tr.iso9
+%lang(tr) %{_datadir}/vim/tutor/tutor1.tr.utf-8
+%lang(uk) %{_datadir}/vim/tutor/tutor1.uk.utf-8
+%lang(vi) %{_datadir}/vim/tutor/tutor1.vi.utf-8
+%lang(zh_CN) %{_datadir}/vim/tutor/tutor1.zh_cn.utf-8
+%lang(zh_TW) %{_datadir}/vim/tutor/tutor1.zh.big5
+%lang(zh_TW) %{_datadir}/vim/tutor/tutor1.zh.euc
+%lang(zh_TW) %{_datadir}/vim/tutor/tutor1.zh.utf-8
+%lang(zh_TW) %{_datadir}/vim/tutor/tutor1.zh_tw.utf-8
%{_mandir}/man1/vimtutor.1*
%lang(da) %{_mandir}/da/man1/vimtutor.1*
diff --git a/vim-filetypes.patch b/vim-filetypes.patch
index b9f2e24..9926f73 100644
--- a/vim-filetypes.patch
+++ b/vim-filetypes.patch
@@ -1,6 +1,6 @@
---- vim-7.0/runtime/filetype.vim~ 2006-04-29 14:54:54.702689335 +0300
-+++ vim-7.0/runtime/filetype.vim 2006-04-29 14:56:07.254310876 +0300
-@@ -1974,7 +1974,7 @@
+--- vim-9.1.0905/runtime/filetype.vim~ 2024-12-04 21:10:01.000000000 +0100
++++ vim-9.1.0905/runtime/filetype.vim 2024-12-04 21:11:37.149975444 +0100
+@@ -3007,7 +3007,7 @@ au BufNewFile,BufRead *.text,README,LICE
" More Apache style config files
au BufNewFile,BufRead */etc/proftpd/*.conf*,*/etc/proftpd/conf.*/* call
s:StarSetf('apachestyle')
@@ -8,4 +8,4 @@
+au BufNewFile,BufRead /etc/ftpd/conf.d/*.conf,proftpd*.conf* call
s:StarSetf('apachestyle')
" More Apache config files
- au BufNewFile,BufRead
access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf* call
s:StarSetf('apache')
+ au BufNewFile,BufRead
access.conf*,apache.conf*,apache2.conf*,httpd.conf*,httpd-*.conf*,srm.conf*,proxy-html.conf*
call s:StarSetf('apache')
diff --git a/vim-po-syntax.patch b/vim-po-syntax.patch
index 4787919..38a5374 100644
--- a/vim-po-syntax.patch
+++ b/vim-po-syntax.patch
@@ -1,16 +1,16 @@
---- vim-7.4.979/runtime/syntax/po.vim~ 2015-12-19 16:28:18.000000000 +0200
-+++ vim-7.4.979/runtime/syntax/po.vim 2015-12-22 10:39:56.522234440 +0200
-@@ -55,6 +55,7 @@
- syn match poDiffOld '\(^#| "[^{]*+}\|{+[^}]*+}\|{+[^}]*\|"$\)' contained
- syn match poDiffNew '\(^#| "[^{]*-}\|{-[^}]*-}\|{-[^}]*\|"$\)' contained
- syn match poCommentDiff "^#|.*$" contains=poDiffOld,poDiffNew
-+syn match poUntranslated /^msgstr\s\+""\n\n/
+--- vim-9.1.0905/runtime/syntax/po.vim~ 2024-12-04 20:31:43.000000000
+0100
++++ vim-9.1.0905/runtime/syntax/po.vim 2024-12-04 21:09:52.719975448 +0100
+@@ -21,6 +21,7 @@ syn match poStatementMsgCTxt "^msgctxt"
+ syn match poStatementMsgidplural "^msgid_plural" contained
+ syn match poPluralCaseN "[0-9]" contained
+ syn match poStatementMsgstr "^msgstr\(\[[0-9]\]\)" contains=poPluralCaseN
++syn match poUntranslated /^msgstr\s\+""\n\n/
- " Translations (also includes header fields as they appear in a translation
msgstr)
- syn region poCommentKDE start=+"_: +ms=s+1 end="\\n"
end="\"\n^msgstr"me=s-1 contained
-@@ -103,6 +104,7 @@
- hi def link poDiffOld Todo
- hi def link poDiffNew Special
+ " Simple HTML and XML highlighting
+ syn match poHtml "<\_[^<>]\+>" contains=poHtmlTranslatables,poLineBreak
+@@ -122,6 +123,7 @@ hi def link poCopyrightUnset Todo
+ hi def link poFlagFuzzy Todo
+ hi def link poFlagFormat Todo
hi def link poObsolete Comment
+hi def link poUntranslated Todo
diff --git a/vim-tutor-lessdeps.patch b/vim-tutor-lessdeps.patch
index 7adebd8..e69de29 100644
--- a/vim-tutor-lessdeps.patch
+++ b/vim-tutor-lessdeps.patch
@@ -1,30 +0,0 @@
---- vim-8.2.3570/src/vimtutor.orig 2021-11-02 20:05:13.183015908 +0100
-+++ vim-8.2.3570/src/vimtutor 2021-11-02 20:07:12.539682552 +0100
-@@ -9,14 +9,12 @@
- # When this fails or no argument was given, it tries using 'v:lang'
- # When that also fails, it uses the English version.
-
--# Vim could be called "vim" or "vi". Also check for "vimN", for people who
--# have Vim installed with its version number.
--# We anticipate up to a future Vim 8.1 version :-).
--seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
-+# Vim could be called "vim" or "vi".
-+seq="/usr/bin/vim.heavy /usr/bin/vim /bin/vi"
- if test "$1" = "-g"; then
- # Try to use the GUI version of Vim if possible, it will fall back
- # on Vim if Gvim is not installed.
-- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7
gvim6 $seq"
-+ seq="/usr/bin/gvim /usr/bin/gvim.heavy /usr/bin/gvim.athena
/usr/bin/gvim.gnome /usr/bin/gvim.gtk /usr/bin/gvim.motif $seq"
- shift
- fi
-
-@@ -53,8 +51,7 @@ export TUTORCOPY
- trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15
-
- for i in $seq; do
-- testvim=$(which $i 2>/dev/null)
-- if test -f "$testvim"; then
-+ if test -x "$i"; then
- VIM=$i
- break
- fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/0c77eadb2814e6ccd4ef269b710a9b2ce7fc0e52
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
