commit dff7150b8dfa4283e099644b2a220fbaaeb3ef2d
Author: Jan Palus <[email protected]>
Date: Sat Jul 27 18:05:14 2024 +0200
up to 9.1.0630
021_all_vim-7.0-fstab-bogus-errors.patch | 2 +-
vim-apache.patch | 2 +-
vim-ft-mysql.patch | 12 ------------
vim-home_etc.patch | 16 ++++++++++------
vim-localedir.patch | 2 +-
vim-no_libelf.patch | 15 ---------------
vim-smarty.patch | 2 +-
vim-syntax-fstab.patch | 4 ++--
vim.spec | 15 +++++++--------
9 files changed, 23 insertions(+), 47 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index aab5295..67adbba 100644
--- a/vim.spec
+++ b/vim.spec
@@ -31,8 +31,8 @@
# 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.0168
-%define rel 2
+%define ver 9.1.0630
+%define rel 1
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
Summary(es.UTF-8): Editor visual incrementado
@@ -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: 7cac4728ddb3a5ffb84ea0f69ef735ad
+# Source0-md5: 172aefc43adf4e53c20a841b7d66be26
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
@@ -75,7 +75,6 @@ Source33: moria.vim
Patch0: %{name}-sysconfdir.patch
Patch2: %{name}-paths.patch
-Patch3: %{name}-no_libelf.patch
Patch5: %{name}-awk.patch
Patch6: %{name}-filetype_vim-perl_tests.patch
@@ -106,7 +105,6 @@ Patch32: %{name}-localedir.patch
Patch34: %{name}-rtdir.patch
Patch35: %{name}-ft-mib.patch
-Patch37: %{name}-ft-mysql.patch
Patch38: %{name}-ft-gyp.patch
Patch39: %{name}-revert-7.4.165-noundo.patch
Patch40: desktop.patch
@@ -777,7 +775,6 @@ cp -p runtime/gvim.desktop gvim-motif.desktop
%patch0 -p1
%patch2 -p1
-%patch3 -p1
%patch5 -p1
%patch6 -p1
@@ -811,7 +808,6 @@ cp -p runtime/gvim.desktop gvim-motif.desktop
%patch34 -p1
%patch35 -p1
-%patch37 -p1
%patch38 -p1
%patch39 -p1
%patch40 -p1
@@ -1279,6 +1275,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/vim/doc
%verify(not md5 mtime size) %{_datadir}/vim/doc/tags
%lang(pl) %verify(not md5 mtime size) %{_datadir}/vim/doc/tags-pl
+%lang(ru) %verify(not md5 mtime size) %{_datadir}/vim/doc/tags-ru
%verify(not md5 mtime size) %{_datadir}/vim/vimfiles/doc/tags
%dir %{_datadir}/vim/vimfiles
@@ -1427,8 +1424,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/vim/plugin/*.vim
%{_datadir}/vim/autoload/*.vim
%exclude %{_datadir}/vim/autoload/*complete.vim
+%{_datadir}/vim/autoload/cargo
+%{_datadir}/vim/autoload/rust
%{_datadir}/vim/autoload/xml
-%{_datadir}/vim/autoload/zig
%{_datadir}/vim/compiler
%{_datadir}/vim/macros
%{_datadir}/vim/print
@@ -1442,6 +1440,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
# English
%{_datadir}/vim/doc/*.txt
+%lang(ru) %{_datadir}/vim/doc/uganda.rux
# Polish
%lang(pl) %{_datadir}/vim/doc/*.plx
diff --git a/021_all_vim-7.0-fstab-bogus-errors.patch
b/021_all_vim-7.0-fstab-bogus-errors.patch
index 9cd118d..9f8e09e 100644
--- a/021_all_vim-7.0-fstab-bogus-errors.patch
+++ b/021_all_vim-7.0-fstab-bogus-errors.patch
@@ -6,7 +6,7 @@
syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
-syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
+syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\)/ contained
- syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts devtmpfs
sysfs usbfs
+ syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts devtmpfs
sysfs usbfs tracefs overlay
syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
@@ -37,7 +37,7 @@
diff --git a/vim-apache.patch b/vim-apache.patch
index 5290a06..fc05105 100644
--- a/vim-apache.patch
+++ b/vim-apache.patch
@@ -1,7 +1,7 @@
--- vim74/runtime/filetype.vim~ 2013-09-06 00:03:38.000000000 +0300
+++ vim74/runtime/filetype.vim 2013-09-06 00:04:54.205952274 +0300
@@ -110,8 +110,8 @@
- au BufNewFile,BufRead *.ino,*.pde setf arduino
+ au BufNewFile,BufRead *.asy setf asy
" Apache config file
-au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf setf apache
diff --git a/vim-ft-mysql.patch b/vim-ft-mysql.patch
deleted file mode 100644
index 860e500..0000000
--- a/vim-ft-mysql.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vim72/runtime/filetype.vim~ 2010-01-21 21:47:56.000000000 +0200
-+++ vim72/runtime/filetype.vim 2010-04-22 14:27:15.550974158 +0300
-@@ -1171,7 +1171,7 @@ au BufNewFile,BufRead mrxvtrc,.mrxvtrc
- au BufNewFile,BufRead *.msql setf msql
-
- " Mysql
--au BufNewFile,BufRead *.mysql setf mysql
-+au BufNewFile,BufRead *.mysql,.*mysql_history* setf mysql
-
- " Tcl Shell RC file
- au BufNewFile,BufRead tclsh.rc setf tcl
-
diff --git a/vim-home_etc.patch b/vim-home_etc.patch
index 9fb574e..4a9513e 100644
--- a/vim-home_etc.patch
+++ b/vim-home_etc.patch
@@ -65,22 +65,26 @@ diff -Nru vim62.orig/src/misc1.c vim62/src/misc1.c
# else
-# define DFLT_VDIR "$HOME/.vim/view" // default for 'viewdir'
+# define DFLT_VDIR "$HOME_ETC/.vim/view" // default for 'viewdir'
+ # define XDG_VDIR (mch_getenv("XDG_CONFIG_HOME") ? \
+ "$XDG_CONFIG_HOME/vim/view" : "~/.config/vim/view")
# endif
- #endif
-
-@@ -371,14 +371,14 @@
- # ifdef RUNTIME_GLOBAL
- # ifdef RUNTIME_GLOBAL_AFTER
+@@ -365,18 +365,18 @@
# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME,"
RUNTIME_GLOBAL_AFTER ",~/.vim/after"
+ # define XDG_RUNTIMEPATH "$XDG_CONFIG_HOME/vim," RUNTIME_GLOBAL
",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "/after,$XDG_CONFIG_HOME/vim/after"
+ # define XDG_RUNTIMEPATH_FB "~/.config/vim," RUNTIME_GLOBAL
",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "/after,~/.config/vim/after"
-# define CLEAN_RUNTIMEPATH RUNTIME_GLOBAL ",$VIMRUNTIME,"
RUNTIME_GLOBAL_AFTER
+# define CLEAN_RUNTIMEPATH "$HOME_ETC/.vim/after," RUNTIME_GLOBAL
",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
# else
# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME,"
RUNTIME_GLOBAL "/after,~/.vim/after"
+ # define XDG_RUNTIMEPATH "$XDG_CONFIG_HOME/vim," RUNTIME_GLOBAL
",$VIMRUNTIME," RUNTIME_GLOBAL "/after,$XDG_CONFIG_HOME/vim/after"
+ # define XDG_RUNTIMEPATH_FB "~/.config/vim," RUNTIME_GLOBAL
",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/.config/vim/after"
-# define CLEAN_RUNTIMEPATH RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL
"/after"
-+# define CLEAN_RUNTIMEPATH "$HOME_ETC/.vim," RUNTIME_GLOBAL
",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
++# define CLEAN_RUNTIMEPATH "$HOME_ETC/.vim/after," RUNTIME_GLOBAL
",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
# endif
# else
# define DFLT_RUNTIMEPATH
"~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
+ # define XDG_RUNTIMEPATH
"$XDG_CONFIG_HOME/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$XDG_CONFIG_HOME/vim/after"
+ # define XDG_RUNTIMEPATH_FB
"~/.config/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.config/vim/after"
-# define CLEAN_RUNTIMEPATH "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
+# define CLEAN_RUNTIMEPATH
"$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
# endif
diff --git a/vim-localedir.patch b/vim-localedir.patch
index 05313b0..c6fccdb 100644
--- a/vim-localedir.patch
+++ b/vim-localedir.patch
@@ -73,7 +73,7 @@
--- vim73/src/po/Makefile~ 2013-02-22 17:28:18.000000000 +0200
+++ vim73/src/po/Makefile 2013-02-22 17:46:40.771918175 +0200
@@ -38,6 +38,7 @@ check: $(CHECKFILES)
- # installing for real
+ # Installing for real.
install: $(MOFILES) $(MOCONVERTED)
@$(MAKE) prefixcheck
+ install -d $(LOCALEDIR); \
diff --git a/vim-no_libelf.patch b/vim-no_libelf.patch
deleted file mode 100644
index f2a39b4..0000000
--- a/vim-no_libelf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- vim61/src/configure.ac.orig Wed Oct 2 10:41:30 2002
-+++ vim61/src/configure.ac Wed Oct 2 10:54:27 2002
-@@ -1352,9 +1352,9 @@
- dnl Checks for header files.
- AC_CHECK_HEADER(elf.h, HAS_ELF=1)
- dnl AC_CHECK_HEADER(dwarf.h, SVR4=1)
--if test "$HAS_ELF" = 1; then
-- AC_CHECK_LIB(elf, main)
--fi
-+dnl if test "$HAS_ELF" = 1; then
-+dnl AC_CHECK_LIB(elf, main)
-+dnl fi
-
- AC_HEADER_DIRENT
-
diff --git a/vim-smarty.patch b/vim-smarty.patch
index bf0543d..f2d85e0 100644
--- a/vim-smarty.patch
+++ b/vim-smarty.patch
@@ -2,7 +2,7 @@
+++ /tmp/filetype.vim 2006-01-12 17:25:53.000000000 +0200
@@ -792,6 +792,9 @@ au BufRead,BufNewFile *.heex setf
heex
" HEX (Intel)
- au BufNewFile,BufRead *.hex,*.h32 setf hex
+ au BufNewFile,BufRead
*.hex,*.ihex,*.int,*.ihe,*.ihx,*.mcs,*.h32,*.h80,*.h86,*.a43,*.a90 setf hex
+" Smarty templates (must be before HTML)
+au BufNewFile,BufRead *.tpl.html,*.tpl setf smarty
diff --git a/vim-syntax-fstab.patch b/vim-syntax-fstab.patch
index 0bd3398..e81b199 100644
--- a/vim-syntax-fstab.patch
+++ b/vim-syntax-fstab.patch
@@ -6,8 +6,8 @@ recognize ext4dev and reiser4
" Type
syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
syn match fsTypeUnknown /\s\+\zs\w\+/ contained
--syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs
auto autofs bdev befs bfs btrfs binfmt_misc cd9660 ceph cfs cgroup cifs coda
coherent configfs cpuset cramfs debugfs devfs devpts devtmpfs dlmfs e2compr
ecryptfs efivarfs efs erofs exfat ext2 ext2fs ext3 ext4 f2fs fdesc ffs filecore
fuse fuseblk fusectl gfs2 hfs hfsplus hpfs hugetlbfs iso9660 jffs jffs2 jfs
kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfs4 nfsd nilfs2 none
ntfs ntfs3 null nwfs ocfs2 omfs overlay ovlfs pipefs portal proc procfs pstore
ptyfs pvfs2 qnx4 qnx6 reiserfs ramfs romfs rpc_pipefs securityfs shm smbfs
spufs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs ubifs udf ufs
umap umsdos union usbfs userfs v9fs vfat virtiofs vs3fs vxfs wrapfs wvfs xenfs
xenix xfs zisofs zonefs
-+syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs
auto autofs bdev befs bfs btrfs binfmt_misc cd9660 ceph cfs cgroup cifs coda
coherent configfs cpuset cramfs debugfs devfs devpts devtmpfs dlmfs e2compr
ecryptfs efivarfs efs erofs exfat ext2 ext2fs ext3 ext4 ext4dev f2fs fdesc ffs
filecore fuse fuseblk fusectl gfs2 hfs hfsplus hpfs hugetlbfs iso9660 jffs
jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfs4 nfsd
nilfs2 none ntfs ntfs3 null nwfs ocfs2 omfs overlay ovlfs pipefs portal proc
procfs pstore ptyfs pvfs2 qnx4 qnx6 reiserfs reiser4 ramfs romfs rpc_pipefs
securityfs shm smbfs spufs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs
tmpfs ubifs udf ufs umap umsdos union usbfs userfs v9fs vfat virtiofs vs3fs
vxfs wrapfs wvfs xenfs xenix xfs zisofs zonefs
+-syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs
auto autofs bdev befs bfs btrfs binfmt_misc cd9660 ceph cfs cgroup cifs coda
coherent configfs cpuset cramfs debugfs devfs devpts devtmpfs dlmfs e2compr
ecryptfs efivarfs efs erofs exfat ext2 ext2fs ext3 ext4 f2fs fdesc ffs filecore
fuse fuseblk fusectl gfs2 hfs hfsplus hpfs hugetlbfs iso9660 jffs jffs2 jfs
kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfs4 nfsd nilfs2 none
ntfs ntfs3 null nwfs ocfs2 omfs overlay ovlfs pipefs portal proc procfs pstore
ptyfs pvfs2 qnx4 qnx6 reiserfs ramfs romfs rpc_pipefs securityfs shm smbfs
spufs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs tracefs ubifs
udf ufs umap umsdos union usbfs userfs v9fs vfat virtiofs vs3fs vxfs wrapfs
wvfs xenfs xenix xfs zisofs zonefs
++syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs
auto autofs bdev befs bfs btrfs binfmt_misc cd9660 ceph cfs cgroup cifs coda
coherent configfs cpuset cramfs debugfs devfs devpts devtmpfs dlmfs e2compr
ecryptfs efivarfs efs erofs exfat ext2 ext2fs ext3 ext4 ext4dev f2fs fdesc ffs
filecore fuse fuseblk fusectl gfs2 hfs hfsplus hpfs hugetlbfs iso9660 jffs
jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfs4 nfsd
nilfs2 none ntfs ntfs3 null nwfs ocfs2 omfs overlay ovlfs pipefs portal proc
procfs pstore ptyfs pvfs2 qnx4 qnx6 reiserfs reiser4 ramfs romfs rpc_pipefs
securityfs shm smbfs spufs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs
tmpfs tracefs ubifs udf ufs umap umsdos union usbfs userfs v9fs vfat virtiofs
vs3fs vxfs wrapfs wvfs xenfs xenix xfs zisofs zonefs
" Options
" -------
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/dff7150b8dfa4283e099644b2a220fbaaeb3ef2d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
