From 1d446881d8187ae6353c6054e124d30e37181da9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Sun, 10 Apr 2022 12:22:46 +0200
Subject: [PATCH] Up to 8.2.4726; udevrules patch seems no longer needed

---
 desktop.patch              | 11 ++++-------
 vim-ft-lib-udevrules.patch | 13 -------------
 vim-phpscript.patch        | 31 ++++++++++---------------------
 vim-vimrc.patch            |  2 +-
 vim.spec                   | 12 +++++++-----
 5 files changed, 22 insertions(+), 47 deletions(-)
 delete mode 100644 vim-ft-lib-udevrules.patch

diff --git a/desktop.patch b/desktop.patch
index 53aca05..91a91c1 100644
--- a/desktop.patch
+++ b/desktop.patch
@@ -8,9 +8,8 @@ diff --color -ur vim-8.2.2529.orig/gvim-athena.desktop vim-8.2.2529/gvim-athena.
 -Name=GVim
 +Name=GVim Athena
  # Translators: This is the Generic Application Name used in the Vim desktop file
+ GenericName[ca]=Editor de text
  GenericName[de]=Texteditor
- GenericName[eo]=Tekstoredaktilo
-Only in vim-8.2.2529: gvim-athena.desktop.orig
 diff --color -ur vim-8.2.2529.orig/gvim-gnome.desktop vim-8.2.2529/gvim-gnome.desktop
 --- vim-8.2.2529.orig/gvim-gnome.desktop	2021-02-17 21:57:03.000000000 +0100
 +++ vim-8.2.2529/gvim-gnome.desktop	2021-03-02 14:24:51.277064340 +0100
@@ -21,9 +20,8 @@ diff --color -ur vim-8.2.2529.orig/gvim-gnome.desktop vim-8.2.2529/gvim-gnome.de
 -Name=GVim
 +Name=GVim GNOME
  # Translators: This is the Generic Application Name used in the Vim desktop file
+ GenericName[ca]=Editor de text
  GenericName[de]=Texteditor
- GenericName[eo]=Tekstoredaktilo
-Only in vim-8.2.2529: gvim-gnome.desktop.orig
 diff --color -ur vim-8.2.2529.orig/gvim-gtk.desktop vim-8.2.2529/gvim-gtk.desktop
 --- vim-8.2.2529.orig/gvim-gtk.desktop	2021-02-17 21:57:03.000000000 +0100
 +++ vim-8.2.2529/gvim-gtk.desktop	2021-03-02 14:24:51.277064340 +0100
@@ -34,9 +32,8 @@ diff --color -ur vim-8.2.2529.orig/gvim-gtk.desktop vim-8.2.2529/gvim-gtk.deskto
 -Name=GVim
 +Name=GVim GTK
  # Translators: This is the Generic Application Name used in the Vim desktop file
+ GenericName[ca]=Editor de text
  GenericName[de]=Texteditor
- GenericName[eo]=Tekstoredaktilo
-Only in vim-8.2.2529: gvim-gtk.desktop.orig
 diff --color -ur vim-8.2.2529.orig/gvim-motif.desktop vim-8.2.2529/gvim-motif.desktop
 --- vim-8.2.2529.orig/gvim-motif.desktop	2021-02-17 21:57:03.000000000 +0100
 +++ vim-8.2.2529/gvim-motif.desktop	2021-03-02 14:24:51.277064340 +0100
@@ -47,8 +44,8 @@ diff --color -ur vim-8.2.2529.orig/gvim-motif.desktop vim-8.2.2529/gvim-motif.de
 -Name=GVim
 +Name=GVim Motif
  # Translators: This is the Generic Application Name used in the Vim desktop file
+ GenericName[ca]=Editor de text
  GenericName[de]=Texteditor
- GenericName[eo]=Tekstoredaktilo
 --- vim-8.2.3570/runtime/vim.desktop~	2021-11-01 23:58:43.000000000 +0100
 +++ vim-8.2.3570/runtime/vim.desktop	2021-11-02 20:11:30.533015830 +0100
 @@ -112,6 +112,6 @@ Keywords[tr]=Metin;düzenleyici;
diff --git a/vim-ft-lib-udevrules.patch b/vim-ft-lib-udevrules.patch
deleted file mode 100644
index dbf2aff..0000000
--- a/vim-ft-lib-udevrules.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vim72/runtime/autoload/dist/ft.vim~	2010-03-16 20:11:19.304293041 +0200
-+++ vim72/runtime/autoload/dist/ft.vim	2010-03-16 20:03:33.541017783 +0200
-@@ -1830,6 +1830,10 @@
-     setf javascript
-     return
-   endif
-+  if expand('<amatch>:p') =~ '^/lib/udev/\%(rules\.d/\)\=.*\.rules$'
-+    setf udevrules
-+    return
-+  endif
-   try
-     let config_lines = readfile('/etc/udev/udev.conf')
-   catch /^Vim\%((\a\+)\)\=:E484/
diff --git a/vim-phpscript.patch b/vim-phpscript.patch
index c38719a..7a8e665 100644
--- a/vim-phpscript.patch
+++ b/vim-phpscript.patch
@@ -1,25 +1,14 @@
---- vim72/runtime/scripts.vim~	2008-10-09 03:12:50.000000000 +0300
-+++ vim72/runtime/scripts.vim	2008-10-09 03:12:54.703954160 +0300
-@@ -246,6 +246,10 @@
-   elseif s:line1 =~# '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} '
+--- vim-8.2.4726/runtime/autoload/dist/script.vim~	2022-04-09 22:42:10.000000000 +0200
++++ vim-8.2.4726/runtime/autoload/dist/script.vim	2022-04-10 12:01:55.436645032 +0200
+@@ -297,6 +297,10 @@ def DetectFromText(line1: string)
+   elseif line1 =~ '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} '
      set ft=xxd
  
-+    " PHP script tag
-+  elseif s:line1 =~ '^<?php'
-+    set ft=php
++    # PHP script tag
++  elseif line1 =~ '^<?php'
++     set ft=php
 +
-     " RCS/CVS log output
-   elseif s:line1 =~# '^RCS file:' || s:line2 =~# '^RCS file:'
+     # RCS/CVS log output
+   elseif line1 =~ '^RCS file:' || line2 =~ '^RCS file:'
      set ft=rcslog
---- vim73/runtime/filetype.vim~	2010-10-31 13:26:19.000000000 +0200
-+++ vim73/runtime/filetype.vim	2010-10-31 13:27:17.615314321 +0200
-@@ -1326,7 +1326,8 @@
- " Php, php3, php4, etc.
- " Also Phtml (was used for PHP 2 in the past)
- " Also .ctp for Cake template file
--au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp	setf php
-+" Also .phpt for PHP Test files
-+au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp,*.phpt	setf php
- 
- " PHP config
- au BufNewFile,BufRead php.ini-*			setf dosini
+
diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index a1b0387..681a082 100644
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -24,8 +24,8 @@
 --- vim-7.4.2189/runtime/defaults.vim	2016-08-09 22:26:29.727124083 +0200
 +++ vim-8.2.0241/runtime/defaults.vim	2020-05-13 10:02:53.863204152 +0300
 @@ -68,6 +68,10 @@
- " Revert with ":unmap Q".
  map Q gq
+ sunmap Q
  
 +" Avoid common :X mistype. replace it with :x
 +" http://stackoverflow.com/a/17793858
diff --git a/vim.spec b/vim.spec
index f6db716..2a8762b 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		8.2.4295
-%define		rel		2
+%define		ver		8.2.4726
+%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:	4fbb220d69db1931ac4b71de340b7b73
+# Source0-md5:	d39ab76fa2d6d9b25377dc110bb507dd
 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
@@ -105,7 +105,7 @@ Patch32:	%{name}-localedir.patch
 
 Patch34:	%{name}-rtdir.patch
 Patch35:	%{name}-ft-mib.patch
-Patch36:	%{name}-ft-lib-udevrules.patch
+
 Patch37:	%{name}-ft-mysql.patch
 Patch38:	%{name}-ft-gyp.patch
 Patch39:	%{name}-revert-7.4.165-noundo.patch
@@ -461,6 +461,7 @@ Obsoletes:	vim-syntax-docker < 1.10.1
 Obsoletes:	vim-syntax-gitcommit
 Obsoletes:	vim-syntax-golang <= 1.3.3-1
 Obsoletes:	vim-syntax-lxc-docker <= 0.9.0-1
+Obsoletes:	vim-syntax-nginx <= 0.3.3-2
 Obsoletes:	vim-syntax-upstart
 BuildArch:	noarch
 
@@ -800,7 +801,7 @@ cp -p runtime/gvim.desktop gvim-motif.desktop
 
 %patch34 -p1
 %patch35 -p1
-%patch36 -p1
+
 %patch37 -p1
 %patch38 -p1
 %patch39 -p1
@@ -1296,6 +1297,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/vim/autoload/README.txt
 %dir %{_datadir}/vim/autoload/dist
 %{_datadir}/vim/autoload/dist/ft.vim
+%{_datadir}/vim/autoload/dist/script.vim
 
 %dir %{_datadir}/vim/ftdetect
 
-- 
2.44.0