Up to 9.0.0032; modprobe patch obsolete

diff --git a/desktop.patch b/desktop.patch
index 91a91c1aca909202046c67ed1f81aef6f83e2d67..3a0e191a68ccae8110e03709304ed61fc921a7a6 100644 (file)
--- a/desktop.patch
+++ b/desktop.patch
@@ -2,9 +2,9 @@ diff --color -ur vim-8.2.2529.orig/gvim-athena.desktop vim-8.2.2529/gvim-athena.
 --- vim-8.2.2529.orig/gvim-athena.desktop      2021-02-17 21:57:03.000000000 +0100
 +++ vim-8.2.2529/gvim-athena.desktop   2021-03-02 14:24:51.277064340 +0100
 @@ -8,7 +8,7 @@
- Name[ru]=GVim
- Name[sr]=GVim
  Name[tr]=GVim
+ Name[uk]=GVim
+ Name[zh_CN]=GVim
 -Name=GVim
 +Name=GVim Athena
  # Translators: This is the Generic Application Name used in the Vim desktop file
@@ -14,9 +14,9 @@ diff --color -ur vim-8.2.2529.orig/gvim-gnome.desktop vim-8.2.2529/gvim-gnome.de
 --- 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
 @@ -8,7 +8,7 @@
- Name[ru]=GVim
- Name[sr]=GVim
  Name[tr]=GVim
+ Name[uk]=GVim
+ Name[zh_CN]=GVim
 -Name=GVim
 +Name=GVim GNOME
  # Translators: This is the Generic Application Name used in the Vim desktop file
@@ -26,9 +26,9 @@ diff --color -ur vim-8.2.2529.orig/gvim-gtk.desktop vim-8.2.2529/gvim-gtk.deskto
 --- 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
 @@ -8,7 +8,7 @@
- Name[ru]=GVim
- Name[sr]=GVim
  Name[tr]=GVim
+ Name[uk]=GVim
+ Name[zh_CN]=GVim
 -Name=GVim
 +Name=GVim GTK
  # Translators: This is the Generic Application Name used in the Vim desktop file
@@ -38,9 +38,9 @@ diff --color -ur vim-8.2.2529.orig/gvim-motif.desktop vim-8.2.2529/gvim-motif.de
 --- 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
 @@ -8,7 +8,7 @@
- Name[ru]=GVim
- Name[sr]=GVim
  Name[tr]=GVim
+ Name[uk]=GVim
+ Name[zh_CN]=GVim
 -Name=GVim
 +Name=GVim Motif
  # Translators: This is the Generic Application Name used in the Vim desktop file

diff --git a/vim-modprobe.patch b/vim-modprobe.patch
deleted file mode 100644 (file)
index 9a0574f..0000000
--- a/vim-modprobe.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- runtime/filetype.vim~      2004-12-04 00:57:07.000000000 +0200
-+++ runtime/filetype.vim       2004-12-15 17:35:10.000000000 +0200
-@@ -1216,7 +1216,7 @@
- au BufNewFile,BufRead *.moo                   setf moo
- 
- " Modconf
--au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf modconf
-+au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules,*/etc/modprobe.conf setf modconf
- 
- " MPD is based on XML
- au BufNewFile,BufRead *.mpd                   setf xml
-

diff --git a/vim-smarty.patch b/vim-smarty.patch
index 4b8f68cfda86f1bc977838db0b0a7eb81102f5b8..bf0543d86eed952c31e1c0a891fb03d181cdd946 100644 (file)
--- a/vim-smarty.patch
+++ b/vim-smarty.patch
@@ -10,9 +10,7 @@
  " Hjson
  au BufNewFile,BufRead *.hjson                 setf hjson
  
-@@ -1396,9 +1399,6 @@
-       \  setf st |
-       \ endif
+@@ -1396,7 +1399,4 @@
  
 -" Smarty templates
 -au BufNewFile,BufRead *.tpl                   setf smarty

diff --git a/vim.spec b/vim.spec
index 2a8762b2a73e00d1eb152fa0cef29ba95fcbfa40..f093f96bee5aa3b7aa201654b4c405c4e1dfdc33 100644 (file)
--- 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             8.2.4726
+%define                ver             9.0.0032
 %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: d39ab76fa2d6d9b25377dc110bb507dd
+# Source0-md5: c43a251b992e2b728058474c15dfa20f
 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
@@ -81,7 +81,7 @@ Patch5:               %{name}-awk.patch
 Patch6:                %{name}-filetype_vim-perl_tests.patch
 Patch7:                %{name}-apache.patch
 Patch8:                %{name}-po-syntax.patch
-Patch9:                %{name}-modprobe.patch
+
 Patch10:       %{name}-doubleparenthesis.patch
 Patch11:       %{name}-syntax-fstab.patch
 Patch12:       010_all_%{name}-6.3-vixie.patch
@@ -774,7 +774,7 @@ cp -p runtime/gvim.desktop gvim-motif.desktop
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p0
+
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
@@ -1297,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/man.vim
 %{_datadir}/vim/autoload/dist/script.vim
 
 %dir %{_datadir}/vim/ftdetect
@@ -1306,6 +1307,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vim/ftplugin/*.vim
 %{_datadir}/vim/ftplugin/logtalk.dict
 
+%dir %{_datadir}/vim/import
+%dir %{_datadir}/vim/import/dist
+%{_datadir}/vim/import/dist/vimhelp.vim
+
 %dir %{_datadir}/vim/indent
 %doc %{_datadir}/vim/indent/README.txt
 %{_datadir}/vim/indent/*.vim