diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491fd..00000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/.gitignore b/.gitignore
index 243a54fe..ab6fce7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,255 @@
-/vim-*.tar.bz2
+/vim-7.4.tar.bz2
+/vim-7.4-2342.tar.bz2
+/vim-8.0-003.tar.bz2
+/vim-8.0-018.tar.bz2
+/vim-8.0-037.tar.bz2
+/vim-8.0-057.tar.bz2
+/vim-8.0-061.tar.bz2
+/vim-8.0-000.tar.bz2
+/vim-8.0-070.tar.bz2
+/vim-8.0-084.tar.bz2
+/vim-8.0-085.tar.bz2
+/vim-8.0-086.tar.bz2
+/vim-8.0-094.tar.bz2
+/vim-8.0-095.tar.bz2
+/vim-8.0-104.tar.bz2
+/vim-8.0-118.tar.bz2
+/vim-8.0-124.tar.bz2
+/vim-8.0-133.tar.bz2
+/vim-8.0-134.tar.bz2
+/vim-8.0-142.tar.bz2
+/vim-8.0-160.tar.bz2
+/vim-8.0-170.tar.bz2
+/vim-8.0-172.tar.bz2
+/vim-8.0-176.tar.bz2
+/vim-8.0-194.tar.bz2
+/vim-8.0-197.tar.bz2
+/vim-8.0-206.tar.bz2
+/vim-8.0-238.tar.bz2
+/vim-8.0-271.tar.bz2
+/vim-8.0-273.tar.bz2
+/vim-8.0-275.tar.bz2
+/vim-8.0-297.tar.bz2
+/vim-8.0-311.tar.bz2
+/vim-8.0-314.tar.bz2
+/vim-8.0-318.tar.bz2
+/vim-8.0-324.tar.bz2
+/vim-8.0-329.tar.bz2
+/vim-8.0-342.tar.bz2
+/vim-8.0-344.tar.bz2
+/vim-8.0-347.tar.bz2
+/vim-8.0-363.tar.bz2
+/vim-8.0-381.tar.bz2
+/vim-8.0-386.tar.bz2
+/vim-8.0-388.tar.bz2
+/vim-8.0-398.tar.bz2
+/vim-8.0-402.tar.bz2
+/vim-8.0-425.tar.bz2
+/vim-8.0-427.tar.bz2
+/vim-8.0-430.tar.bz2
+/vim-8.0-442.tar.bz2
+/vim-8.0-456.tar.bz2
+/vim-8.0-458.tar.bz2
+/vim-8.0-494.tar.bz2
+/vim-8.0-497.tar.bz2
+/vim-8.0-502.tar.bz2
+/vim-8.0-503.tar.bz2
+/vim-8.0-514.tar.bz2
+/vim-8.0-515.tar.bz2
+/vim-8.0-517.tar.bz2
+/vim-8.0-525.tar.bz2
+/vim-8.0-529.tar.bz2
+/vim-8.0-540.tar.bz2
+/vim-8.0-543.tar.bz2
+/vim-8.0-559.tar.bz2
+/vim-8.0-562.tar.bz2
+/vim-8.0-566.tar.bz2
+/vim-8.0-586.tar.bz2
+/vim-8.0-596.tar.bz2
+/vim-8.0-597.tar.bz2
+/vim-8.0-598.tar.bz2
+/vim-8.0-599.tar.bz2
+/vim-8.0-600.tar.bz2
+/vim-8.0-604.tar.bz2
+/vim-8.0-606.tar.bz2
+/vim-8.0-617.tar.bz2
+/vim-8.0-627.tar.bz2
+/vim-8.0-628.tar.bz2
+/vim-8.0-636.tar.bz2
+/vim-8.0-642.tar.bz2
+/vim-8.0-647.tar.bz2
+/vim-8.0-648.tar.bz2
+/vim-8.0-662.tar.bz2
+/vim-8.0-679.tar.bz2
+/vim-8.0-685.tar.bz2
+/vim-8.0-688.tar.bz2
+/vim-8.0-691.tar.bz2
+/vim-8.0-705.tar.bz2
+/vim-8.0-711.tar.bz2
+/vim-8.0-728.tar.bz2
+/vim-8.0-730.tar.bz2
+/vim-8.0-738.tar.bz2
+/vim-8.0-739.tar.bz2
+/vim-8.0-823.tar.bz2
+/vim-8.0-826.tar.bz2
+/vim-8.0-844.tar.bz2
+/vim-8.0-885.tar.bz2
+/vim-8.0-891.tar.bz2
+/vim-8.0-893.tar.bz2
+/vim-8.0-895.tar.bz2
+/vim-8.0-896.tar.bz2
+/vim-8.0-938.tar.bz2
+/vim-8.0-946.tar.bz2
+/vim-8.0-956.tar.bz2
+/vim-8.0-983.tar.bz2
+/vim-8.0-987.tar.bz2
+/vim-8.0-992.tar.bz2
+/vim-8.0-1030.tar.bz2
+/vim-8.0-1052.tar.bz2
+/vim-8.0-1056.tar.bz2
+/vim-8.0-1064.tar.bz2
+/vim-8.0-1067.tar.bz2
+/vim-8.0-1071.tar.bz2
+/vim-8.0-1092.tar.bz2
+/vim-8.0-1097.tar.bz2
+/vim-8.0-1098.tar.bz2
+/vim-8.0-1102.tar.bz2
+/vim-8.0-1123.tar.bz2
+/vim-8.0-1127.tar.bz2
+/vim-8.0-1129.tar.bz2
+/vim-8.0-1132.tar.bz2
+/vim-8.0-1144.tar.bz2
+/vim-8.0-1155.tar.bz2
+/vim-8.0-1171.tar.bz2
+/vim-8.0-1173.tar.bz2
+/vim-8.0-1175.tar.bz2
+/vim-8.0-1176.tar.bz2
+/vim-8.0-1184.tar.bz2
+/vim-8.0-1187.tar.bz2
+/vim-8.0-1203.tar.bz2
+/vim-8.0-1207.tar.bz2
+/vim-8.0-1213.tar.bz2
+/vim-8.0-1216.tar.bz2
+/vim-8.0-1226.tar.bz2
+/vim-8.0-1238.tar.bz2
+/vim-8.0-1240.tar.bz2
+/vim-8.0-1241.tar.bz2
+/vim-8.0-1257.tar.bz2
+/vim-8.0-1272.tar.bz2
+/vim-8.0-1274.tar.bz2
+/vim-8.0-1283.tar.bz2
+/vim-8.0-1322.tar.bz2
+/vim-8.0-1326.tar.bz2
+/vim-8.0-1330.tar.bz2
+/vim-8.0-1349.tar.bz2
+/vim-8.0-1351.tar.bz2
+/vim-8.0-1358.tar.bz2
+/vim-8.0-1359.tar.bz2
+/vim-8.0-1360.tar.bz2
+/vim-8.0-1367.tar.bz2
+/vim-8.0-1376.tar.bz2
+/vim-8.0-1379.tar.bz2
+/vim-8.0-1386.tar.bz2
+/vim-8.0-1387.tar.bz2
+/vim-8.0-1389.tar.bz2
+/vim-8.0-1390.tar.bz2
+/vim-8.0-1401.tar.bz2
+/vim-8.0-1406.tar.bz2
+/vim-8.0-1427.tar.bz2
+/vim-8.0-1428.tar.bz2
+/vim-8.0-1438.tar.bz2
+/vim-8.0-1451.tar.bz2
+/vim-8.0-1473.tar.bz2
+/vim-8.0-1475.tar.bz2
+/vim-8.0-1478.tar.bz2
+/vim-8.0-1505.tar.bz2
+/vim-8.0-1509.tar.bz2
+/vim-8.0-1520.tar.bz2
+/vim-8.0-1523.tar.bz2
+/vim-8.0-1527.tar.bz2
+/vim-8.0-1543.tar.bz2
+/vim-8.0-1553.tar.bz2
+/vim-8.0-1569.tar.bz2
+/vim-8.0-1573.tar.bz2
+/vim-8.0-1587.tar.bz2
+/vim-8.0-1589.tar.bz2
+/vim-8.0-1591.tar.bz2
+/vim-8.0-1599.tar.bz2
+/vim-8.0-1603.tar.bz2
+/vim-8.0-1605.tar.bz2
+/vim-8.0-1625.tar.bz2
+/vim-8.0-1630.tar.bz2
+/vim-8.0-1661.tar.bz2
+/vim-8.0-1666.tar.bz2
+/vim-8.0-1679.tar.bz2
+/vim-8.0-1704.tar.bz2
+/vim-8.0-1755.tar.bz2
+/vim-8.0-1763.tar.bz2
+/vim-8.0-1765.tar.bz2
+/vim-8.0-1766.tar.bz2
+/vim-8.0-1787.tar.bz2
+/vim-8.0-1788.tar.bz2
+/vim-8.0-1789.tar.bz2
+/vim-8.0-1806.tar.bz2
+/vim-8.0-1813.tar.bz2
+/vim-8.0-1842.tar.bz2
+/vim-8.0-1848.tar.bz2
+/vim-8.1-001.tar.bz2
+/vim-8.1-010.tar.bz2
+/vim-8.1-016.tar.bz2
+/vim-8.1-020.tar.bz2
+/vim-8.1-022.tar.bz2
+/vim-8.1-026.tar.bz2
+/vim-8.1-034.tar.bz2
+/vim-8.1-035.tar.bz2
+/vim-8.1-039.tar.bz2
+/vim-8.1-042.tar.bz2
+/vim-8.1-055.tar.bz2
+/vim-8.1-072.tar.bz2
+/vim-8.1-095.tar.bz2
+/vim-8.1-115.tar.bz2
+/vim-8.1-117.tar.bz2
+/vim-8.1-119.tar.bz2
+/vim-8.1-177.tar.bz2
+/vim-8.1-189.tar.bz2
+/vim-8.1-197.tar.bz2
+/vim-8.1-207.tar.bz2
+/vim-8.1-209.tar.bz2
+/vim-8.1-213.tar.bz2
+/vim-8.1-229.tar.bz2
+/vim-8.1-233.tar.bz2
+/vim-8.1-240.tar.bz2
+/vim-8.1-254.tar.bz2
+/vim-8.1-258.tar.bz2
+/vim-8.1-264.tar.bz2
+/vim-8.1-279.tar.bz2
+/vim-8.1-287.tar.bz2
+/vim-8.1-328.tar.bz2
+/vim-8.1-351.tar.bz2
+/vim-8.1-408.tar.bz2
+/vim-8.1-450.tar.bz2
+/vim-8.1-451.tar.bz2
+/vim-8.1-483.tar.bz2
+/vim-8.1-497.tar.bz2
+/vim-8.1-511.tar.bz2
+/vim-8.1-513.tar.bz2
+/vim-8.1-527.tar.bz2
+/vim-8.1-549.tar.bz2
+/vim-8.1-575.tar.bz2
+/vim-8.1-702.tar.bz2
+/vim-8.1-714.tar.bz2
+/vim-8.1-789.tar.bz2
+/vim-8.1-818.tar.bz2
+/vim-8.1-837.tar.bz2
+/vim-8.1-847.tar.bz2
+/vim-8.1-873.tar.bz2
+/vim-8.1-880.tar.bz2
+/vim-8.1-897.tar.bz2
+/vim-8.1-918.tar.bz2
+/vim-8.1-956.tar.bz2
+/vim-8.1-994.tar.bz2
+/vim-8.1-998.tar.bz2
+/vim-8.1-1048.tar.bz2
+/vim-8.1-1099.tar.bz2
+/vim-8.1-1137.tar.bz2
+/vim-8.1-1359.tar.bz2
diff --git a/7.4.899 b/7.4.899
new file mode 100644
index 00000000..df1534fd
--- /dev/null
+++ b/7.4.899
@@ -0,0 +1,140 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.4.899
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.4.899
+Problem:    README file is not optimal.
+Solution:   Move buttons, update some text. (closes #460)
+Files:      README.txt, README.md
+
+
+*** ../vim-7.4.898/README.txt	2013-08-10 13:24:51.000000000 +0200
+--- README.txt	2015-10-25 13:50:34.962876572 +0100
+***************
+*** 1,7 ****
+  README.txt for version 7.4 of Vim: Vi IMproved.
+  
+  
+! WHAT IS VIM
+  
+  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
+  have been added: multi-level undo, syntax highlighting, command line history,
+--- 1,7 ----
+  README.txt for version 7.4 of Vim: Vi IMproved.
+  
+  
+! WHAT IS VIM?
+  
+  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
+  have been added: multi-level undo, syntax highlighting, command line history,
+***************
+*** 21,26 ****
+--- 21,30 ----
+  
+  DISTRIBUTION
+  
++ You can often use your favorite package manager to install Vim.  On Mac and
++ Linux a small version of Vim is pre-installed, you still need to install Vim
++ if you want more features.
++ 
+  There are separate distributions for Unix, PC, Amiga and some other systems.
+  This README.txt file comes with the runtime archive.  It includes the
+  documentation, syntax files and other files that are used at runtime.  To run
+***************
+*** 94,101 ****
+  The latest news about Vim can be found on the Vim home page:
+  	http://www.vim.org/
+  
+! If you have problems, have a look at the Vim FAQ:
+! 	http://vimdoc.sf.net/vimfaq.html
+  
+  If you still have problems or any other questions, use one of the mailing
+  lists to discuss them with Vim users and developers:
+--- 98,106 ----
+  The latest news about Vim can be found on the Vim home page:
+  	http://www.vim.org/
+  
+! If you have problems, have a look at the Vim documentation or tips:
+! 	http://www.vim.org/docs.php
+! 	http://vim.wikia.com/wiki/Vim_Tips_Wiki
+  
+  If you still have problems or any other questions, use one of the mailing
+  lists to discuss them with Vim users and developers:
+***************
+*** 110,115 ****
+  Send any other comments, patches, flowers and suggestions to:
+  
+  	Bram Moolenaar		E-mail:	Bram@vim.org
+- 	Finsterruetihof 1
+- 	8134 Adliswil
+- 	Switzerland
+--- 115,117 ----
+*** ../vim-7.4.898/README.md	2015-09-25 17:50:16.350057915 +0200
+--- README.md	2015-10-25 13:50:31.734914034 +0100
+***************
+*** 1,7 ****
+  `README.md` for version 7.4 of Vim: Vi IMproved.
+  
+  
+! ## What is VIM ##
+  
+  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
+  have been added: multi-level undo, syntax highlighting, command line history,
+--- 1,9 ----
+  `README.md` for version 7.4 of Vim: Vi IMproved.
++ [![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
++ [![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master)
+  
+  
+! ## What is Vim? ##
+  
+  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
+  have been added: multi-level undo, syntax highlighting, command line history,
+***************
+*** 21,26 ****
+--- 23,32 ----
+  
+  ## Distribution ##
+  
++ You can often use your favorite package manager to install Vim.  On Mac and
++ Linux a small version of Vim is pre-installed, you still need to install Vim
++ if you want more features.
++ 
+  There are separate distributions for Unix, PC, Amiga and some other systems.
+  This `README.md` file comes with the runtime archive.  It includes the
+  documentation, syntax files and other files that are used at runtime.  To run
+***************
+*** 29,37 ****
+  want or must compile it yourself.  Check http://www.vim.org/download.php for
+  an overview of currently available distributions.
+  
+- [![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
+- [![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master)
+- 
+  
+  ## Documentation ##
+  
+--- 35,40 ----
+*** ../vim-7.4.898/src/version.c	2015-10-13 20:55:46.058715228 +0200
+--- src/version.c	2015-10-25 13:52:02.669858690 +0100
+***************
+*** 743,744 ****
+--- 743,746 ----
+  {   /* Add new patch number below this line */
++ /**/
++     899,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+45. You buy a Captain Kirk chair with a built-in keyboard and mouse.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/Changelog.rpm b/Changelog.rpm
new file mode 100644
index 00000000..86e85af1
--- /dev/null
+++ b/Changelog.rpm
@@ -0,0 +1,430 @@
+* Tue Aug 28 2012 Karsten Hopp <karsten@redhat.com> 7.3.638-1
+- patchlevel 638
+
+* Mon Aug 06 2012 Karsten Hopp <karsten@redhat.com> 2:7.3.622-2
+- add epoch to spec.vim and automatic changelog entries
+
+* Mon Aug 06 2012 Karsten Hopp <karsten@redhat.com> 7.3.622-1
+- patchlevel 622
+
+* Mon Aug 06 2012 Karsten Hopp <karsten@redhat.com> 7.3.604-1
+- drop vim-6.1-rh3.patch, (bz #754801)
+
+* Wed Jul 18 2012 Karsten Hopp <karsten@redhat.com> 7.3.604-1
+- patchlevel 604
+
+* Wed Jul 11 2012 Petr Pisar <ppisar@redhat.com> - 2:7.3.594-2
+- Perl 5.16 rebuild
+
+* Tue Jul 10 2012 Karsten Hopp <karsten@redhat.com> 7.3.594-1
+- patchlevel 594
+
+* Tue Jul 10 2012 Karsten Hopp <karsten@redhat.com> 7.3.592-1
+- patchlevel 592
+
+* Mon Jul 09 2012 Petr Pisar <ppisar@redhat.com> - 2:7.3.584-2
+- Perl 5.16 rebuild
+
+* Mon Jul 02 2012 Karsten Hopp <karsten@redhat.com> 7.3.584-1
+- patchlevel 584
+
+* Thu Jun 28 2012 Petr Pisar <ppisar@redhat.com> - 2:7.3.556-2
+- Perl 5.16 rebuild
+
+* Mon Jun 18 2012 Karsten Hopp <karsten@redhat.com> 7.3.556-1
+- patchlevel 556
+
+* Mon Jun 11 2012 Petr Pisar <ppisar@redhat.com> - 2:7.3.515-2
+- Perl 5.16 rebuild
+
+* Mon May 21 2012 Karsten Hopp <karsten@redhat.com> 7.3.515-1
+- enable highlighting for older log files (#816848)
+
+* Tue May 08 2012 Karsten Hopp <karsten@redhat.com> 7.3.515-1
+- patchlevel 515
+
+* Fri Mar 16 2012 Karsten Hopp <karsten@redhat.com> 7.3.471-1
+- patchlevel 471
+
+* Mon Feb 13 2012 Karsten Hopp <karsten@redhat.com> 7.3.444-1
+- patchlevel 444
+
+* Tue Feb 07 2012 Karsten Hopp <karsten@redhat.com> 7.3.434-1
+- patchlevel 434
+
+* Tue Feb 07 2012 Karsten Hopp <karsten@redhat.com> 7.3.393-3
+- update spec file template, bugzilla 736774
+
+* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 7.3.393-3
+- rebuild against the new ruby library
+
+* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 7.3.393-2
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
+* Thu Jan 05 2012 Karsten Hopp <karsten@redhat.com> 7.3.393-1
+- patchlevel 393
+- fix boolean key 'Terminal' in gvim.desktop
+
+* Fri Dec 23 2011 Karsten Hopp <karsten@redhat.com> 7.3.386-1
+- patchlevel 386
+
+* Mon Sep 26 2011 Karsten Hopp <karsten@redhat.com> 7.3.322-1
+- patchlevel 322
+
+* Wed Sep 21 2011 Karsten Hopp <karsten@redhat.com> 7.3.315-1
+- patchlevel 315
+
+* Mon Aug 29 2011 Karsten Hopp <karsten@redhat.com> 7.3.289-1
+- patchlevel 289
+
+* Mon Aug 29 2011 Karsten Hopp <karsten@redhat.com> 7.3.244-4
+- Remove old patched files. (Ricky Zhou <ricky@fedoraproject.org>)
+  (bugzilla #709456)
+
+* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 2:7.3.244-3
+- Perl mass rebuild
+
+* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 2:7.3.244-2
+- Perl mass rebuild
+
+* Mon Jul 11 2011 Karsten Hopp <karsten@redhat.com> 7.3.244-1
+- patchlevel 244
+
+* Tue Jun 14 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2:7.3.206-3
+- Perl mass rebuild
+
+* Tue May 31 2011 Ville Skyttä <ville.skytta@iki.fi> - 2:7.3.206-2
+- Own the /usr/share/vim/vim73 dir.
+
+* Mon May 30 2011 Karsten Hopp <karsten@redhat.com> 7.3.206-1
+- drop xxd-locale patch
+- update to patchlevel 206
+
+* Wed May 11 2011 Karsten Hopp <karsten@redhat.com> 7.3.189-1
+- patchlevel 189
+
+* Wed Mar 16 2011 Karsten Hopp <karsten@redhat.com> 7.3.138-1
+- patchlevel 138
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:7.3.107-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 24 2011 Karsten Hopp <karsten@redhat.com> 7.3.107-1
+- patchlevel 107
+
+* Mon Jan 10 2011 Karsten Hopp <karsten@redhat.com> 7.3.099-1
+- patchlevel 099
+
+* Mon Jan 03 2011 Karsten Hopp <karsten@redhat.com> 7.3.094-1
+- patchlevel 094
+
+* Thu Dec 09 2010 Karsten Hopp <karsten@redhat.com> 7.3.081-1
+- patchlevel 081
+
+* Wed Dec 08 2010 Karsten Hopp <karsten@redhat.com> 7.3.080-1
+- patchlevel 080
+
+* Fri Dec 03 2010 Karsten Hopp <karsten@redhat.com> 7.3.075-1
+- patchlevel 075
+
+* Thu Dec 02 2010 Karsten Hopp <karsten@redhat.com> 7.3.073-1
+- patchlevel 073
+
+* Thu Nov 25 2010 Karsten Hopp <karsten@redhat.com> 7.3.069-1
+- patchlevel 069
+
+* Wed Nov 24 2010 Karsten Hopp <karsten@redhat.com> 7.3.068-1
+- patchlevel 068
+
+* Wed Nov 24 2010 Karsten Hopp <karsten@redhat.com> 7.3.063-1
+- patchlevel 063
+
+* Wed Nov 17 2010 Karsten Hopp <karsten@redhat.com> 7.3.062-1
+- patchlevel 062
+
+* Tue Nov 16 2010 Karsten Hopp <karsten@redhat.com> 7.3.061-1
+- patchlevel 061
+
+* Tue Nov 16 2010 Karsten Hopp <karsten@redhat.com> 7.3.056-1
+- patchlevel 056
+
+* Thu Nov 11 2010 Karsten Hopp <karsten@redhat.com> 7.3.055-1
+- patchlevel 055
+
+* Wed Nov 10 2010 Karsten Hopp <karsten@redhat.com> 7.3.051-1
+- patchlevel 051
+
+* Thu Nov 04 2010 Karsten Hopp <karsten@redhat.com> 7.3.050-1
+- patchlevel 050
+
+* Thu Nov 04 2010 Karsten Hopp <karsten@redhat.com> 7.3.048-1
+- patchlevel 048
+
+* Thu Oct 28 2010 Karsten Hopp <karsten@redhat.com> 7.3.047-1
+- patchlevel 047
+
+* Wed Oct 27 2010 Karsten Hopp <karsten@redhat.com> 7.3.046-1
+- patchlevel 046
+
+* Wed Oct 27 2010 Karsten Hopp <karsten@redhat.com> 7.3.039-1
+- patchlevel 039
+
+* Sun Oct 24 2010 Karsten Hopp <karsten@redhat.com> 7.3.035-1
+- patchlevel 035
+
+* Sat Oct 23 2010 Karsten Hopp <karsten@redhat.com> 7.3.034-1
+- patchlevel 034
+
+* Sat Oct 23 2010 Karsten Hopp <karsten@redhat.com> 7.3.033-1
+- patchlevel 033
+
+* Thu Oct 21 2010 Karsten Hopp <karsten@redhat.com> 7.3.032-1
+- patchlevel 032
+
+* Wed Oct 20 2010 Karsten Hopp <karsten@redhat.com> 7.3.031-1
+- patchlevel 031
+
+* Sat Oct 16 2010 Karsten Hopp <karsten@redhat.com> 7.3.029-1
+- patchlevel 029
+
+* Fri Oct 15 2010 Karsten Hopp <karsten@redhat.com> 7.3.028-1
+- patchlevel 028
+
+* Thu Oct 14 2010 Karsten Hopp <karsten@redhat.com> 7.3.027-1
+- patchlevel 027
+
+* Wed Oct 13 2010 Karsten Hopp <karsten@redhat.com> 7.3.026-1
+- patchlevel 026
+
+* Sun Oct 10 2010 Karsten Hopp <karsten@redhat.com> 7.3.021-1
+- patchlevel 021
+
+* Sat Oct 09 2010 Karsten Hopp <karsten@redhat.com> 7.3.020-1
+- patchlevel 020
+
+* Fri Oct 01 2010 Karsten Hopp <karsten@redhat.com> 7.3.019-1
+- patchlevel 019
+
+* Thu Sep 30 2010 Karsten Hopp <karsten@redhat.com> 7.3.018-1
+- patchlevel 018
+
+* Thu Sep 30 2010 Karsten Hopp <karsten@redhat.com> 7.3.011-3
+- add filesystem subpackage (#628293)
+
+* Wed Sep 29 2010 jkeating - 2:7.3.011-2
+- Rebuilt for gcc bug 634757
+
+* Wed Sep 22 2010 Karsten Hopp <karsten@redhat.com> 7.3.011-1
+- update to VIM 7.3 patchlevel 011
+
+# vim:nrformats-=octal
+* Tue Jul 27 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 7.2.446-2
+- Rebuild against python 2.7
+
+* Tue Jul 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.446-1
+- patchlevel 446
+
+* Thu Jul 08 2010 Karsten Hopp <karsten@redhat.com> 7.2.445-1
+- patchlevel 445
+
+* Wed Jun 23 2010 Karsten Hopp <karsten@redhat.com> 7.2.444-2
+- rebuild with perl-5.12
+
+* Sun Jun 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.444-1
+- patchlevel 444
+
+* Sun Jun 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.443-1
+- patchlevel 443
+
+* Sat Jun 05 2010 Karsten Hopp <karsten@redhat.com> 7.2.442-1
+- patchlevel 442
+
+* Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 2:7.2.441-2
+- Mass rebuild with perl-5.12.0
+
+* Sun May 30 2010 Karsten Hopp <karsten@redhat.com> 7.2.441-1
+- patchlevel 441
+
+* Sat May 29 2010 Karsten Hopp <karsten@redhat.com> 7.2.440-1
+- patchlevel 440
+
+* Wed May 26 2010 Karsten Hopp <karsten@redhat.com> 7.2.438-1
+- patchlevel 438
+
+* Sat May 22 2010 Karsten Hopp <karsten@redhat.com> 7.2.437-1
+- patchlevel 437
+
+* Sun May 16 2010 Karsten Hopp <karsten@redhat.com> 7.2.436-1
+- patchlevel 436
+
+* Sat May 15 2010 Karsten Hopp <karsten@redhat.com> 7.2.433-1
+- patchlevel 433
+
+* Fri May 14 2010 Karsten Hopp <karsten@redhat.com> 7.2.427-1
+- patchlevel 427
+
+* Thu May 13 2010 Karsten Hopp <karsten@redhat.com> 7.2.422-1
+- patchlevel 422
+
+* Fri May 07 2010 Karsten Hopp <karsten@redhat.com> 7.2.416-1
+- patchlevel 416
+
+* Tue Apr 20 2010 Karsten Hopp <karsten@redhat.com> 7.2.411-2
+- fix rvim manpage (#583180)
+
+* Wed Mar 24 2010 Karsten Hopp <karsten@redhat.com> 7.2.411-1
+- patchlevel 411
+
+* Tue Mar 23 2010 Karsten Hopp <karsten@redhat.com> 7.2.410-1
+- patchlevel 410
+
+* Sat Mar 20 2010 Karsten Hopp <karsten@redhat.com> 7.2.403-1
+- patchlevel 403
+
+* Thu Mar 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.402-1
+- patchlevel 402
+
+* Wed Mar 17 2010 Karsten Hopp <karsten@redhat.com> 7.2.399-1
+- patchlevel 399
+
+* Wed Mar 10 2010 Karsten Hopp <karsten@redhat.com> 7.2.394-1
+- patchlevel 394
+
+* Wed Mar 03 2010 Karsten Hopp <karsten@redhat.com> 7.2.385-1
+- patchlevel 385
+
+* Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 7.2.384-1
+- patchlevel 384
+
+* Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 7.2.381-1
+- patchlevel 381
+
+* Sat Feb 27 2010 Karsten Hopp <karsten@redhat.com> 7.2.377-1
+- patchlevel 377
+
+* Wed Feb 24 2010 Karsten Hopp <karsten@redhat.com> 7.2.376-1
+- patchlevel 376
+
+* Thu Feb 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.368-1
+- patchlevel 368
+
+* Thu Feb 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.367-1
+- patchlevel 367
+
+* Wed Feb 17 2010 Karsten Hopp <karsten@redhat.com> 7.2.365-1
+- patchlevel 365
+
+* Fri Feb 12 2010 Karsten Hopp <karsten@redhat.com> 7.2.359-1
+- patchlevel 359
+
+* Thu Feb 11 2010 Karsten Hopp <karsten@redhat.com> 7.2.357-1
+- patchlevel 357
+
+* Thu Feb 04 2010 Karsten Hopp <karsten@redhat.com> 7.2.356-1
+- patchlevel 356
+
+* Wed Feb 03 2010 Karsten Hopp <karsten@redhat.com> 7.2.354-1
+- patchlevel 354
+
+* Fri Jan 29 2010 Karsten Hopp <karsten@redhat.com> 7.2.351-1
+- patchlevel 351
+
+* Thu Jan 28 2010 Karsten Hopp <karsten@redhat.com> 7.2.350-1
+- patchlevel 350
+
+* Mon Dec  7 2009 Stepan Kasal <skasal@redhat.com> - 2:7.2.315-2
+- rebuild against perl 5.10.1
+
+* Wed Dec 03 2009 Karsten Hopp <karsten@redhat.com> 7.2.315-1
+- patchlevel 315
+- fix vimrc location in man page (#456992)
+- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
+- Buildrequire ruby, ruby-devel (#503872)
+- Remove check for static gravity (#510307)
+- sort tags file (#517725)
+- use one gvim to open multiple file selections from nautilus (#519265)
+- use elinks -source instead of elinks -dump (#518791)
+- add ext4 keyword to /etc/fstab syntax highlighting (#498290)
+
+* Mon Nov 09 2009 Karsten Hopp <karsten@redhat.com> 7.2.284-1
+- patchlevel 284
+
+* Thu Aug 20 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-3
+- change range of system ids in /etc/profile.d/vim/* (#518555)
+
+* Mon Aug 03 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-2
+- add fix for glibc fortify segfault (#514717, Adam Tkac)
+
+* Sat Aug 01 2009 Karsten Hopp <karsten@redhat.com> 7.2.245-1
+- add 97 upstream patches to get to patchlevel 245
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:7.2.148-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Mar 27 2009 Karsten Hopp <karsten@redhat.com> 7.2.148-1
+- patchlevel 148, fixes #461417
+
+* Tue Mar 10 2009 Karsten Hopp <karsten@redhat.com> 7.2.132-1
+- patchlevel 132, fixes accesses to freed memory
+
+* Wed Mar 04 2009 Karsten Hopp <karsten@redhat.com> 7.2.131-1
+- patchlevel 131
+
+* Tue Feb 24 2009 Karsten Hopp <karsten@redhat.com> 7.2.127-1
+- patchlevel 127
+
+* Mon Feb 23 2009 Karsten Hopp <karsten@redhat.com> 7.2.124-1
+- patchlevel 124
+
+* Mon Jan 26 2009 Karsten Hopp <karsten@redhat.com> 7.2.088-1
+- patchlevel 88
+
+* Thu Jan 08 2009 Karsten Hopp <karsten@redhat.com> 7.2.079-2
+- patchlevel 79
+
+* Thu Dec 04 2008 Jesse Keating <jkeating@redhat.com> - 7.2.060-2
+- Rebuild for new python.
+
+* Mon Dec 01 2008 Karsten Hopp <karsten@redhat.com> 7.2.060-1
+- patchlevel 60
+
+* Mon Nov 10 2008 Karsten Hopp <karsten@redhat.com> 7.2.032-1
+- patchlevel 32
+
+* Mon Nov 03 2008 Karsten Hopp <karsten@redhat.com> 7.2.026-2
+- add more /usr/share/vim/vimfiles directories (#444387)
+
+* Mon Nov 03 2008 Karsten Hopp <karsten@redhat.com> 7.2.026-1
+- patchlevel 26
+- own some directories in /usr/share/vim/vimfiles (#469491)
+
+* Tue Oct 21 2008 Karsten Hopp <karsten@redhat.com> 7.2.025-2
+- re-enable clean
+
+* Mon Oct 20 2008 Karsten Hopp <karsten@redhat.com> 7.2.025-1
+- patchlevel 25
+- add Categories tag to desktop file (#226526)
+- add requirement on hicolor-icon-theme to vim-X11 (#226526)
+- drop Amiga info files (#226526)
+- remove non-utf8 man pages (#226526)
+- drop Application from categories (#226526)
+
+* Tue Sep 30 2008 Karsten Hopp <karsten@redhat.com> 7.2.022-1
+- patchlevel 22
+
+* Mon Sep 08 2008 Karsten Hopp <karsten@redhat.com> 7.2.013-1
+- patchlevel 13
+
+* Mon Aug 25 2008 Karsten Hopp <karsten@redhat.com> 7.2.006-1
+- patchlevel 6
+
+* Mon Aug 18 2008 Karsten Hopp <karsten@redhat.com> 7.2.002-1
+- patchlevel 2
+- fix specfile template (#446070)
+- old specfile changelog moved to Changelog.rpm
+
+* Fri Aug 14 2008 Karsten Hopp <karsten@redhat.com> 7.2.000-1
+- vim 7.2
+- drop 330 patches
+
diff --git a/ci.fmf b/ci.fmf
deleted file mode 100644
index c5aa0e08..00000000
--- a/ci.fmf
+++ /dev/null
@@ -1 +0,0 @@
-resultsdb-testcase: separate
diff --git a/ftplugin-spec.vim b/ftplugin-spec.vim
new file mode 100644
index 00000000..2a961f82
--- /dev/null
+++ b/ftplugin-spec.vim
@@ -0,0 +1,210 @@
+" Plugin to update the %changelog section of RPM spec files
+" Filename: spec.vim
+" Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com
+" Former Maintainer: Gustavo Niemeyer <niemeyer@conectiva.com> (until March 2014)
+" Last Change: Mon Jun 01 21:15 MSK 2015 Igor Gnatenko
+
+if exists("b:did_ftplugin")
+	finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if !exists("no_plugin_maps") && !exists("no_spec_maps")
+	if !hasmapto("<Plug>SpecChangelog")
+		map <buffer> <LocalLeader>c <Plug>SpecChangelog
+	endif
+endif
+
+if !hasmapto("call <SID>SpecChangelog(\"\")<CR>")
+       noremap <buffer> <unique> <script> <Plug>SpecChangelog :call <SID>SpecChangelog("")<CR>
+endif
+
+if !exists("*s:GetRelVer")
+	function! s:GetRelVer()
+		if has('python')
+python << PYEND
+import sys, datetime, shutil, tempfile
+import vim
+
+try:
+    import rpm
+except ImportError:
+    pass
+else:
+    specfile = vim.current.buffer.name
+    if specfile:
+        rpm.delMacro("dist")
+        spec = rpm.spec(specfile)
+        headers = spec.sourceHeader
+        version = headers["Version"]
+        release = headers["Release"]
+        vim.command("let ver = " + version)
+        vim.command("let rel = " + release)
+PYEND
+		endif
+	endfunction
+endif
+
+if !exists("*s:SpecChangelog")
+	function s:SpecChangelog(format)
+		if strlen(a:format) == 0
+			if !exists("g:spec_chglog_format")
+				let email = input("Name <email address>: ")
+				let g:spec_chglog_format = "%a %b %d %Y " . l:email
+				echo "\r"
+			endif
+			let format = g:spec_chglog_format
+		else
+			if !exists("g:spec_chglog_format")
+				let g:spec_chglog_format = a:format
+			endif
+			let format = a:format
+		endif
+		let line = 0
+		let name = ""
+		let ver = ""
+		let rel = ""
+		let nameline = -1
+		let verline = -1
+		let relline = -1
+		let chgline = -1
+		while (line <= line("$"))
+			let linestr = getline(line)
+			if (name == "" && linestr =~? '^Name:')
+				let nameline = line
+				let name = substitute(strpart(linestr,5), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
+			elseif (ver == "" && linestr =~? '^Version:')
+				let verline = line
+				let ver = substitute(strpart(linestr,8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
+			elseif (rel == "" && linestr =~? '^Release:')
+				let relline = line
+				let rel = substitute(strpart(linestr,8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
+			elseif (linestr =~? '^%changelog')
+				let chgline = line
+				execute line
+				break
+			endif
+			let line = line+1
+		endwhile
+		if (nameline != -1 && verline != -1 && relline != -1)
+			let include_release_info = exists("g:spec_chglog_release_info")
+			let name = s:ParseRpmVars(name, nameline)
+			let ver = s:ParseRpmVars(ver, verline)
+			let rel = s:ParseRpmVars(rel, relline)
+		else
+			let include_release_info = 0
+		endif
+
+		call s:GetRelVer()
+
+		if (chgline == -1)
+			let option = confirm("Can't find %changelog. Create one? ","&End of file\n&Here\n&Cancel",3)
+			if (option == 1)
+				call append(line("$"),"")
+				call append(line("$"),"%changelog")
+				execute line("$")
+				let chgline = line(".")
+			elseif (option == 2)
+				call append(line("."),"%changelog")
+				normal j
+				chgline = line(".")
+			endif
+		endif
+		if (chgline != -1)
+			let tmptime = v:lc_time
+			language time C
+			let parsed_format = "* ".strftime(format)." - ".ver."-".rel
+			execute "language time" tmptime
+			let release_info = "+ ".name."-".ver."-".rel
+			let wrong_format = 0
+			let wrong_release = 0
+			let insert_line = 0
+			if (getline(chgline+1) != parsed_format)
+				let wrong_format = 1
+			endif
+			if (include_release_info && getline(chgline+2) != release_info)
+				let wrong_release = 1
+			endif
+			if (wrong_format || wrong_release)
+				if (include_release_info && !wrong_release && !exists("g:spec_chglog_never_increase_release"))
+					let option = confirm("Increase release? ","&Yes\n&No",1)
+					if (option == 1)
+						execute relline
+						normal 

+						let rel = substitute(strpart(getline(relline),8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
+						let release_info = "+ ".name."-".ver."-".rel
+					endif
+				endif
+				let n = 0
+				call append(chgline+n, parsed_format)
+				if include_release_info
+					let n = n + 1
+					call append(chgline+n, release_info)
+				endif
+				let n = n + 1
+				call append(chgline+n,"- ")
+				let n = n + 1
+				call append(chgline+n,"")
+				let insert_line = chgline+n
+			else
+				let line = chgline
+				if !exists("g:spec_chglog_prepend")
+					while !(getline(line+2) =~ '^\( *\|\*.*\)$')
+						let line = line+1
+					endwhile
+				endif
+				call append(line+1,"- ")
+				let insert_line = line+2
+			endif
+			execute insert_line
+			startinsert!
+		endif
+	endfunction
+endif
+
+if !exists("*s:ParseRpmVars")
+    function s:ParseRpmVars(str, strline)
+	let end = -1
+	let ret = ""
+	while (1)
+		let start = match(a:str, "\%{", end+1)
+		if (start == -1)
+			let ret = ret . strpart(a:str, end+1)
+			break
+		endif
+		let ret = ret . strpart(a:str, end+1, start-(end+1))
+		let end = match(a:str, "}", start)
+		if (end == -1)
+			let ret = ret . strpart(a:str, start)
+			break
+		endif
+		let varname = strpart(a:str, start+2, end-(start+2))
+		execute a:strline
+		let definestr = "^[ \t]*%(?:global|define)[ \t]\\+" . varname . "[ \t]\\+\\(.*\\)$"
+		let linenum = search(definestr, "bW")
+		if (linenum != -1)
+			let ret = ret .  substitute(getline(linenum), definestr, "\\1", "")
+		else
+			let ret = ret . strpart(str, start, end+1-start)
+		endif
+	endwhile
+	return ret
+    endfunction
+endif
+
+" The following lines, along with the macros/matchit.vim plugin,
+" make it easy to navigate the different sections of a spec file
+" with the % key (thanks to Max Ischenko).
+
+let b:match_ignorecase = 0
+let b:match_words =
+  \ '^Name:^%description:^%clean:^%(?:auto)?setup:^%build:^%install:^%files:' .
+  \ '^%package:^%preun:^%postun:^%changelog'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+let b:undo_ftplugin = "unlet! b:match_ignorecase b:match_words"
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index 80852883..00000000
--- a/gating.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
- 
-#Rawhide
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
- 
-#gating rhel
---- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
diff --git a/gvim.desktop b/gvim.desktop
new file mode 100644
index 00000000..97bf6ac8
--- /dev/null
+++ b/gvim.desktop
@@ -0,0 +1,64 @@
+[Desktop Entry]
+Name=Vi IMproved
+Name[bg]=Vi Ðåäàêòîð
+Name[ca]=Vi Millorat
+Name[da]=Vi forbedret
+Name[eo]=VIM
+Name[et]=Täiustatud Vi (vim)
+Name[fr]=Vi étendu (VIM)
+Name[he]=רפושמ Vi
+Name[hu]=Vi
+Name[is]=Vi IMproved ritillinn
+Name[it]=Vi iMproved
+Name[no]=Vi IMproved (forbedret VI)
+Name[pl]=Poprawiony VI (vim)
+Name[ro]=VIM
+Name[ru]=Улучшенный VI
+Name[sk]=Vi IMpreved
+Name[sl]=Izboljšani vi (vim)
+Name[sv]=Förbättrad Vi
+Name[zh_CN.GB2312]=改进的 Vi
+Comment=Powerful text editor with scripting functions and macro recorder
+Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè
+Comment[ca]=Editor vi potent
+Comment[cs]=Mocný textový editor vi
+Comment[da]=En kraftig vi tekstbehandler
+Comment[de]=Ein leistungsfähiger vi-Editor
+Comment[el]=Πανίσχυρος διορθωτής vi
+Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn
+Comment[es]=Una versión mejorada del editor vi
+Comment[et]=Võimas tekstiredaktor vi
+Comment[fi]=Tehokas vi-tekstieditori
+Comment[fr]=Éditeur vi puissant
+Comment[gl]=Potente editor vi
+Comment[he]=Vi המצועה בר ךרועה
+Comment[hr]=Napredni vi uređivač
+Comment[hu]=Vi szövegszerkesztő
+Comment[is]=Öflug útgáfa vi ritilsins
+Comment[it]=Un editor vi potenziato
+Comment[ja]=強力なViエディタ
+Comment[lt]=Galingas vi redaktorius
+Comment[mk]=Моќен VI уредувач
+Comment[nl]=Krachtige vi-editor
+Comment[no]=En kraftig vi-redigerer
+Comment[no_NY]=Kraftig vi-tekstredigeringsprogram
+Comment[pl]=Edytor vi
+Comment[pt]=Um poderoso editor de texto
+Comment[ro]=Un editor de texte VI, puternic
+Comment[ru]=Мощный текстовый редактор vi
+Comment[sk]=Silný textový procesor vi
+Comment[sl]=Zmogljivi urejevalnik vi
+Comment[sr]=Moćni vi editor
+Comment[sv]=En kraftfull texteditor
+Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷
+Comment[tr]=Güçlü vi düzenleyicisi
+Comment[uk]=Потужний редактор vi
+Comment[zh_CN.GB2312]=功能强大的 vi 编辑器
+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++;
+Exec=gvim -f %F
+Icon=gvim
+Type=Application
+Terminal=false
+X-XClassHintResName=VIM
+MapNotify=false
+Categories=Utility;TextEditor;
diff --git a/plans.fmf b/plans.fmf
deleted file mode 100644
index 0b2564f3..00000000
--- a/plans.fmf
+++ /dev/null
@@ -1,35 +0,0 @@
-/tier1-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/tier1/internal
- 
-/tier1-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/tier1/public
- 
-/tier2-tier3-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/tier2-tier3/internal
- 
-/tier2-tier3-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/tier2-tier3/public
- 
-/others-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/others/internal
- 
-/others-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/vim.git
-      name: /plans/others/public
\ No newline at end of file
diff --git a/sources b/sources
index 14532821..27cc8fd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-9.1-2068.tar.bz2) = f19ae5898f7c388f437fe03af23d956ef66706c2a629a3389622e0b583d9bd831dd4e250badb181fceacb2b52b1f8a6bda4f72fbece122b5f5097153daf774f3
+SHA512 (vim-8.1-1359.tar.bz2) = c8adf831e57851a9d897d9a0aa81eb4c9134f4b1b95cf688567ad9e6e51e95c1d88c0e64e3aa77e4c18dc34787762b5a80c74fda5ffd2690fcc29fc553e94e16
diff --git a/spec-template.new b/spec-template.new
index 2a558fb7..b248ecdb 100644
--- a/spec-template.new
+++ b/spec-template.new
@@ -4,17 +4,17 @@
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/
 
 
-Name:
-Version:
-Release: 0%{?dist}
-Summary:
+Name:		
+Version:	
+Release:	0%{?dist}
+Summary:	
 
-License:
-URL:
-Source0:
+License:	
+URL:		
+Source0:	
 
-BuildRequires:
-Requires:
+BuildRequires:	
+Requires:	
 
 %description
 
diff --git a/syntax-spec.vim b/syntax-spec.vim
new file mode 100644
index 00000000..9952bd25
--- /dev/null
+++ b/syntax-spec.vim
@@ -0,0 +1,236 @@
+" Filename:    spec.vim
+" Purpose:     Vim syntax file
+" Language:    SPEC: Build/install scripts for Linux RPM packages
+" Maintainer:  Igor Gnatenko i.gnatenko.brain@gmail.com
+" Former Maintainer:  Donovan Rebbechi elflord@panix.com (until March 2014)
+" Last Change: Sat Apr 9 15:30 2016 Filip Szymański
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syn sync minlines=1000
+
+syn match specSpecialChar contained '[][!$()\\|>^;:{}]'
+syn match specColon       contained ':'
+syn match specPercent     contained '%'
+
+syn match specVariables   contained '\$\h\w*' contains=specSpecialVariablesNames,specSpecialChar
+syn match specVariables   contained '\${\w*}' contains=specSpecialVariablesNames,specSpecialChar
+
+syn match specMacroIdentifier contained '%\h\w*' contains=specMacroNameLocal,specMacroNameOther,specPercent
+syn match specMacroIdentifier contained '%{\w*}' contains=specMacroNameLocal,specMacroNameOther,specPercent,specSpecialChar
+
+syn match specSpecialVariables contained '\$[0-9]\|\${[0-9]}'
+syn match specCommandOpts      contained '\s\(-\w\+\|--\w[a-zA-Z_-]\+\)'ms=s+1
+syn match specComment '^\s*#.*$'
+
+
+syn case match
+
+
+"matches with no highlight
+syn match specNoNumberHilite 'X11\|X11R6\|[a-zA-Z]*\.\d\|[a-zA-Z][-/]\d'
+syn match specManpageFile '[a-zA-Z]\.1'
+
+"Day, Month and most used license acronyms
+syn keyword specLicense contained GPL LGPL BSD MIT GNU
+syn keyword specWeekday contained Mon Tue Wed Thu Fri Sat Sun
+syn keyword specMonth   contained Jan Feb Mar Apr Jun Jul Aug Sep Oct Nov Dec
+syn keyword specMonth   contained January February March April May June July August September October November December
+
+"#, @, www
+syn match specNumber '\(^-\=\|[ \t]-\=\|-\)[0-9.-]*[0-9]'
+syn match specEmail contained "<\=\<[A-Za-z0-9_.-]\+@\([A-Za-z0-9_-]\+\.\)\+[A-Za-z]\+\>>\="
+syn match specURL      contained '\<\(\(https\{0,1}\|ftp\)://\|\(www[23]\{0,1}\.\|ftp\.\)\)[A-Za-z0-9._/~:,#-]\+\>'
+syn match specURLMacro contained '\<\(\(https\{0,1}\|ftp\)://\|\(www[23]\{0,1}\.\|ftp\.\)\)[A-Za-z0-9._/~:,#%{}-]\+\>' contains=specMacroIdentifier
+
+"TODO take specSpecialVariables out of the cluster for the sh* contains (ALLBUT)
+"Special system directories
+syn match specListedFilesPrefix contained '/\(usr\|local\|opt\|X11R6\|X11\)/'me=e-1
+syn match specListedFilesBin    contained '/s\=bin/'me=e-1
+syn match specListedFilesLib    contained '/\(lib\|include\)/'me=e-1
+syn match specListedFilesDoc    contained '/\(man\d*\|doc\|info\)\>'
+syn match specListedFilesEtc    contained '/etc/'me=e-1
+syn match specListedFilesShare  contained '/share/'me=e-1
+syn cluster specListedFiles contains=specListedFilesBin,specListedFilesLib,specListedFilesDoc,specListedFilesEtc,specListedFilesShare,specListedFilesPrefix,specVariables,specSpecialChar
+
+"specComands
+syn match   specConfigure  contained '\./configure'
+syn match   specTarCommand contained '\<tar\s\+[cxvpzIf]\{,5}\s*'
+syn keyword specCommandSpecial contained root
+syn keyword specCommand		contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch
+syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial
+
+"frequently used rpm env vars
+syn keyword specSpecialVariablesNames contained RPM_BUILD_ROOT RPM_BUILD_DIR RPM_SOURCE_DIR RPM_OPT_FLAGS LDFLAGS CC CC_FLAGS CPPNAME CFLAGS CXX CXXFLAGS CPPFLAGS
+
+"valid macro names from /usr/lib/rpm/macros
+syn keyword specMacroNameOther contained buildroot buildsubdir distribution disturl ix86 name nil optflags perl_sitearch release requires_eq vendor version
+syn match   specMacroNameOther contained '\<\(PATCH\|SOURCE\)\d*\>'
+
+"valid _macro names from /usr/lib/rpm/macros
+syn keyword specMacroNameLocal contained _arch _binary_payload _bindir _build _build_alias _build_cpu _builddir _build_os _buildshell _buildsubdir _build_vendor _bzip2bin _datadir _dbpath _dbpath_rebuild _defaultdocdir _docdir _excludedocs _exec_prefix _fixgroup _fixowner _fixperms _ftpport _ftpproxy _gpg_path _gzipbin _host _host_alias _host_cpu _host_os _host_vendor _httpport _httpproxy _includedir _infodir _install_langs _install_script_path _instchangelog _langpatt _lib _libdir _libexecdir _localstatedir _mandir _netsharedpath _oldincludedir _os _pgpbin _pgp_path _prefix _preScriptEnvironment _provides _rpmdir _rpmfilename _sbindir _sharedstatedir _signature _sourcedir _source_payload _specdir _srcrpmdir _sysconfdir _target _target_alias _target_cpu _target_os _target_platform _target_vendor _timecheck _tmppath _topdir _usr _usrsrc _var _vendor
+
+
+"------------------------------------------------------------------------------
+" here's is all the spec sections definitions: PreAmble, Description, Package,
+"   Scripts, Files and Changelog
+
+"One line macros - valid in all ScriptAreas
+"tip: remember do include new items on specScriptArea's skip section
+syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%\(define\|global\|patch\d*\|setup\|autosetup\|autopatch\|configure\|GNUconfigure\|find_lang\|make_build\|makeinstall\|make_install\|include\)\>' end='$' contains=specCommandOpts,specMacroIdentifier
+syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro start='^%{\(configure\|GNUconfigure\|find_lang\|make_build\|makeinstall\|make_install\)}' end='$' contains=specCommandOpts,specMacroIdentifier
+
+"%% Files Section %%
+"TODO %config valid parameters: missingok\|noreplace
+"TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\)
+syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
+"tip: remember to include new itens in specFilesArea above
+syn match  specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>'
+
+"valid options for certain section headers
+syn match specDescriptionOpts contained '\s-[ln]\s*\a'ms=s+1,me=e-1
+syn match specPackageOpts     contained    '\s-n\s*\w'ms=s+1,me=e-1
+syn match specFilesOpts       contained    '\s-f\s*\w'ms=s+1,me=e-1
+
+
+syn case ignore
+
+
+"%% PreAmble Section %%
+"Copyright and Serial were deprecated by License and Epoch
+syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+
+"%% Description Section %%
+syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
+
+"%% Package Section %%
+syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
+
+"%% Scripts Section %%
+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+
+"%% Changelog Section %%
+syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
+
+
+
+"------------------------------------------------------------------------------
+"here's the shell syntax for all the Script Sections
+
+
+syn case match
+
+
+"sh-like comment stile, only valid in script part
+syn match shComment contained '#.*$'
+
+syn region shQuote1 contained matchgroup=shQuoteDelim start=+'+ skip=+\\'+ end=+'+ contains=specMacroIdentifier
+syn region shQuote2 contained matchgroup=shQuoteDelim start=+"+ skip=+\\"+ end=+"+ contains=specVariables,specMacroIdentifier
+
+syn match shOperator contained '[><|!&;]\|[!=]='
+syn region shDo transparent matchgroup=specBlock start="\<do\>" end="\<done\>" contains=ALLBUT,shFunction,shDoError,shCase,specPreAmble,@specListedFiles
+
+syn region specIf  matchgroup=specBlock start="%ifosf\|%ifos\|%ifnos\|%ifarch\|%ifnarch\|%else"  end='%endif'  contains=ALLBUT, specIfError, shCase
+
+syn region  shIf transparent matchgroup=specBlock start="\<if\>" end="\<fi\>" contains=ALLBUT,shFunction,shIfError,shCase,@specListedFiles
+
+syn region  shFor  matchgroup=specBlock start="\<for\>" end="\<in\>" contains=ALLBUT,shFunction,shInError,shCase,@specListedFiles
+
+syn region shCaseEsac transparent matchgroup=specBlock start="\<case\>" matchgroup=NONE end="\<in\>"me=s-1 contains=ALLBUT,shFunction,shCaseError,@specListedFiles nextgroup=shCaseEsac
+syn region shCaseEsac matchgroup=specBlock start="\<in\>" end="\<esac\>" contains=ALLBUT,shFunction,shCaseError,@specListedFilesBin
+syn region shCase matchgroup=specBlock contained start=")"  end=";;" contains=ALLBUT,shFunction,shCaseError,shCase,@specListedFiles
+
+syn sync match shDoSync       grouphere  shDo       "\<do\>"
+syn sync match shDoSync       groupthere shDo       "\<done\>"
+syn sync match shIfSync       grouphere  shIf       "\<if\>"
+syn sync match shIfSync       groupthere shIf       "\<fi\>"
+syn sync match specIfSync     grouphere  specIf     "%ifarch\|%ifos\|%ifnos"
+syn sync match specIfSync     groupthere specIf     "%endIf"
+syn sync match shForSync      grouphere  shFor      "\<for\>"
+syn sync match shForSync      groupthere shFor      "\<in\>"
+syn sync match shCaseEsacSync grouphere  shCaseEsac "\<case\>"
+syn sync match shCaseEsacSync groupthere shCaseEsac "\<esac\>"
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_spec_syntax_inits")
+  if version < 508
+    let did_spec_syntax_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  "main types color definitions
+  HiLink specSection			Structure
+  HiLink specSectionMacro		Macro
+  HiLink specWWWlink			PreProc
+  HiLink specOpts			Operator
+
+  "yes, it's ugly, but white is sooo cool
+  if &background == "dark"
+    hi def specGlobalMacro		ctermfg=white
+  else
+    HiLink specGlobalMacro		Identifier
+  endif
+
+  "sh colors
+  HiLink shComment			Comment
+  HiLink shIf				Statement
+  HiLink shOperator			Special
+  HiLink shQuote1			String
+  HiLink shQuote2			String
+  HiLink shQuoteDelim			Statement
+
+  "spec colors
+  HiLink specBlock			Function
+  HiLink specColon			Special
+  HiLink specCommand			Statement
+  HiLink specCommandOpts		specOpts
+  HiLink specCommandSpecial		Special
+  HiLink specComment			Comment
+  HiLink specConfigure			specCommand
+  HiLink specDate			String
+  HiLink specDescriptionOpts		specOpts
+  HiLink specEmail			specWWWlink
+  HiLink specError			Error
+  HiLink specFilesDirective		specSectionMacro
+  HiLink specFilesOpts			specOpts
+  HiLink specLicense			String
+  HiLink specMacroNameLocal		specGlobalMacro
+  HiLink specMacroNameOther		specGlobalMacro
+  HiLink specManpageFile		NONE
+  HiLink specMonth			specDate
+  HiLink specNoNumberHilite		NONE
+  HiLink specNumber			Number
+  HiLink specPackageOpts		specOpts
+  HiLink specPercent			Special
+  HiLink specSpecialChar		Special
+  HiLink specSpecialVariables		specGlobalMacro
+  HiLink specSpecialVariablesNames	specGlobalMacro
+  HiLink specTarCommand			specCommand
+  HiLink specURL			specWWWlink
+  HiLink specURLMacro			specWWWlink
+  HiLink specVariables			Identifier
+  HiLink specWeekday			specDate
+  HiLink specListedFilesBin		Statement
+  HiLink specListedFilesDoc		Statement
+  HiLink specListedFilesEtc		Statement
+  HiLink specListedFilesLib		Statement
+  HiLink specListedFilesPrefix		Statement
+  HiLink specListedFilesShare		Statement
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "spec"
+
+" vim: ts=8
diff --git a/tests/netrw-plugin-delete-command-broken/Makefile b/tests/netrw-plugin-delete-command-broken/Makefile
new file mode 100644
index 00000000..5e02ce37
--- /dev/null
+++ b/tests/netrw-plugin-delete-command-broken/Makefile
@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of netrw-plugin-delete-command-broken
+#   Description: Test for netrw plugin: delete command broken
+#   Author: Petr Splichal <psplicha@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/vim/Regression/netrw-plugin-delete-command-broken
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Splichal <psplicha@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test for netrw plugin: delete command broken" >> $(METADATA)
+	@echo "Type:            Regression" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          vim" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Requires:        vim-enhanced" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/tests/netrw-plugin-delete-command-broken/PURPOSE b/tests/netrw-plugin-delete-command-broken/PURPOSE
new file mode 100644
index 00000000..45af60a3
--- /dev/null
+++ b/tests/netrw-plugin-delete-command-broken/PURPOSE
@@ -0,0 +1,9 @@
+PURPOSE of netrw-plugin-delete-command-broken
+Description: Test for netrw plugin: delete command broken
+Author: Petr Splichal <psplicha@redhat.com>
+Summary: netrw plugin: delete command broken
+
+Description:
+
+Regression to to verify the delete command of netrw plugin
+successfully deletes files or directories.
diff --git a/tests/netrw-plugin-delete-command-broken/runtest.sh b/tests/netrw-plugin-delete-command-broken/runtest.sh
new file mode 100755
index 00000000..6dbf8c43
--- /dev/null
+++ b/tests/netrw-plugin-delete-command-broken/runtest.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/vim/Regression/netrw-plugin-delete-command-broken
+#   Description: Test for netrw plugin: delete command broken
+#   Author: Petr Splichal <psplicha@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include rhts environment
+. /usr/bin/rhts-environment.sh
+. /usr/share/rhts-library/rhtslib.sh
+
+PACKAGE="vim-enhanced"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+        rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+        # create test file & dir
+        rlRun "touch testfile" 0 "Creating test file"
+        rlRun "mkdir testdir" 0 "Creating test directory"
+        rlAssertExists "testfile"
+        rlAssertExists "testdir"
+        # create vim scripts
+        rlRun "echo '/testfile
Dy
:q' > scriptfile" \
+                0 "Creating file delete script"
+        rlRun "echo '/testdir
Dy
:q' > scriptdir" \
+                0 "Creating directory delete script"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "vim . -s scriptfile" 0 "Deleting file using netrw"
+        rlAssertNotExists "testfile"
+        rlRun "vim . -s scriptdir" 0 "Deleting directory using netrw"
+        rlAssertNotExists "testdir"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 00000000..7f01b5af
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,23 @@
+---
+# This first play always runs on the local staging system
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    - container
+    tests:
+    - netrw-plugin-delete-command-broken
+    - vim-in-ex-mode-incorrectly-gives-an-eol-error
+    required_packages:
+    - vim-minimal
+    - vim-enhanced
+
+# Tests for Atomic Host
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - atomic
+    tests:
+    - vim-in-ex-mode-incorrectly-gives-an-eol-error
diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile
new file mode 100644
index 00000000..45099dde
--- /dev/null
+++ b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile
@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
+#   Description: Test for vim in ex mode incorrectly gives an eol error
+#   Author: David Kutalek <dkutalek@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE exdoublequote expounddoublequote
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           David Kutalek <dkutalek@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test for vim in ex mode incorrectly gives an eol error" >> $(METADATA)
+	@echo "Type:            Regression" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          vim" >> $(METADATA)
+	@echo "Requires:        vim-minimal" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE
new file mode 100644
index 00000000..0d6d11a2
--- /dev/null
+++ b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE
@@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
+Description: Test for vim in ex mode incorrectly gives an eol error
+Author: David Kutalek <dkutalek@redhat.com>
diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote
new file mode 100644
index 00000000..4037c883
--- /dev/null
+++ b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote
@@ -0,0 +1,2 @@
+" comment
+q
diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote
new file mode 100644
index 00000000..ff821153
--- /dev/null
+++ b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote
@@ -0,0 +1,2 @@
+#" comment
+q
diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh
new file mode 100755
index 00000000..20967bc6
--- /dev/null
+++ b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error
+#   Description: Test for vim in ex mode incorrectly gives an eol error
+#   Author: David Kutalek <dkutalek@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include rhts environment
+. /usr/bin/rhts-environment.sh
+. /usr/lib/beakerlib/beakerlib.sh
+
+PACKAGE="vim"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm vim-minimal
+    rlPhaseEnd
+
+    rlPhaseStartTest
+	rlRun "ex -u NONE ~/.bash_profile < ./exdoublequote"
+	rlRun "ex -u NONE ~/.bash_profile < ./expounddoublequote"
+    rlPhaseEnd
+
+rlJournalPrintText
+rlJournalEnd
diff --git a/vi_help.txt b/vi_help.txt
new file mode 100644
index 00000000..23e5fe9e
--- /dev/null
+++ b/vi_help.txt
@@ -0,0 +1,126 @@
+*vi-help.txt*	For Vim version 7.1.  Last change: 2008 Mar 03
+
+			VIM - minimal  help file
+  (NOTE: This is a minimal help file and many tags won't work. Use 'vim' or
+   'gvim' to read the complete help docs.)
+									 k
+      Move around:  Use the cursor keys, or "h" to go left,	       h   l
+		    "j" to go down, "k" to go up, "l" to go right.	 j
+Close this window:  Use ":q<Enter>".
+   Get out of Vim:  Use ":qa!<Enter>" (careful, all changes are lost!).
+
+Jump to a subject:  Position the cursor on a tag between |bars| and hit CTRL-].
+	Jump back:  Type CTRL-T or CTRL-O (repeat to go further back).
+
+Get specific help:  It is possible to go directly to whatever you want help
+		    on, by giving an argument to the ":help" command |:help|.
+		    It is possible to further specify the context:
+							*vi-help-context*
+			  WHAT			PREPEND    EXAMPLE	~
+		      Normal mode command      (nothing)   :help x
+		      Insert mode command	  i_	   :help i_<Esc>
+		      Command-line command	  :	   :help :quit
+		      Command-line editing	  c_	   :help c_<Del>
+		      Vim command argument	  -	   :help -r
+		      Option			  '	   :help 'textwidth'
+  Search for help:  Type ":help word", then hit CTRL-D to see matching
+		    help entries for "word".
+
+VIM stands for Vi IMproved.  Most of VIM was made by Bram Moolenaar, but only
+through the help of many others.  See |vi-credits|.
+------------------------------------------------------------------------------
+3. Credits                              *vi-credits* *vi-author* *vi-Bram* *vi-Moolenaar*
+
+Most of Vim was written by Bram Moolenaar <Bram@vim.org>.
+
+Parts of the documentation come from several Vi manuals, written by:
+        W.N. Joy
+        Alan P.W. Hewett
+        Mark Horton
+
+The Vim editor is based on Stevie and includes (ideas from) other software,
+worked on by the people mentioned here.  Other people helped by sending me
+patches, suggestions and giving feedback about what is good and bad in Vim.
+
+Vim would never have become what it is now, without the help of these people!
+
+        Ron Aaron               Win32 GUI changes
+        Zoltan Arpadffy         work on VMS port
+        Tony Andrews            Stevie
+        Gert van Antwerpen      changes for DJGPP on MS-DOS
+        Berkeley DB(3)          ideas for swap file implementation
+        Keith Bostic            Nvi
+        Walter Briscoe          Makefile updates, various patches
+        Ralf Brown              SPAWNO library for MS-DOS
+        Robert Colon            many useful remarks
+        Marcin Dalecki          GTK+ GUI port, toolbar icons, gettext()
+        Kayhan Demirel          sent me news in Uganda
+        Chris & John Downey     xvi (ideas for multi-windows version)
+        Henk Elbers             first VMS port
+        Daniel Elstner          GTK+ 2 port
+        Eric Fischer            Mac port, 'cindent', and other improvements
+        Benji Fisher            Answering lots of user questions
+        Bill Foster             Athena GUI port
+        Loic Grenie             xvim (ideas for multi windows version)
+        Sven Guckes             Vim promotor and previous WWW page maintainer
+        Darren Hiebert          Exuberant ctags
+        Jason Hildebrand        GTK+ 2 port
+        Bruce Hunsaker          improvements for VMS port
+        Andy Kahn               Cscope support, GTK+ GUI port
+        Oezguer Kesim           Maintainer of Vim Mailing Lists
+        Axel Kielhorn           work on the Macintosh port
+        Steve Kirkendall        Elvis
+        Roger Knobbe            original port to Windows NT
+        Sergey Laskavy          Vim's help from Moscow
+        Felix von Leitner       Maintainer of Vim Mailing Lists
+        David Leonard           Port of Python extensions to Unix
+        Avner Lottem            Edit in right-to-left windows
+        Flemming Madsen         X11 client-server, various features and patches
+        MicroSoft               Gave me a copy of DevStudio to compile Vim with
+        Paul Moore              Python interface extensions, many patches
+        Katsuhito Nagano        Work on multi-byte versions
+        Sung-Hyun Nam           Work on multi-byte versions
+        Vince Negri             Win32 GUI and generic console enhancements
+        Steve Oualline          Author of the first Vim book |frombook|
+        George V. Reilly        Win32 port, Win32 GUI start-off
+        Stephen Riehm           bug collector
+        Stefan Roemer           various patches and help to users
+        Ralf Schandl            IBM OS/390 port
+        Olaf Seibert            DICE and BeBox version, regexp improvements
+        Mortaza Shiran          Farsi patches
+        Peter da Silva          termlib
+        Paul Slootman           OS/2 port
+        Henry Spencer           regular expressions
+        Dany St-Amant           Macintosh port
+        Tim Thompson            Stevie
+        G. R. (Fred) Walter     Stevie
+        Sven Verdoolaege        Perl interface
+        Robert Webb             Command-line completion, GUI versions, and
+                                lots of patches
+        Ingo Wilken             Tcl interface
+        Mike Williams           PostScript printing
+        Juergen Weigert         Lattice version, AUX improvements, UNIX and
+                                MS-DOS ports, autoconf
+        Stefan 'Sec' Zehl       Maintainer of vim.org
+
+I wish to thank all the people that sent me bug reports and suggestions.  The
+list is too long to mention them all here.  Vim would not be the same without
+the ideas from all these people: They keep Vim alive!
+
+
+------------------------------------------------------------------------------
+						*vi-doc-file-list* *V_ct*
+BASIC:
+|copying|	About copyrights
+|iccf|		Helping poor children in Uganda
+|sponsor|	Sponsor Vim development, become a registered Vim user
+|www|		Vim on the World Wide Web
+|bugs|		Where to send bug reports
+
+
+------------------------------------------------------------------------------
+
+Now that you've jumped here with CTRL-] or a double mouse click, you can use
+CTRL-T, CTRL-O, g<RightMouse>, or <C-RightMouse> to go back to where you were.
+------------------------------------------------------------------------------
+ vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl:
diff --git a/vi_wrapper b/vi_wrapper
deleted file mode 100644
index 1bb1aece..00000000
--- a/vi_wrapper
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/sh
-
-# run vim if:
-# - 'vi' command is used and 'vim' binary is available
-# - 'vim' command is used
-# NOTE: Set up a local alias if you want vim -> vi functionality. We will not
-# do it globally, because it messes up with available startup options (see 
-# ':help starting', 'vi' is not capable of '-d'). The introducing an environment
-# variable, which an user must set to get the feature, will do the same trick
-# as setting an alias (needs user input, does not work with sudo), so it is left
-# on user whether he decides to use an alias:
-#
-# alias vim=vi
-#
-# in bashrc file.
-
-if test -f /usr/bin/vim
-then
-  exec /usr/bin/vim "$@"
-fi
-
-# run vi otherwise
-exec /usr/libexec/vi "$@"
diff --git a/view_wrapper b/view_wrapper
deleted file mode 100644
index 9e8d7207..00000000
--- a/view_wrapper
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/sh
-
-# run vim -R if available
-if test -f /usr/bin/vim
-then
-  exec /usr/bin/vim -R "$@"
-fi
-
-# run vi otherwise
-exec /usr/libexec/vi -R "$@"
diff --git a/vim-7.0-fixkeys.patch b/vim-7.0-fixkeys.patch
index 1b71d33e..5554e1bf 100644
--- a/vim-7.0-fixkeys.patch
+++ b/vim-7.0-fixkeys.patch
@@ -1,26 +1,25 @@
-diff -up vim90/src/term.c.fixkeys vim90/src/term.c
---- vim90/src/term.c.fixkeys	2022-10-20 14:45:53.896659582 +0200
-+++ vim90/src/term.c	2022-10-20 14:48:28.958697659 +0200
-@@ -851,14 +851,14 @@ static struct builtin_term builtin_termc
-     {K_XRIGHT,		"\033[@;*C"},	// Esc [ C or Esc [ 1 ; C
-     {K_XLEFT,		"\033[@;*D"},	// Esc [ D or Esc [ 1 ; D
-     // An extra set of function keys for vt100 mode
--    {K_XF1,		"\033O*P"},
--    {K_XF2,		"\033O*Q"},
--    {K_XF3,		"\033O*R"},
--    {K_XF4,		"\033O*S"},
--    {K_F1,		"\033[11;*~"},
--    {K_F2,		"\033[12;*~"},
--    {K_F3,		"\033[13;*~"},
--    {K_F4,		"\033[14;*~"},
-+    {K_XF1,		"\033[11~"},
-+    {K_XF2,		"\033[12~"},
-+    {K_XF3,		"\033[13~"},
-+    {K_XF4,		"\033[14~"},
-+    {K_F1,		"\033OP"},
-+    {K_F2,		"\033OQ"},
-+    {K_F3,		"\033OR"},
-+    {K_F4,		"\033OS"},
-     {K_F5,		"\033[15;*~"},
-     {K_F6,		"\033[17;*~"},
-     {K_F7,		"\033[18;*~"},
+--- vim70aa/src/term.c.orig	2006-03-01 23:07:55.000000000 +0100
++++ vim70aa/src/term.c	2006-03-14 15:39:12.000000000 +0100
+@@ -1008,14 +1008,14 @@
+     {K_XRIGHT,		IF_EB("\033[1;*C", ESC_STR "[1;*C")},
+     {K_XLEFT,		IF_EB("\033[1;*D", ESC_STR "[1;*D")},
+     /* An extra set of function keys for vt100 mode */
+-    {K_XF1,		IF_EB("\033O*P", ESC_STR "O*P")},
+-    {K_XF2,		IF_EB("\033O*Q", ESC_STR "O*Q")},
+-    {K_XF3,		IF_EB("\033O*R", ESC_STR "O*R")},
+-    {K_XF4,		IF_EB("\033O*S", ESC_STR "O*S")},
+-    {K_F1,		IF_EB("\033[11;*~", ESC_STR "[11;*~")},
+-    {K_F2,		IF_EB("\033[12;*~", ESC_STR "[12;*~")},
+-    {K_F3,		IF_EB("\033[13;*~", ESC_STR "[13;*~")},
+-    {K_F4,		IF_EB("\033[14;*~", ESC_STR "[14;*~")},
++    {K_XF1,             IF_EB("\033[11~", ESC_STR "[11~")},
++    {K_XF2,             IF_EB("\033[12~", ESC_STR "[12~")},
++    {K_XF3,             IF_EB("\033[13~", ESC_STR "[13~")},
++    {K_XF4,             IF_EB("\033[14~", ESC_STR "[14~")},
++    {K_F1,              IF_EB("\033OP", ESC_STR "OP")},
++    {K_F2,              IF_EB("\033OQ", ESC_STR "OQ")},
++    {K_F3,              IF_EB("\033OR", ESC_STR "OR")},
++    {K_F4,              IF_EB("\033OS", ESC_STR "OS")},
+     {K_F5,		IF_EB("\033[15;*~", ESC_STR "[15;*~")},
+     {K_F6,		IF_EB("\033[17;*~", ESC_STR "[17;*~")},
+     {K_F7,		IF_EB("\033[18;*~", ESC_STR "[18;*~")},
diff --git a/vim-7.0-rclocation.patch b/vim-7.0-rclocation.patch
new file mode 100644
index 00000000..840f53e8
--- /dev/null
+++ b/vim-7.0-rclocation.patch
@@ -0,0 +1,15 @@
+--- vim62/src/os_unix.h.rcloc	2003-08-04 15:38:05.000000000 +0200
++++ vim62/src/os_unix.h	2003-08-04 15:39:25.000000000 +0200
+@@ -230,10 +230,10 @@
+  * Unix system-dependent file names
+  */
+ #ifndef SYS_VIMRC_FILE
+-# define SYS_VIMRC_FILE "$VIM/vimrc"
++# define SYS_VIMRC_FILE "/etc/vimrc"
+ #endif
+ #ifndef SYS_GVIMRC_FILE
+-# define SYS_GVIMRC_FILE "$VIM/gvimrc"
++# define SYS_GVIMRC_FILE "/etc/gvimrc"
+ #endif
+ #ifndef DFLT_HELPFILE
+ # define DFLT_HELPFILE	"$VIMRUNTIME/doc/help.txt"
diff --git a/vim-7.0-specedit.patch b/vim-7.0-specedit.patch
new file mode 100644
index 00000000..74e327d4
--- /dev/null
+++ b/vim-7.0-specedit.patch
@@ -0,0 +1,64 @@
+--- vim70/runtime/ftplugin/spec.vim.rh1	2006-05-10 19:37:45.000000000 +0200
++++ vim70/runtime/ftplugin/spec.vim	2006-11-13 12:21:32.000000000 +0100
+@@ -18,11 +18,18 @@
+ 
+ if !exists("*s:SpecChangelog")
+ 	function s:SpecChangelog(format)
++        let save_time = v:lc_time
+ 		if strlen(a:format) == 0
+ 			if !exists("g:spec_chglog_format")
+-				let email = input("Email address: ")
+-				let g:spec_chglog_format = "%a %b %d %Y " . l:email
+-				echo "\r"
++                if !exists("g:packager")
++                    let email = input("Email address: ")
++                    let g:spec_chglog_format = "%a %b %d %Y " . l:email
++                    echo "\r"
++                else
++                    let email = g:packager
++                    let g:spec_chglog_format = "%a %b %d %Y " . l:email
++                    echo "\r"
++                endif
+ 			endif
+ 			let format = g:spec_chglog_format
+ 		else
+@@ -58,7 +65,7 @@
+ 			let line = line+1
+ 		endwhile
+ 		if (nameline != -1 && verline != -1 && relline != -1)
+-			let include_release_info = exists("g:spec_chglog_release_info")
++			let include_release_info = 1
+ 			let name = s:ParseRpmVars(name, nameline)
+ 			let ver = s:ParseRpmVars(ver, verline)
+ 			let rel = s:ParseRpmVars(rel, relline)
+@@ -79,8 +86,10 @@
+ 			endif
+ 		endif
+ 		if (chgline != -1)
++            execute "language time C"
+ 			let parsed_format = "* ".strftime(format)
+-			let release_info = "+ ".name."-".ver."-".rel
++            execute "language time " . save_time
++			let release_info = ver."-".rel
+ 			let wrong_format = 0
+ 			let wrong_release = 0
+ 			let insert_line = 0
+@@ -97,15 +106,14 @@
+ 						execute relline
+ 						normal 

+ 						let rel = substitute(strpart(getline(relline),8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
+-						let release_info = "+ ".name."-".ver."-".rel
++						let release_info = ver."-".rel
+ 					endif
+ 				endif
+ 				let n = 0
+-				call append(chgline+n, parsed_format)
+ 				if include_release_info
+-					let n = n + 1
+-					call append(chgline+n, release_info)
++                    let parsed_format = parsed_format." ".release_info
+ 				endif
++				call append(chgline+n, parsed_format)
+ 				let n = n + 1
+ 				call append(chgline+n,"- ")
+ 				let n = n + 1
diff --git a/vim-7.4-checkhl.patch b/vim-7.4-checkhl.patch
new file mode 100644
index 00000000..f7fbf904
--- /dev/null
+++ b/vim-7.4-checkhl.patch
@@ -0,0 +1,12 @@
+diff -up vim74/runtime/syntax/spec.vim.kh1 vim74/runtime/syntax/spec.vim
+--- vim74/runtime/syntax/spec.vim.kh1	2016-08-04 15:23:25.275955301 +0200
++++ vim74/runtime/syntax/spec.vim	2016-08-04 15:24:56.699417602 +0200
+@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou
+ syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
+ 
+ "%% Scripts Section %%
+-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
++syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+ 
+ "%% Changelog Section %%
+ syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
diff --git a/vim-7.4-fstabsyntax.patch b/vim-7.4-fstabsyntax.patch
new file mode 100644
index 00000000..f82a66c0
--- /dev/null
+++ b/vim-7.4-fstabsyntax.patch
@@ -0,0 +1,21 @@
+diff -up vim80/runtime/syntax/fstab.vim.fstabsyntax vim80/runtime/syntax/fstab.vim
+--- vim80/runtime/syntax/fstab.vim.fstabsyntax	2017-11-19 20:32:49.000000000 +0100
++++ vim80/runtime/syntax/fstab.vim	2017-11-20 16:01:31.494316342 +0100
+@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe
+ " 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 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs
++syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs rpc_pipefs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs
+ 
+ " Options
+ " -------
+@@ -68,7 +68,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-]
+ syn keyword fsOptionsYesNo yes no
+ syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
+ syn keyword fsOptionsSize 512 1024 2048
+-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx
++syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx
+ syn match fsOptionsGeneral /_netdev/
+ 
+ " Options: adfs
diff --git a/vim-7.4-globalsyntax.patch b/vim-7.4-globalsyntax.patch
index 2f7fe16b..1e0b08ed 100644
--- a/vim-7.4-globalsyntax.patch
+++ b/vim-7.4-globalsyntax.patch
@@ -1,12 +1,12 @@
-diff -up vim91/runtime/syntax/spec.vim.globalsyntax vim91/runtime/syntax/spec.vim
---- vim91/runtime/syntax/spec.vim.globalsyntax	2024-09-20 22:29:01.858870640 +0200
-+++ vim91/runtime/syntax/spec.vim	2024-09-20 22:31:43.776217933 +0200
-@@ -112,7 +112,7 @@ syn region specDescriptionArea matchgrou
+diff -up vim74/runtime/syntax/spec.vim.orig vim74/runtime/syntax/spec.vim
+--- vim74/runtime/syntax/spec.vim.orig	2016-01-12 13:51:55.727569873 +0100
++++ vim74/runtime/syntax/spec.vim	2016-01-12 13:53:08.124991178 +0100
+@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou
  syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
  
  "%% Scripts Section %%
--syn region specScriptArea matchgroup=specSection start='^%\(prep\|generate_buildrequires\|conf\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\|filetriggerin\|filetriggerun\|filetriggerpostun\|transfiletriggerin\|transfiletriggerun\|transfiletriggerpostun\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
-+syn region specScriptArea matchgroup=specSection start='^%\(prep\|generate_buildrequires\|conf\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\|filetriggerin\|filetriggerun\|filetriggerpostun\|transfiletriggerin\|transfiletriggerun\|transfiletriggerpostun\)\>' skip='^%{\|^%\(define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
++syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
  
  "%% Changelog Section %%
  syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
diff --git a/vim-7.4-nowarnings.patch b/vim-7.4-nowarnings.patch
new file mode 100644
index 00000000..a98e9d61
--- /dev/null
+++ b/vim-7.4-nowarnings.patch
@@ -0,0 +1,11 @@
+diff -up vim81/src/ex_docmd.c.backup vim81/src/ex_docmd.c
+--- vim81/src/ex_docmd.c.backup	2019-01-22 17:35:28.701320672 +0100
++++ vim81/src/ex_docmd.c	2019-01-22 17:36:56.644540351 +0100
+@@ -4793,6 +4793,7 @@ get_flags(exarg_T *eap)
+     void
+ ex_ni(exarg_T *eap)
+ {
++    return;
+     if (!eap->skip)
+ 	eap->errmsg = N_("E319: Sorry, the command is not available in this version");
+ }
diff --git a/vim-7.4-releasestring-1318991.patch b/vim-7.4-releasestring-1318991.patch
new file mode 100644
index 00000000..291b957f
--- /dev/null
+++ b/vim-7.4-releasestring-1318991.patch
@@ -0,0 +1,14 @@
+diff -up vim74/runtime/ftplugin/spec.vim.1318991 vim74/runtime/ftplugin/spec.vim
+--- vim74/runtime/ftplugin/spec.vim.1318991	2016-08-04 15:29:42.423862424 +0200
++++ vim74/runtime/ftplugin/spec.vim	2016-08-04 15:31:08.797299188 +0200
+@@ -41,8 +41,8 @@ else:
+         headers = spec.sourceHeader
+         version = headers["Version"]
+         release = headers["Release"]
+-        vim.command("let ver = " + version)
+-        vim.command("let rel = " + release)
++        vim.command("let ver = '" + version + "'")
++        vim.command("let rel = '" + release + "'")
+ PYEND
+ 		endif
+ 	endfunction
diff --git a/vim-7.4-specsyntax.patch b/vim-7.4-specsyntax.patch
index ace7607f..3c028b56 100644
--- a/vim-7.4-specsyntax.patch
+++ b/vim-7.4-specsyntax.patch
@@ -1,6 +1,6 @@
-diff -up vim91/runtime/syntax/spec.vim.spec-syntax vim91/runtime/syntax/spec.vim
---- vim91/runtime/syntax/spec.vim.spec-syntax	2025-11-14 07:38:27.000000000 +0100
-+++ vim91/runtime/syntax/spec.vim	2025-11-14 07:52:56.081212607 +0100
+diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim
+--- vim74/runtime/syntax/spec.vim.highlite	2016-07-04 10:17:45.000000000 +0200
++++ vim74/runtime/syntax/spec.vim	2016-08-04 15:20:26.116049343 +0200
 @@ -38,7 +38,7 @@ syn match specNoNumberHilite 'X11\|X11R6
  syn match specManpageFile '[a-zA-Z]\.1'
  
@@ -10,12 +10,24 @@ diff -up vim91/runtime/syntax/spec.vim.spec-syntax vim91/runtime/syntax/spec.vim
  syn keyword specWeekday contained Mon Tue Wed Thu Fri Sat Sun
  syn keyword specMonth   contained Jan Feb Mar Apr Jun Jul Aug Sep Oct Nov Dec
  syn keyword specMonth   contained January February March April May June July August September October November December
+@@ -61,9 +61,9 @@ syn cluster specListedFiles contains=spe
+ 
+ "specComands
+ syn match   specConfigure  contained '\./configure'
+-syn match   specTarCommand contained '\<tar\s\+[cxvpzIf]\{,5}\s*'
++syn match   specTarCommand contained '\<tar\s\+[cxvpzIjf]\{,5}\s*'
+ syn keyword specCommandSpecial contained root
+-syn keyword specCommand		contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch
++syn keyword specCommand		contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch bzip2 bunzip2 gunzip
+ syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial
+ 
+ "frequently used rpm env vars
 @@ -105,7 +105,7 @@ syn case ignore
  "%% PreAmble Section %%
  "Copyright and Serial were deprecated by License and Epoch
  syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
--syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|DistTag\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|ModularityLabel\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
-+syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|DistTag\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExcludeOS\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|ModularityLabel\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+-syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
++syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExcludeOS\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
  
  "%% Description Section %%
  syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
diff --git a/vim-7.4-syncolor.patch b/vim-7.4-syncolor.patch
new file mode 100644
index 00000000..440da186
--- /dev/null
+++ b/vim-7.4-syncolor.patch
@@ -0,0 +1,25 @@
+diff -up vim80/src/syntax.c.syncolor vim80/src/syntax.c
+--- vim80/src/syntax.c.syncolor	2017-08-15 12:14:21.716020676 +0200
++++ vim80/src/syntax.c	2017-08-15 12:30:31.380158974 +0200
+@@ -6972,8 +6972,8 @@ static char *(highlight_init_light[]) =
+     CENT("Visual term=reverse",
+ 	 "Visual term=reverse guibg=LightGrey"),
+ #ifdef FEAT_DIFF
+-    CENT("DiffAdd term=bold ctermbg=LightBlue",
+-	 "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"),
++    CENT("DiffAdd term=bold ctermbg=LightRed",
++         "DiffAdd term=bold ctermbg=LightRed guibg=LightBlue"),
+     CENT("DiffChange term=bold ctermbg=LightMagenta",
+ 	 "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"),
+     CENT("DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan",
+@@ -7066,8 +7066,8 @@ static char *(highlight_init_dark[]) = {
+     CENT("Visual term=reverse",
+ 	 "Visual term=reverse guibg=DarkGrey"),
+ #ifdef FEAT_DIFF
+-    CENT("DiffAdd term=bold ctermbg=DarkBlue",
+-	 "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"),
++    CENT("DiffAdd term=bold ctermbg=DarkRed",
++	 "DiffAdd term=bold ctermbg=DarkRed guibg=DarkBlue"),
+     CENT("DiffChange term=bold ctermbg=DarkMagenta",
+ 	 "DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta"),
+     CENT("DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan",
diff --git a/vim-7.4-syntax.patch b/vim-7.4-syntax.patch
new file mode 100644
index 00000000..5131c803
--- /dev/null
+++ b/vim-7.4-syntax.patch
@@ -0,0 +1,11 @@
+--- vim74/runtime/filetype.vim.orig	2013-08-12 14:51:58.669350813 +0200
++++ vim74/runtime/filetype.vim	2013-08-12 14:56:12.432540523 +0200
+@@ -2475,7 +2475,7 @@
+ 
+ " More Apache config files
+ au BufNewFile,BufRead access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*	call s:StarSetf('apache')
+-au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.d/*.conf*		call s:StarSetf('apache')
++au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/httpd/conf.*/*,*/etc/httpd/mods-*/*,*/etc/httpd/sites-*/*,*/etc/httpd/conf.d/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf*		call s:StarSetf('apache')
+ 
+ " Asterisk config file
+ au BufNewFile,BufRead *asterisk/*.conf*		call s:StarSetf('asterisk')
diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch
index 07f1e5a6..5cb1a88c 100644
--- a/vim-8.0-copy-paste.patch
+++ b/vim-8.0-copy-paste.patch
@@ -1,95 +1,16 @@
-diff -up vim91/runtime/defaults.vim.copypaste vim91/runtime/defaults.vim
---- vim91/runtime/defaults.vim.copypaste	2025-06-27 06:43:53.000000000 +0200
-+++ vim91/runtime/defaults.vim	2025-07-11 09:16:19.013363739 +0200
-@@ -70,18 +70,6 @@ sunmap Q
+diff -up vim80/runtime/defaults.vim.copy-paste vim80/runtime/defaults.vim
+--- vim80/runtime/defaults.vim.copy-paste	2016-12-19 09:01:20.351119199 +0100
++++ vim80/runtime/defaults.vim	2016-12-19 09:01:53.735738941 +0100
+@@ -64,12 +64,6 @@ map Q gq
  " Revert with ":iunmap <C-U>".
  inoremap <C-U> <C-G>u<C-U>
  
 -" In many terminal emulators the mouse works just fine.  By enabling it you
 -" can position the cursor, Visually select and scroll with the mouse.
--" Only xterm can grab the mouse events when using the shift key, for other
--" terminals use ":", select text and press Esc.
 -if has('mouse')
--  if &term =~ 'xterm'
--    set mouse=a
--  else
--    set mouse=nvi
--  endif
+-  set mouse=a
 -endif
 -
- " Only do this part when Vim was compiled with the +eval feature.
- if 1
- 
-diff -up vim91/src/testdir/test_balloon.vim.copypaste vim91/src/testdir/test_balloon.vim
---- vim91/src/testdir/test_balloon.vim.copypaste	2025-07-11 09:16:19.013500976 +0200
-+++ vim91/src/testdir/test_balloon.vim	2025-07-11 09:17:20.168187029 +0200
-@@ -7,6 +7,7 @@ CheckFeature balloon_eval_term
- source util/screendump.vim
- 
- let s:common_script =<< trim [CODE]
-+  set mouse=a
-   call setline(1, ["one one one", "two tXo two", "three three three"])
-   set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100
-   let s:trailing = '<'  " check that script context is set
-diff -up vim91/src/testdir/test_popup.vim.copypaste vim91/src/testdir/test_popup.vim
---- vim91/src/testdir/test_popup.vim.copypaste	2025-07-11 08:58:40.000000000 +0200
-+++ vim91/src/testdir/test_popup.vim	2025-07-11 09:16:19.013692144 +0200
-@@ -957,6 +957,7 @@ func Test_mouse_popup_position()
-   let script =<< trim END
-     set mousemodel=popup_setpos
-     source $VIMRUNTIME/menu.vim
-+    set mouse=a
-     call setline(1, join(range(20)))
-     func Trigger(col)
-       call test_setmouse(1, a:col)
-diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_popupwin.vim
---- vim91/src/testdir/test_popupwin.vim.copypaste	2025-07-11 08:58:40.000000000 +0200
-+++ vim91/src/testdir/test_popupwin.vim	2025-07-11 09:16:19.013971633 +0200
-@@ -556,6 +556,7 @@ func Test_popup_drag()
-   " create a popup that covers the command line
-   let lines =<< trim END
- 	call setline(1, range(1, 20))
-+	set mouse=a
- 	split
- 	vsplit
- 	$wincmd w
-@@ -623,6 +624,7 @@ func Test_popup_drag_minwidth()
- 
-   " create a popup that does not fit
-   let lines =<< trim END
-+      set mouse=a
-       call range(40)
- 	      \ ->map({_,i -> string(i)})
- 	      \ ->popup_create({
-@@ -670,6 +672,7 @@ func Test_popup_drag_termwin()
-   let lines =<< trim END
- 	set foldmethod=marker
- 	call setline(1, range(100))
-+	set mouse=a
- 	for nr in range(7)
- 	  call setline(nr * 12 + 1, "fold {{{")
- 	  call setline(nr * 12 + 11, "end }}}")
-@@ -722,6 +725,7 @@ func Test_popup_close_with_mouse()
- 
-   let lines =<< trim END
- 	call setline(1, range(1, 20))
-+	set mouse=a
- 	" With border, can click on X
- 	let winid = popup_create('foobar', #{
- 	      \ close: 'button',
-@@ -1559,6 +1563,7 @@ func Test_popup_beval()
-   let lines =<< trim END
- 	call setline(1, range(1, 20))
- 	call setline(5, 'here is some text to hover over')
-+	set mouse=a
- 	set balloonevalterm
- 	set balloonexpr=BalloonExpr()
- 	set balloondelay=100
-@@ -2269,6 +2274,7 @@ func Test_popup_scrollbar()
- 
-   let lines =<< trim END
-     call setline(1, range(1, 20))
-+    set mouse=a
-     hi ScrollThumb ctermbg=blue
-     hi ScrollBar ctermbg=red
-     let winid = popup_create(['one', 'two', 'three', 'four', 'five',
+ " Switch syntax highlighting on when the terminal has colors or when using the
+ " GUI (which always has colors).
+ if &t_Co > 2 || has("gui_running")
diff --git a/vim-8.0-rhbz1365258.patch b/vim-8.0-rhbz1365258.patch
new file mode 100644
index 00000000..85498dba
--- /dev/null
+++ b/vim-8.0-rhbz1365258.patch
@@ -0,0 +1,12 @@
+diff -up vim80/runtime/syntax/fstab.vim.1365258 vim80/runtime/syntax/fstab.vim
+--- vim80/runtime/syntax/fstab.vim.1365258	2016-12-15 10:56:25.822410344 +0100
++++ vim80/runtime/syntax/fstab.vim	2016-12-15 10:56:52.161519612 +0100
+@@ -36,6 +36,8 @@ syn match fsOperator /[,=:#]/
+ syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
+ syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
+ syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts devtmpfs sysfs usbfs
++syn keyword fsDeviceKeyword contained PARTLABEL nextgroup=fsDeviceLabel
++syn keyword fsDeviceKeyword contained PARTUUID nextgroup=fsDeviceUUID
+ syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
+ syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
+ syn keyword fsDeviceKeyword contained sshfs nextgroup=fsDeviceSshfs
diff --git a/vim-crypto-warning.patch b/vim-crypto-warning.patch
deleted file mode 100644
index 6f55807f..00000000
--- a/vim-crypto-warning.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -up vim91/src/config.h.in.fips-warning vim91/src/config.h.in
---- vim91/src/config.h.in.fips-warning	2025-10-31 08:12:59.598267544 +0100
-+++ vim91/src/config.h.in	2025-10-31 08:14:45.661859595 +0100
-@@ -526,5 +526,14 @@
- /* Define if _SC_SIGSTKSZ is available via sysconf() */
- #undef HAVE_SYSCONF_SIGSTKSZ
- 
-+/* Do we need FIPS warning? */
-+#undef HAVE_FIPS_WARNING
-+
-+/* Link to system-fips file */
-+#undef SYSTEM_FIPS_FILE_LINK
-+
-+/* Link to fips_enabled file */
-+#undef FIPS_ENABLED_FILE_LINK
-+
- /* Define if you want to load libgpm dynamically */
- #undef DYNAMIC_GPM
-diff -up vim91/src/configure.ac.fips-warning vim91/src/configure.ac
---- vim91/src/configure.ac.fips-warning	2025-10-31 08:12:59.596711911 +0100
-+++ vim91/src/configure.ac	2025-10-31 08:12:59.598566242 +0100
-@@ -631,6 +631,38 @@ else
-   AC_SUBST(XDIFF_OBJS_USED)
- fi
- 
-+dnl Checking if we want FIPS warning
-+
-+AC_MSG_CHECKING(--enable-fips-warning)
-+AC_ARG_ENABLE([fips-warning],
-+              AS_HELP_STRING([--enable-fips-warning], [Enable FIPS warning]),
-+              ,[enable_fips_warning="no"])
-+
-+if test "$enable_fips_warning" = "yes"; then
-+  AC_MSG_RESULT(yes)
-+  AC_DEFINE([HAVE_FIPS_WARNING])
-+
-+  dnl Setting path for system-fips file
-+
-+  AC_MSG_CHECKING(--with-system-fips-file argument)
-+  AC_ARG_WITH([system-fips-file], [  --with-system-fips-file=PATH       Link to system-fips file (default: /etc/system-fips)],
-+	with_system_fips_file=$withval,
-+       with_system_fips_file="/etc/system-fips")
-+  AC_MSG_RESULT([$with_system_fips_file])
-+  AC_DEFINE_UNQUOTED([SYSTEM_FIPS_FILE_LINK], ["$with_system_fips_file"])
-+
-+  dnl Setting link to fips_enabled file
-+
-+  AC_MSG_CHECKING(--with-fips-enabled-file argument)
-+  AC_ARG_WITH([fips-enabled-file], [  --with-fips-enabled-file=PATH       Link to fibs_enabled file (default: /proc/sys/crypto/fips_enabled)],
-+	with_fips_enabled_file=$withval,
-+       with_fips_enabled_file="/proc/sys/crypto/fips_enabled")
-+  AC_MSG_RESULT([$with_fips_enabled_file])
-+  AC_DEFINE_UNQUOTED([FIPS_ENABLED_FILE_LINK], ["$with_fips_enabled_file"])
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+
- dnl Check for Lua feature.
- AC_MSG_CHECKING(--enable-luainterp argument)
- AC_ARG_ENABLE(luainterp,
-diff -up vim91/src/crypt.c.fips-warning vim91/src/crypt.c
---- vim91/src/crypt.c.fips-warning	2025-10-10 07:16:11.000000000 +0200
-+++ vim91/src/crypt.c	2025-10-31 08:12:59.598872032 +0100
-@@ -806,6 +806,21 @@ crypt_check_method(int method)
- 	msg_scroll = TRUE;
- 	msg(_("Warning: Using a weak encryption method; see :help 'cm'"));
-     }
-+#ifdef HAVE_FIPS_WARNING
-+    FILE *fips_enable_fd = fopen(FIPS_ENABLED_FILE_LINK, "r");
-+    if (fips_enable_fd == NULL)
-+	return;
-+
-+    int enabled = fgetc(fips_enable_fd);
-+
-+    if ( access(SYSTEM_FIPS_FILE_LINK, F_OK) != -1 && enabled == '1')
-+    {
-+	msg_scroll = TRUE;
-+	msg(_("Warning: This cryptography is not FIPS 140-2 compliant."));
-+    }
-+
-+    fclose(fips_enable_fd);
-+#endif
- }
- 
- /*
diff --git a/vim-default-editor.csh b/vim-default-editor.csh
deleted file mode 100644
index d98316d5..00000000
--- a/vim-default-editor.csh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Ensure vim is set as EDITOR if it isn't already set
-
-if ( ! ($?EDITOR) ) then
-    setenv EDITOR "/usr/bin/vim"
-endif
diff --git a/vim-default-editor.fish b/vim-default-editor.fish
deleted file mode 100644
index e4288c18..00000000
--- a/vim-default-editor.fish
+++ /dev/null
@@ -1,8 +0,0 @@
-# Ensure vim is set as EDITOR if it isn't already set
-# This is set as a universal variable so that any other definition
-# by the user would win
-# Cf. https://fishshell.com/docs/current/index.html#variables-scope
-
-if ! set -q EDITOR;
-    set -x EDITOR /usr/bin/vim
-end
diff --git a/vim-default-editor.sh b/vim-default-editor.sh
deleted file mode 100644
index 1a53dafd..00000000
--- a/vim-default-editor.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Ensure vim is set as EDITOR if it isn't already set
-
-if [ -z "$EDITOR" ]; then
-    export EDITOR="/usr/bin/vim"
-fi
diff --git a/vim-manpagefixes-948566.patch b/vim-manpagefixes-948566.patch
index c0806d65..6f495600 100644
--- a/vim-manpagefixes-948566.patch
+++ b/vim-manpagefixes-948566.patch
@@ -1,7 +1,38 @@
-diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
---- vim91/runtime/doc/vim.1.manpagefixes	2024-11-29 12:17:53.553382696 +0100
-+++ vim91/runtime/doc/vim.1	2024-11-29 12:17:53.556382667 +0100
-@@ -17,11 +17,13 @@ vim \- Vi IMproved, a programmer's text
+diff -up vim73/runtime/doc/vim.man.rh1 vim73/runtime/doc/vim.man
+--- vim73/runtime/doc/vim.man.rh1	2013-07-26 11:26:20.566576864 +0200
++++ vim73/runtime/doc/vim.man	2013-07-26 11:47:42.061351469 +0200
+@@ -11,9 +11,9 @@ SYNOPSIS
+        vim [options] -t tag
+        vim [options] -q [errorfile]
+ 
+-       ex
++       ex gex
+        view
+-       gvim gview evim eview
++       gvim gview vimx evim eview
+        rvim rview rgvim rgview
+ 
+ DESCRIPTION
+@@ -79,8 +79,13 @@ DESCRIPTION
+                  the files.  Can also be done with the "-R" argument.
+ 
+        gvim gview
+-                 The GUI version.  Starts a new window.  Can also be done with
+-                 the "-g" argument.
++                 The GUI version.  Starts a new window.
++
++       gex       Starts a new gvim window in Ex mode. Can also be done with
++                 the "-e" argument to gvim.
++
++       vimx      Starts gvim in "Vi" mode similar to "vim", but with 
++                 additional features like xterm clipboard support.
+ 
+        evim eview
+                  The GUI version in easy mode.  Starts a new window.  Can also
+diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1
+--- vim73/runtime/doc/vim.1	2013-07-31 14:13:01.039765800 +0200
++++ vim73_new/runtime/doc/vim.1	2013-07-31 13:57:59.861912768 +0200
+@@ -17,11 +17,13 @@
  .PP
  .br
  .B ex
@@ -15,7 +46,7 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
  .B evim
  .B eview
  .br
-@@ -114,7 +116,12 @@ Can also be done with the "\-R" argument
+@@ -114,7 +116,12 @@
  gvim gview
  The GUI version.
  Starts a new window.
@@ -29,7 +60,7 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
  .TP
  evim eview
  The GUI version in easy mode.
-@@ -491,6 +498,12 @@ As \-\-remote, but Vim does not exit unt
+@@ -458,6 +458,12 @@
  \-\-remote\-wait\-silent
  As \-\-remote\-wait, but without the warning when no server is found.
  .TP
@@ -42,10 +73,10 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1
  \-\-serverlist
  List the names of all Vim servers that can be found.
  .TP
-diff -up vim91/runtime/doc/vim-fr.1.manpagefixes vim91/runtime/doc/vim-fr.1
---- vim91/runtime/doc/vim-fr.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-fr.1	2024-11-29 12:17:53.556382667 +0100
-@@ -24,11 +24,13 @@ vim \- Vi IMproved, �diteur de texte pou
+diff -urN vim73/runtime/doc/vim-fr.1 vim73_new/runtime/doc/vim-fr.1
+--- vim73/runtime/doc/vim-fr.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vim-fr.1	2013-07-31 13:59:10.587467916 +0200
+@@ -24,11 +24,13 @@
  .PP
  .br
  .B ex
@@ -59,10 +90,10 @@ diff -up vim91/runtime/doc/vim-fr.1.manpagefixes vim91/runtime/doc/vim-fr.1
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes vim91/runtime/doc/vim-fr.UTF-8.1
---- vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-fr.UTF-8.1	2024-11-29 12:17:53.556382667 +0100
-@@ -24,11 +24,13 @@ vim \- Vi IMproved, éditeur de texte po
+diff -urN vim73/runtime/doc/vim-fr.UTF-8.1 vim73_new/runtime/doc/vim-fr.UTF-8.1
+--- vim73/runtime/doc/vim-fr.UTF-8.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vim-fr.UTF-8.1	2013-07-31 13:59:28.394852347 +0200
+@@ -24,11 +24,13 @@
  .PP
  .br
  .B ex
@@ -76,10 +107,10 @@ diff -up vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes vim91/runtime/doc/vim-fr.
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim-it.1.manpagefixes vim91/runtime/doc/vim-it.1
---- vim91/runtime/doc/vim-it.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-it.1	2024-11-29 12:17:53.557382658 +0100
-@@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi
+diff -urN vim73/runtime/doc/vim-it.1 vim73_new/runtime/doc/vim-it.1
+--- vim73/runtime/doc/vim-it.1	2010-07-27 22:22:52.000000000 +0200
++++ vim73_new/runtime/doc/vim-it.1	2013-07-31 13:59:43.474331077 +0200
+@@ -17,11 +17,13 @@
  .PP
  .br
  .B ex
@@ -93,10 +124,10 @@ diff -up vim91/runtime/doc/vim-it.1.manpagefixes vim91/runtime/doc/vim-it.1
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes vim91/runtime/doc/vim-it.UTF-8.1
---- vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-it.UTF-8.1	2024-11-29 12:17:53.557382658 +0100
-@@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi
+diff -urN vim73/runtime/doc/vim-it.UTF-8.1 vim73_new/runtime/doc/vim-it.UTF-8.1
+--- vim73/runtime/doc/vim-it.UTF-8.1	2010-07-30 20:53:57.000000000 +0200
++++ vim73_new/runtime/doc/vim-it.UTF-8.1	2013-07-31 13:59:55.985898573 +0200
+@@ -17,11 +17,13 @@
  .PP
  .br
  .B ex
@@ -110,41 +141,26 @@ diff -up vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes vim91/runtime/doc/vim-it.
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim.man.manpagefixes vim91/runtime/doc/vim.man
---- vim91/runtime/doc/vim.man.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim.man	2024-11-29 12:17:53.557382658 +0100
-@@ -9,9 +9,9 @@ SYNOPSIS
-        vim [options] -t tag
-        vim [options] -q [errorfile]
+diff -urN vim73/runtime/doc/vim.man vim73_new/runtime/doc/vim.man
+--- vim73/runtime/doc/vim.man	2013-07-31 14:13:01.044765627 +0200
++++ vim73_new/runtime/doc/vim.man	2013-07-31 13:53:35.107064804 +0200
+@@ -82,10 +82,10 @@
+                  The GUI version.  Starts a new window.
  
--       ex
-+       ex gex
-        view
--       gvim gview evim eview
-+       gvim gview vimx evim eview
-        rvim rview rgvim rgview
- 
- DESCRIPTION
-@@ -77,8 +77,13 @@ DESCRIPTION
-                  the files.  Can also be done with the "-R" argument.
- 
-        gvim gview
--                 The GUI version.  Starts a new window.  Can also be done with
--                 the "-g" argument.
-+                 The GUI version.  Starts a new window.
-+
-+       gex       Starts a new gvim window in Ex mode. Can also be done with
+        gex       Starts a new gvim window in Ex mode. Can also be done with
+-                 the "-e" argument to gvim.
 +                 the "-e" argument to gvim
-+
-+       vimx      Starts gvim in "Vi" mode similar to "vim", but with 
+ 
+        vimx      Starts gvim in "Vi" mode similar to "vim", but with 
+-                 additional features like xterm clipboard support.
 +                 additional features like xterm clipboard support
  
         evim eview
                   The GUI version in easy mode.  Starts a new window.  Can also
-diff -up vim91/runtime/doc/vim-pl.1.manpagefixes vim91/runtime/doc/vim-pl.1
---- vim91/runtime/doc/vim-pl.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-pl.1	2024-11-29 12:17:53.557382658 +0100
-@@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla
+diff -urN vim73/runtime/doc/vim-pl.1 vim73_new/runtime/doc/vim-pl.1
+--- vim73/runtime/doc/vim-pl.1	2010-05-15 13:04:01.000000000 +0200
++++ vim73_new/runtime/doc/vim-pl.1	2013-07-31 14:00:21.282024131 +0200
+@@ -17,11 +17,13 @@
  .PP
  .br
  .B ex
@@ -158,10 +174,10 @@ diff -up vim91/runtime/doc/vim-pl.1.manpagefixes vim91/runtime/doc/vim-pl.1
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vim-pl.UTF-8.1
---- vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-pl.UTF-8.1	2024-11-29 12:17:53.558382649 +0100
-@@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla
+diff -urN vim73/runtime/doc/vim-pl.UTF-8.1 vim73_new/runtime/doc/vim-pl.UTF-8.1
+--- vim73/runtime/doc/vim-pl.UTF-8.1	2010-05-15 13:37:38.000000000 +0200
++++ vim73_new/runtime/doc/vim-pl.UTF-8.1	2013-07-31 14:00:36.056513402 +0200
+@@ -17,11 +17,13 @@
  .PP
  .br
  .B ex
@@ -175,10 +191,10 @@ diff -up vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vim-pl.
  .B evim
  .B eview
  .br
-diff -up vim91/runtime/doc/vim-ru.1.manpagefixes vim91/runtime/doc/vim-ru.1
---- vim91/runtime/doc/vim-ru.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-ru.1	2024-11-29 12:17:53.558382649 +0100
-@@ -18,11 +18,13 @@
+diff -urN vim73/runtime/doc/vim-ru.1 vim73_new/runtime/doc/vim-ru.1
+--- vim73/runtime/doc/vim-ru.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vim-ru.1	2013-07-31 14:01:10.071337568 +0200
+@@ -17,11 +17,15 @@
  .PP
  .br
  .B ex
@@ -189,13 +205,15 @@ diff -up vim91/runtime/doc/vim-ru.1.manpagefixes vim91/runtime/doc/vim-ru.1
  .B gvim
  .B gview
 +.B vimx
- .B evim
- .B eview
++.B evim
++.B eview
  .br
-diff -up vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vim-ru.UTF-8.1
---- vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vim-ru.UTF-8.1	2024-11-29 12:17:53.558382649 +0100
-@@ -18,11 +18,13 @@ программистов.
+ .B rvim
+ .B rview
+diff -urN vim73/runtime/doc/vim-ru.UTF-8.1 vim73_new/runtime/doc/vim-ru.UTF-8.1
+--- vim73/runtime/doc/vim-ru.UTF-8.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vim-ru.UTF-8.1	2013-07-31 14:01:34.494493301 +0200
+@@ -17,11 +17,15 @@
  .PP
  .br
  .B ex
@@ -206,60 +224,62 @@ diff -up vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vim-ru.
  .B gvim
  .B gview
 +.B vimx
- .B evim
- .B eview
++.B evim
++.B eview
  .br
-diff -up vim91/runtime/doc/vimtutor.1.manpagefixes vim91/runtime/doc/vimtutor.1
---- vim91/runtime/doc/vimtutor.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor.1	2024-11-29 12:17:53.559382639 +0100
-@@ -8,6 +8,8 @@ vimtutor \- the Vim tutor
- .B vimtutor [\-h | \-\-help]
+ .B rvim
+ .B rview
+diff -urN vim73/runtime/doc/vimtutor.1 vim73_new/runtime/doc/vimtutor.1
+--- vim73/runtime/doc/vimtutor.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor.1	2013-07-31 14:10:10.093671964 +0200
+@@ -4,6 +4,8 @@
+ .SH SYNOPSIS
  .br
- .B vimtutor [\-\-list]
+ .B vimtutor [\-g] [language]
 +.br
 +.B gvimtutor
  .SH DESCRIPTION
  .B Vimtutor
  starts the
-diff -up vim91/runtime/doc/vimtutor-it.1.manpagefixes vim91/runtime/doc/vimtutor-it.1
---- vim91/runtime/doc/vimtutor-it.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor-it.1	2024-11-29 12:17:53.559382639 +0100
-@@ -8,6 +8,8 @@ vimtutor \- Un breve corso introduttivo
- .B vimtutor [\-h | \-\-help]
+diff -urN vim73/runtime/doc/vimtutor-it.1 vim73_new/runtime/doc/vimtutor-it.1
+--- vim73/runtime/doc/vimtutor-it.1	2010-07-27 22:35:32.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-it.1	2013-07-31 14:10:33.564861055 +0200
+@@ -4,6 +4,8 @@
+ .SH SINTASSI
  .br
- .B vimtutor [\-\-list]
+ .B vimtutor [\-g] [lingua]
 +.br
 +.B gvimtutor
  .SH DESCRIZIONE
  .B Vimtutor
  inizia il
-diff -up vim91/runtime/doc/vimtutor-it.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-it.UTF-8.1
---- vim91/runtime/doc/vimtutor-it.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor-it.UTF-8.1	2024-11-29 12:17:53.559382639 +0100
-@@ -8,6 +8,8 @@ vimtutor \- Un breve corso introduttivo
- .B vimtutor [\-h | \-\-help]
+diff -urN vim73/runtime/doc/vimtutor-it.UTF-8.1 vim73_new/runtime/doc/vimtutor-it.UTF-8.1
+--- vim73/runtime/doc/vimtutor-it.UTF-8.1	2010-07-30 20:53:57.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-it.UTF-8.1	2013-07-31 14:10:40.483622016 +0200
+@@ -4,6 +4,8 @@
+ .SH SINTASSI
  .br
- .B vimtutor [\-\-list]
+ .B vimtutor [\-g] [lingua]
 +.br
 +.B gvimtutor
  .SH DESCRIZIONE
  .B Vimtutor
  inizia il
-diff -up vim91/runtime/doc/vimtutor.man.manpagefixes vim91/runtime/doc/vimtutor.man
---- vim91/runtime/doc/vimtutor.man.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor.man	2024-11-29 12:17:53.559382639 +0100
-@@ -8,6 +8,7 @@ SYNOPSIS
-        [ISO639]
-        vimtutor [-h | --help]
-        vimtutor [--list]
+diff -urN vim73/runtime/doc/vimtutor.man vim73_new/runtime/doc/vimtutor.man
+--- vim73/runtime/doc/vimtutor.man	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor.man	2013-07-31 14:11:04.786782356 +0200
+@@ -7,6 +7,7 @@
+ 
+ SYNOPSIS
+        vimtutor [-g] [language]
 +       gvimtutor
  
  DESCRIPTION
-        Vimtutor starts the Vim tutor.
-diff -up vim91/runtime/doc/vimtutor-pl.1.manpagefixes vim91/runtime/doc/vimtutor-pl.1
---- vim91/runtime/doc/vimtutor-pl.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor-pl.1	2024-11-29 12:17:53.559382639 +0100
-@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima
+        Vimtutor starts the Vim tutor.  It copies the tutor file first, so that
+diff -urN vim73/runtime/doc/vimtutor-pl.1 vim73_new/runtime/doc/vimtutor-pl.1
+--- vim73/runtime/doc/vimtutor-pl.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-pl.1	2013-07-31 14:11:13.602477777 +0200
+@@ -4,6 +4,8 @@
  .SH SYNOPSIS
  .br
  .B vimtutor -g [j�zyk]
@@ -268,10 +288,10 @@ diff -up vim91/runtime/doc/vimtutor-pl.1.manpagefixes vim91/runtime/doc/vimtutor
  .SH OPIS
  .B Vimtutor
  uruchamia nauczyciela
-diff -up vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-pl.UTF-8.1
---- vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes	2024-11-15 06:32:23.000000000 +0100
-+++ vim91/runtime/doc/vimtutor-pl.UTF-8.1	2024-11-29 12:17:53.560382630 +0100
-@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima
+diff -urN vim73/runtime/doc/vimtutor-pl.UTF-8.1 vim73_new/runtime/doc/vimtutor-pl.UTF-8.1
+--- vim73/runtime/doc/vimtutor-pl.UTF-8.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-pl.UTF-8.1	2013-07-31 14:11:20.571237009 +0200
+@@ -4,6 +4,8 @@
  .SH SYNOPSIS
  .br
  .B vimtutor -g [język]
@@ -280,27 +300,27 @@ diff -up vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vi
  .SH OPIS
  .B Vimtutor
  uruchamia nauczyciela
-diff -up vim91/runtime/doc/vimtutor-ru.1.manpagefixes vim91/runtime/doc/vimtutor-ru.1
---- vim91/runtime/doc/vimtutor-ru.1.manpagefixes	2024-11-29 12:17:53.560382630 +0100
-+++ vim91/runtime/doc/vimtutor-ru.1	2024-11-29 12:20:14.883047832 +0100
-@@ -8,6 +8,8 @@
- .B vimtutor [\-h | \-\-help]
+diff -urN vim73/runtime/doc/vimtutor-ru.1 vim73_new/runtime/doc/vimtutor-ru.1
+--- vim73/runtime/doc/vimtutor-ru.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-ru.1	2013-07-31 14:11:35.673715221 +0200
+@@ -4,6 +4,8 @@
+ .SH ��������� ������
  .br
- .B vimtutor [\-\-list]
+ .B vimtutor [����]
 +.br
 +.B gvimtutor
  .SH ��������
- �� �������
+ �������
  .B vimtutor
-diff -up vim91/runtime/doc/vimtutor-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vimtutor-ru.UTF-8.1
---- vim91/runtime/doc/vimtutor-ru.UTF-8.1.manpagefixes	2024-11-29 12:17:53.560382630 +0100
-+++ vim91/runtime/doc/vimtutor-ru.UTF-8.1	2024-11-29 12:19:27.318497067 +0100
-@@ -11,6 +11,8 @@ Программа vimtutor \[em] вып
+diff -urN vim73/runtime/doc/vimtutor-ru.UTF-8.1 vim73_new/runtime/doc/vimtutor-ru.UTF-8.1
+--- vim73/runtime/doc/vimtutor-ru.UTF-8.1	2010-05-15 13:04:00.000000000 +0200
++++ vim73_new/runtime/doc/vimtutor-ru.UTF-8.1	2013-07-31 14:11:46.649335999 +0200
+@@ -7,6 +7,8 @@
  .SH ОПИСАНИЕ
- По команде
+ Команда
  .B vimtutor
 +.br
 +.B gvimtutor
- выполняется запуск редактора
+ запускает учебник по
  .B Vim.
- с загруженным файлом, содержащем текст учебника.
+ При этом сначала происходит создание копии файла учебника, 
diff --git a/vim-python3-tests.patch b/vim-python3-tests.patch
index 98b5f758..26027f74 100644
--- a/vim-python3-tests.patch
+++ b/vim-python3-tests.patch
@@ -1,16 +1,16 @@
-diff -up vim82/runtime/tools/demoserver.py.python-tests vim82/runtime/tools/demoserver.py
---- vim82/runtime/tools/demoserver.py.python-tests	2019-07-26 07:58:50.000000000 +0200
-+++ vim82/runtime/tools/demoserver.py	2020-04-17 06:18:06.748977527 +0200
+diff -up vim80/runtime/tools/demoserver.py.python3-tests vim80/runtime/tools/demoserver.py
+--- vim80/runtime/tools/demoserver.py.python3-tests	2018-05-11 08:24:41.774618804 +0200
++++ vim80/runtime/tools/demoserver.py	2018-05-11 09:24:48.363309856 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  #
  # Server that will accept connections from a Vim channel.
  # Run this server and then in Vim you can open the channel:
-diff -up vim82/src/auto/configure.python-tests vim82/src/auto/configure
---- vim82/src/auto/configure.python-tests	2020-04-17 06:07:48.000000000 +0200
-+++ vim82/src/auto/configure	2020-04-17 06:18:06.750977509 +0200
-@@ -6418,7 +6418,7 @@ eof
+diff -up vim80/src/auto/configure.python3-tests vim80/src/auto/configure
+--- vim80/src/auto/configure.python3-tests	2018-05-11 08:25:03.632420873 +0200
++++ vim80/src/auto/configure	2018-05-11 09:25:26.062000471 +0200
+@@ -6396,7 +6396,7 @@ eof
  	    if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
  		"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
  	      vi_cv_path_python_plibs="-framework Python"
@@ -19,10 +19,10 @@ diff -up vim82/src/auto/configure.python-tests vim82/src/auto/configure
  		  vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
  	      fi
  	    else
-diff -up vim82/src/configure.ac.python-tests vim82/src/configure.ac
---- vim82/src/configure.ac.python-tests	2020-04-17 06:07:48.000000000 +0200
-+++ vim82/src/configure.ac	2020-04-17 06:18:06.750977509 +0200
-@@ -1263,7 +1263,7 @@ eof
+diff -up vim80/src/configure.ac.python3-tests vim80/src/configure.ac
+--- vim80/src/configure.ac.python3-tests	2018-05-11 08:25:26.070218957 +0200
++++ vim80/src/configure.ac	2018-05-11 09:26:01.603708243 +0200
+@@ -1248,7 +1248,7 @@ eof
  	    if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
  		"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
  	      vi_cv_path_python_plibs="-framework Python"
@@ -31,54 +31,54 @@ diff -up vim82/src/configure.ac.python-tests vim82/src/configure.ac
  		  vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
  	      fi
  	    else
-diff -up vim82/src/testdir/test_channel_pipe.py.python-tests vim82/src/testdir/test_channel_pipe.py
---- vim82/src/testdir/test_channel_pipe.py.python-tests	2019-07-26 07:58:53.000000000 +0200
-+++ vim82/src/testdir/test_channel_pipe.py	2020-04-17 06:18:06.751977500 +0200
+diff -up vim80/src/testdir/test_channel_pipe.py.python3-tests vim80/src/testdir/test_channel_pipe.py
+--- vim80/src/testdir/test_channel_pipe.py.python3-tests	2018-05-11 09:23:05.738146018 +0200
++++ vim80/src/testdir/test_channel_pipe.py	2018-05-11 09:26:37.354413350 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  #
  # Server that will communicate over stdin/stderr
  #
-diff -up vim82/src/testdir/test_channel.py.python-tests vim82/src/testdir/test_channel.py
---- vim82/src/testdir/test_channel.py.python-tests	2020-04-17 06:18:06.751977500 +0200
-+++ vim82/src/testdir/test_channel.py	2020-04-17 06:18:24.517813082 +0200
+diff -up vim80/src/testdir/test_channel.py.python3-tests vim80/src/testdir/test_channel.py
+--- vim80/src/testdir/test_channel.py.python3-tests	2018-05-11 09:22:48.522284266 +0200
++++ vim80/src/testdir/test_channel.py	2018-05-11 09:26:17.762574955 +0200
 @@ -1,4 +1,4 @@
--#!/usr/bin/env python
+-#!/usr/bin/python
 +#!/usr/bin/python3
  #
  # Server that will accept connections from a Vim channel.
  # Used by test_channel.vim.
-diff -up vim82/src/testdir/test_channel_write.py.python-tests vim82/src/testdir/test_channel_write.py
---- vim82/src/testdir/test_channel_write.py.python-tests	2019-07-26 07:58:53.000000000 +0200
-+++ vim82/src/testdir/test_channel_write.py	2020-04-17 06:18:06.751977500 +0200
+diff -up vim80/src/testdir/test_channel_write.py.python3-tests vim80/src/testdir/test_channel_write.py
+--- vim80/src/testdir/test_channel_write.py.python3-tests	2018-05-11 09:23:21.254021422 +0200
++++ vim80/src/testdir/test_channel_write.py	2018-05-11 09:26:54.952268193 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  #
  # Program that writes a number to stdout repeatedly
  #
-diff -up vim82/src/testdir/test_makeencoding.py.python-tests vim82/src/testdir/test_makeencoding.py
---- vim82/src/testdir/test_makeencoding.py.python-tests	2019-07-26 07:58:53.000000000 +0200
-+++ vim82/src/testdir/test_makeencoding.py	2020-04-17 06:18:06.751977500 +0200
+diff -up vim80/src/testdir/test_makeencoding.py.python3-tests vim80/src/testdir/test_makeencoding.py
+--- vim80/src/testdir/test_makeencoding.py.python3-tests	2018-05-11 09:23:38.990878990 +0200
++++ vim80/src/testdir/test_makeencoding.py	2018-05-11 09:27:14.402107759 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  # -*- coding: utf-8 -*-
  
  # Test program for :make, :grep and :cgetfile.
-diff -up vim82/src/testdir/test_netbeans.py.python-tests vim82/src/testdir/test_netbeans.py
---- vim82/src/testdir/test_netbeans.py.python-tests	2019-07-26 07:58:53.000000000 +0200
-+++ vim82/src/testdir/test_netbeans.py	2020-04-17 06:18:06.751977500 +0200
+diff -up vim80/src/testdir/test_netbeans.py.python3-tests vim80/src/testdir/test_netbeans.py
+--- vim80/src/testdir/test_netbeans.py.python3-tests	2018-05-11 09:23:54.398752732 +0200
++++ vim80/src/testdir/test_netbeans.py	2018-05-11 09:27:30.489975057 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  #
  # Server that will communicate with Vim through the netbeans interface.
  # Used by test_netbeans.vim.
-diff -up vim82/src/testdir/test_short_sleep.py.python-tests vim82/src/testdir/test_short_sleep.py
---- vim82/src/testdir/test_short_sleep.py.python-tests	2019-07-26 07:58:53.000000000 +0200
-+++ vim82/src/testdir/test_short_sleep.py	2020-04-17 06:18:06.751977500 +0200
+diff -up vim80/src/testdir/test_short_sleep.py.python3-tests vim80/src/testdir/test_short_sleep.py
+--- vim80/src/testdir/test_short_sleep.py.python3-tests	2018-05-11 09:24:09.134631798 +0200
++++ vim80/src/testdir/test_short_sleep.py	2018-05-11 09:27:48.432827053 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
diff --git a/vim-update.sh b/vim-update.sh
index fc37e160..4bc08c12 100755
--- a/vim-update.sh
+++ b/vim-update.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 debug=""
 #debug="echo "
-branches=( "rawhide" "f43" "f42" )
-releases=( "fc44" "fc43" "fc42" )
-# the first bodhi enabled release is the last without \| - all
-# others need to have \|
-regexps=( "fc44" "fc43" "\|fc42" )
-bodhi_enabled=( "0" "1" "1" )
-needs_update=()
+branches=( "master" "f30" "f29" "f28" )
+releases=( "fc31" "fc30" "fc29" "fc28" )
+regexps=( "fc31" "\|fc30" "\|fc29" "\|fc28" )
+bodhi_enabled=( "0" "1" "1" "1" )
+branches_count=4
 #releases_regexp=fc28\\\|fc27\\\|fc28
 
 branches_index=0
@@ -15,7 +13,7 @@ release_index=0
 regexp_index=0
 bodhi_enabled_index=0
 done_build=0
-releases_regexp=""
+releases_regexp="${regexps[@]: regexp_index: 1}"
 let "regexp_index+=1"
 
 cd `dirname $0`
@@ -77,8 +75,8 @@ mv dist/vim-${UPSTREAMMAJOR}.tar.bz2 dist/vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.t
 popd
 
 cp -f vim-upstream/dist/vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2 .
-#wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/rawhide/ftplugin/spec.vim -O ftplugin-spec.vim
-#wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/rawhide/syntax/spec.vim -O syntax-spec.vim
+#wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/ftplugin/spec.vim -O ftplugin-spec.vim
+#wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/syntax/spec.vim -O syntax-spec.vim
 if [ $CHANGES -ne 0 ]; then
    CHLOG="* $DATE $PACKAGER -$EPOCH:$UPSTREAMMAJOR"
    $debug sed -i -e "/Release: /cRelease: 1%{?dist}" $SPEC
@@ -106,12 +104,23 @@ if [ $CHANGES -ne 0 ]; then
      exit 1
    fi
 
-   $debug fedpkg build
-   if [ $? -eq 0 ]; then
-     done_build=1
+   # Check if release has pending or testing update - if not, build package
+   # and submit update for testing
+   pending_update=`bodhi updates query --packages vim --status pending \
+     | grep $releases_regexp`
+   testing_update=`bodhi updates query --packages vim --status testing \
+     | grep $releases_regexp`
+
+   if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then
+     $debug fedpkg build
+     if [ $? -eq 0 ]; then
+       done_build=1
+     else
+       echo "Error when building package in $branch"
+       exit 1
+     fi
    else
-     echo "Error when building package in $branch"
-     exit 1
+     echo "There are pending/testing updates, do not build package."
    fi
 
    let "release_index+=1"
@@ -123,9 +132,9 @@ if [ $CHANGES -ne 0 ]; then
      $debug fedpkg switch-branch $branch
 
      # merge with previous branch
-     $debug bash -c "git merge rawhide <<<':x'"
+     $debug bash -c "git merge ${branches[@]: $branches_index: 1} <<<':x'"
      if [ $? -ne 0 ]; then
-       echo "Error: git merge rawhide"
+       echo "Error: git merge ${branches[@]: $branches_index: 1}"
        exit 1
      fi
 
@@ -143,27 +152,24 @@ if [ $CHANGES -ne 0 ]; then
        exit 1
      fi
 
-     # append next release to regexp if the branch is enabled in bodhi - because we
-     # need to check if there aren't any testing updates from higher enabled branches
-     # (lower branch cannot have bigger NVR than higher branch) in next iteration
-     if [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]
-     then
-       releases_regexp="$releases_regexp${regexps[@]: regexp_index: 1}"
-     fi
+     # append next release to regexp - because we need to check if there aren't
+     # any testing updates from higher branches (lower branch cannot have
+     # bigger NVR than higher branch) in next iteration
+     releases_regexp="$releases_regexp${regexps[@]: regexp_index: 1}"
 
-     # Check if release has an update in testing - if not, build package
+     # Check if release has pending or testing update - if not, build package
      # and submit update for testing
-     # done_build is a check, if previous branch did build - lower branch can do
+     #  | grep $releases_regexp`
+     # done_build is checking, if previous branch did build - lower branch can do
      # a build only when higher branch build was ok.
      testing_update=`bodhi updates query --packages vim --status testing \
        | grep $releases_regexp`
      if [ "$testing_update" == "" ] && [ $done_build -eq 1 ]; then
        $debug fedpkg build
        if [ $? -eq 0 ]; then
-         # if branch isn't rawhide or branch is enabled in bodhi, create the update if newer branch does
-         # not have an update in testing
-         if [ $branch != "rawhide" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then
-           $debug bodhi updates new --type enhancement --notes "The newest upstream commit" --request testing --autotime --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1}
+         # if branch isn't master or branch is enabled in bodhi, create update
+         if [ $branch != "master" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then
+           $debug bodhi updates new --user zdohnal --type enhancement --notes "The newest upstream commit" --request testing --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1}
          fi
        else
          echo "Error when building package for $branch"
@@ -189,11 +195,7 @@ if [ $CHANGES -ne 0 ]; then
    #fi
 fi
 
-#go back to rawhide
-$debug fedpkg switch-branch rawhide
-
-# clean up the downloaded vim-upstream repo - to prevent changes in it and breaking update process
-# prevents #1931099
-$debug rm -rf vim-upstream
+#go back to master
+$debug fedpkg switch-branch master
 
 exit 0
diff --git a/vim.csh b/vim.csh
new file mode 100644
index 00000000..bb9ceb14
--- /dev/null
+++ b/vim.csh
@@ -0,0 +1,6 @@
+if ( -x /usr/bin/id ) then
+    if ( "`/usr/bin/id -u`" > 200 ) then
+        alias vi vim
+    endif
+endif
+
diff --git a/vim.sh b/vim.sh
new file mode 100644
index 00000000..1e4ff789
--- /dev/null
+++ b/vim.sh
@@ -0,0 +1,5 @@
+if [ -n "${BASH_VERSION-}" -o -n "${KSH_VERSION-}" -o -n "${ZSH_VERSION-}" ]; then
+  [ "`/usr/bin/id -u 2>/dev/null || echo 0`" -le 200 ] && return
+  # for bash and zsh, only if no alias is already set
+  alias vi >/dev/null 2>&1 || alias vi=vim
+fi
diff --git a/vim.spec b/vim.spec
index b2c29f97..57b1cdd4 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,178 +1,94 @@
-%bcond_without gui
-
-
-%if 0%{?fedora}
-%bcond_without default_editor
-%bcond_without gpm
-%bcond_without libsodium_crypt
-%else
-%bcond_with default_editor
-%bcond_with gpm
-%bcond_with libsodium_crypt
-%endif
-
-
-%define patchlevel 2068
-%define withnetbeans 1
-
-%define withhunspell 0
-%define withlua 1
-%define withperl 1
-
-# VIm upstream wants to build with FORTIFY_SOURCE=1,
-# because higher levels causes crashes of valid code constructs
-# and their reimplementation would cost unnecessary maintenance
-# https://github.com/vim/vim/pull/3507
-%define _fortify_level 1
-
-%define baseversion 9.1
-%define vimdir vim91
-
-
+%define patchlevel 1359
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
-
-%if %{with gui}
 %define desktop_file 1
-%else
-%define desktop_file 0
-%endif
-
 %if %{desktop_file}
 %define desktop_file_utils_version 0.2.93
 %endif
 
-%if 0%{?flatpak}
-%define withruby 0
-%else
-%define withruby 1
-%endif
+%define withnetbeans 1
 
+%define withvimspell 0
+%define withhunspell 0
+%define withruby 1
+%define withlua 1
+
+%define baseversion 8.1
+%define vimdir vim81
 
 Summary: The VIM editor
-URL:     https://www.vim.org/
+URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
 Release: 1%{?dist}
-Epoch: 2
-# swift.vim contains Apache 2.0 with runtime library exception:
-# which is taken as Apache-2.0 WITH Swift-exception - reported to legal as https://gitlab.com/fedora/legal/fedora-license-data/-/issues/188
-# resolution: the license is good for Fedora, but the file does not have a creativity from 
-#
-# Open Publication License 1.0 or later for Vim documentation - reported to legal for adding to the allowed licenses list
-# response here: https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/message/4UTW5GFDELGMG6K3NQ7NBU42LC2FJOB5/
-# resolution: take it as OPUBL-1.0, the license won't be added to allowed license list, but if a project uses it for documentation
-# and don't use license options mentioned in the OPUBL 1.0 license text (which both are the case for Vim), the license is allowed
-License: Vim AND LGPL-2.1-or-later AND MIT AND GPL-1.0-only AND (GPL-2.0-only OR Vim) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-or-later AND GPL-3.0-or-later AND OPUBL-1.0 AND Apache-2.0 WITH Swift-exception
+License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
-Source1: virc
-Source2: vimrc
-Source3: gvim16.png
-Source4: gvim32.png
-Source5: gvim48.png
-Source6: gvim64.png
-Source7: spec-template.new
-Source8: macros.vim
-Source9: vim-default-editor.sh
-Source10: vim-default-editor.csh
-Source11: vim-default-editor.fish
-Source12: view_wrapper
-Source13: vi_wrapper
-
-
-Patch1: vim-7.0-fixkeys.patch
-Patch2: vim-7.4-specsyntax.patch
-Patch3: vim-7.3-manpage-typo-668894-675480.patch
-Patch4: vim-manpagefixes-948566.patch
-Patch5: vim-7.4-globalsyntax.patch
-# migrate shebangs in script to /usr/bin/python3 and use python2 when necessary
-Patch6: vim-python3-tests.patch
-# fips warning (Fedora downstream patch)
-Patch7: vim-crypto-warning.patch
-# don't ever set mouse (Fedora downstream patch)
-Patch8: vim-8.0-copy-paste.patch
-
-
-# patch only when hunspell is enabled
-Patch10000: vim-7.0-hunspell.patch
-
-
-# uses autoconf in spec file
-BuildRequires: autoconf
-
-# gcc is no longer in buildroot by default
-BuildRequires: gcc
-# for translations
-BuildRequires: gettext
-
-# glibc in F35 bootstraped several conversion formats from
-# iconv into a separate package. Vim needs those additional
-# formats during compilation.
-BuildRequires: glibc-gconv-extra
-
-# for setting ACL on created files
-BuildRequires: libacl-devel
-
-# uses libtool for linking
-BuildRequires: libtool
-
-# uses make
-BuildRequires: make
-# screen handling library
-BuildRequires: ncurses-devel
-
-# for building function prototypes
-BuildRequires: python3
-BuildRequires: python3-clang
-
-# for python plugin
-BuildRequires: python3-devel
-
-
-%if %{desktop_file}
-# for /usr/bin/desktop-file-install
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-Requires: desktop-file-utils
-%endif
-
-%if %{with gpm}
-# for mouse support in console
-BuildRequires: gpm-devel
+Source1: vim.sh
+Source2: vim.csh
+Source4: virc
+Source5: vimrc
+Source7: gvim16.png
+Source8: gvim32.png
+Source9: gvim48.png
+Source10: gvim64.png
+%if %{withvimspell}
+Source13: vim-spell-files.tar.bz2
 %endif
+Source14: spec-template.new
+Source15: macros.vim
+#Source17: ftplugin-spec.vim
+#Source18: syntax-spec.vim
 
+Patch2002: vim-7.0-fixkeys.patch
+Patch2003: vim-7.4-specsyntax.patch
 %if %{withhunspell}
+Patch2011: vim-7.0-hunspell.patch
 BuildRequires: hunspell-devel
 %endif
 
-# for xchacha20 encryption
-%if %{with libsodium_crypt}
-BuildRequires: libsodium-devel
-%endif
+Patch3000: vim-7.4-syntax.patch
+Patch3002: vim-7.4-nowarnings.patch
+Patch3004: vim-7.0-rclocation.patch
+Patch3006: vim-7.4-checkhl.patch
+Patch3007: vim-7.4-fstabsyntax.patch
+Patch3008: vim-7.4-syncolor.patch
+Patch3009: vim-7.0-specedit.patch
+Patch3010: vim-7.3-manpage-typo-668894-675480.patch
+Patch3011: vim-manpagefixes-948566.patch
+Patch3013: vim-7.4-globalsyntax.patch
+Patch3014: vim-7.4-releasestring-1318991.patch
+Patch3016: vim-8.0-copy-paste.patch
+# migrate shebangs in script to /usr/bin/python3 and use python2 when necessary
+Patch3017: vim-python3-tests.patch
 
-# for lua plugin
-%if "%{withlua}" == "1"
-BuildRequires: lua-devel
-%endif
+# gcc is no longer in buildroot by default
+BuildRequires: gcc
 
-# for perl plugin
-%if "%{withperl}" == "1"
-BuildRequires: perl-devel
+BuildRequires: python2-devel python3-devel ncurses-devel gettext perl-devel
 BuildRequires: perl-generators
-BuildRequires: perl(ExtUtils::Embed)
-BuildRequires: perl(ExtUtils::ParseXS)
-%endif
-
-# for ruby plugin
-%if "%{withruby}" == "1"
-BuildRequires: ruby
-BuildRequires: ruby-devel
-%endif
-
-# selinux support
+BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS)
+BuildRequires: libacl-devel gpm-devel autoconf file
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
 %endif
+%if "%{withruby}" == "1"
+BuildRequires: ruby-devel ruby
+%endif
+%if "%{withlua}" == "1"
+BuildRequires: lua-devel
+%endif
+%if %{desktop_file}
+# for /usr/bin/desktop-file-install
+Requires: desktop-file-utils
+BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
+%endif
+Epoch: 2
+Conflicts: filesystem < 3
+
+# vim bundles libvterm, which is used during build - so we need to provide
+# bundled libvterm for catching possible libvterm CVEs
+Provides: bundled(libvterm)
 
 
 %description
@@ -181,17 +97,13 @@ vi editor.  Vi was the first real screen-based editor for UNIX, and is
 still very popular.  VIM improves on vi by adding new features:
 multiple windows, multi-level undo, block highlighting and more.
 
-
 %package common
 Summary: The common files needed by any version of the VIM editor
-# move evim manpage to common - remove the conflict after C11S is branched
-Conflicts: %{name}-X11 < 2:9.1.1706-2
-# shared files between common and minimal
-Requires: %{name}-data = %{epoch}:%{version}-%{release}
+Conflicts: man-pages-fr < 0.9.7-14
+Conflicts: man-pages-it < 0.3.0-17
+Conflicts: man-pages-pl < 0.24-2
 Requires: %{name}-filesystem
-# the hexdump binary was part of the package for long time, ship it with it
-# still for convenience
-Requires: xxd
+Conflicts: %{name}-minimal < %{epoch}:8.1.1-1
 
 %description common
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -204,13 +116,20 @@ order to run.
 If you are installing vim-enhanced or vim-X11, you'll also need
 to install the vim-common package.
 
+%package spell
+Summary: The dictionaries for spell checking. This package is optional
+Requires: vim-common = %{epoch}:%{version}-%{release}
+
+%description spell
+This subpackage contains dictionaries for vim spell checking in
+many different languages.
 
 %package minimal
 Summary: A minimal version of the VIM editor
-Provides: vi
+Provides: vi = %{version}-%{release}
 Provides: %{_bindir}/vi
-# shared files between common and minimal
-Requires: %{name}-data = %{epoch}:%{version}-%{release}
+# conflicts in package because of manpage move (bug #1599663)
+Conflicts: %{name}-common < %{epoch}:8.1.1-1
 
 %description minimal
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -221,37 +140,24 @@ vim-minimal package includes a minimal version of VIM, providing
 the commands vi, view, ex, rvi, and rview. NOTE: The online help is
 only available when the vim-common package is installed.
 
-
 %package enhanced
 Summary: A version of the VIM editor which includes recent enhancements
-# vim bundles libvterm, which is used during build - so we need to provide
-# bundled libvterm for catching possible libvterm CVEs
-Provides: bundled(libvterm)
-Provides: vim
-Provides: vim(plugins-supported)
+Requires: vim-common = %{epoch}:%{version}-%{release} which
+Provides: vim = %{version}-%{release}
 Provides: %{_bindir}/mergetool
 Provides: %{_bindir}/vim
-Requires: vim-common = %{epoch}:%{version}-%{release}
-# required for vimtutor (#395371)
-Requires: which
-Suggests: python3
-Suggests: python3-libs
-
 # suggest python3, python2, lua, ruby and perl packages because of their 
 # embedded functionality in Vim/GVim
+Suggests: python2 python2-libs 
+Suggests: python3 python3-libs
+Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-libs perl-devel
+%if "%{withruby}" == "1"
+Suggests: ruby-libs ruby
+%endif
 %if "%{withlua}" == "1"
 Suggests: lua-libs
 %endif
 
-%if "%{withperl}" == "1"
-Suggests: perl-devel
-%endif
-
-%if "%{withruby}" == "1"
-Suggests: ruby
-Suggests: ruby-libs
-%endif
-
 %description enhanced
 VIM (VIsual editor iMproved) is an updated and improved version of the
 vi editor.  Vi was the first real screen-based editor for UNIX, and is
@@ -265,7 +171,6 @@ VIM editor which includes recently added enhancements like
 interpreters for the Python and Perl scripting languages.  You'll also
 need to install the vim-common package.
 
-
 %package filesystem
 Summary: VIM filesystem layout
 BuildArch: noarch
@@ -274,93 +179,33 @@ BuildArch: noarch
 This package provides some directories which are required by other
 packages that add vim files, p.e.  additional syntax files or filetypes.
 
-
-%package data
-Summary: Shared data for Vi and Vim
-BuildArch: noarch
-
-%description data
-The subpackage is used for shipping files and directories, which need to be
-shared between vim-minimal and vim-common packages.
-
-
-%package -n xxd
-Summary: A hex dump utility
-
-%description -n xxd
-xxd creates a hex dump of a given file or standard input.  It can also convert
-a hex dump back to its original binary form.
-
-
-%if %{with default_editor}
-%package default-editor
-Summary: Set vim as the default editor
-BuildArch: noarch
-Conflicts: system-default-editor
-Provides: system-default-editor
-Requires: vim-enhanced
-
-%description default-editor
-This subpackage contains files needed to set Vim as the default editor.
-%endif
-
-%if %{with gui}
 %package X11
 Summary: The VIM version of the vi editor for the X Window System - GVim
-# move evim manpage to common - remove the conflict after C11S is branched
-Conflicts: %{name}-common < 2:9.1.1706-2
-# devel of libICE, gtk3, libSM, libX11, libXpm and libXt are needed in buildroot
-# so configure script can have correct macros enabled for GUI (#1603272)
-# generic gnome toolkit for graphical support
+# needed in configure script to have correct macros enabled for GUI (#1603272)
 BuildRequires: gtk3-devel
-# inter-client exchange library - for X session management protocol
-BuildRequires: libICE-devel
-# X session management library
-BuildRequires: libSM-devel
-# core X11 protocol client library
 BuildRequires: libX11-devel
-# X Toolkit Intrinsics library - working with widgets?
+BuildRequires: libSM-devel
 BuildRequires: libXt-devel
-# for testing validity of appdata file
-BuildRequires: libappstream-glib
-# for sound support
-BuildRequires: libcanberra-devel
+BuildRequires: libXpm-devel
+BuildRequires: libICE-devel
 
-Provides: gvim
-Provides: vim(plugins-supported)
+Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk3 
+Provides: gvim = %{version}-%{release}
 Provides: %{_bindir}/mergetool
 Provides: %{_bindir}/gvim
-
-# glib2 in Fedora 40 introduced a new function, which is not used in GVim, but it is present
-# in compiled gvim binary as symbol when Vim is compiled with glib2-2.79.1
-# there does not seem to be a better solution than version based requires on glib2...
-# https://bugzilla.redhat.com/show_bug.cgi?id=2262371
-Requires: glib2 >= 2.79.1
-# GVIM graphics are based on GTK3
-Requires: gtk3
-# needed for icons (#226526)
+BuildRequires: gtk3-devel libSM-devel libXt-devel libXpm-devel libappstream-glib
 Requires: hicolor-icon-theme
-# for getting/setting extended attributes - they are pairs (name:value)
-# from inodes (files, dirs etc.)
-Requires: libattr >= 2.4
-Requires: vim-common = %{epoch}:%{version}-%{release} 
-Suggests: python3
-Suggests: python3-libs
-
 # suggest python3, python2, lua, ruby and perl packages because of their 
 # embedded functionality in Vim/GVim
-  %if "%{withlua}" == "1"
+Suggests: python2 python2-libs 
+Suggests: python3 python3-libs
+Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-libs perl-devel
+%if "%{withruby}" == "1"
+Suggests: ruby-libs ruby
+%endif
+%if "%{withlua}" == "1"
 Suggests: lua-libs
-  %endif
-
-  %if "%{withperl}" == "1"
-Suggests: perl-devel
-  %endif
-
-  %if "%{withruby}" == "1"
-Suggests: ruby
-Suggests: ruby-libs
-  %endif
+%endif
 
 %description X11
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -374,46 +219,57 @@ application with a full GUI interface and mouse support by command gvim.
 Install the vim-X11 package if you'd like to try out a version of vi
 with graphics and mouse capabilities.  You'll also need to install the
 vim-common package.
-%endif
-
 
 %prep
 %setup -q -b 0 -n %{vimdir}
 
 # use %%{__python3} macro for defining shebangs in python3 tests
-sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH6}
+sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3017}
 
 # fix rogue dependencies from sample code
 chmod -x runtime/tools/mve.awk
-%patch -P 1 -p1 -b .fixkeys
-%patch -P 2 -p1 -b .spec-syntax
-
+%patch2002 -p1
+%patch2003 -p1
+%if %{withhunspell}
+%patch2011 -p1
+%endif
 perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 
-%patch -P 3 -p1 -b .mantypo
-%patch -P 4 -p1 -b .manpagefixes
-%patch -P 5 -p1 -b .globalsyntax
-%patch -P 6 -p1 -b .python-tests
-%patch -P 7 -p1 -b .fips-warning
-%patch -P 8 -p1 -b .copypaste
-
-%if %{withhunspell}
-%patch -P 10000 -p1
+# install spell files
+%if %{withvimspell}
+%{__tar} xjf %{SOURCE13}
 %endif
 
+%patch3000 -p1
+%patch3002 -p1
+%patch3004 -p1
+%patch3006 -p1
+%patch3007 -p1
+%patch3008 -p1 -b .syncolor
+#patch3009 -p1
+%patch3010 -p1
+%patch3011 -p1
+%patch3013 -p1
+%patch3014 -p1
+%patch3016 -p1
+%patch3017 -p1
 
 %build
+%if 0%{?rhel} > 7
+export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
+%endif
+
 cd src
 autoconf
 
-# added -std=c17 because F42 uses c23 by default and dynamically loaded Ruby plugin fails to build
-# with c23 due using `()` for callback arguments to be able to use callbacks with different number
-# of arguments in one function
-# reported upstream as https://github.com/vim/vim/issues/16575
-export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -std=c17"
-export CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -std=c17"
+sed -e "s+VIMRCLOC	= \$(VIMLOC)+VIMRCLOC	= /etc+" Makefile > Makefile.tmp
+mv -f Makefile.tmp Makefile
+
+export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
+export CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 
 cp -f os_unix.h os_unix.h.save
+cp -f ex_cmds.c ex_cmds.c.save
 
 # Configure options:
 # --enable-fail-if-missing - we need to fail if configure options aren't satisfied
@@ -428,8 +284,7 @@ cp -f os_unix.h os_unix.h.save
 # --disable-gpm - disabling support for General Purpose Mouse - Linux mouse daemon
 
 perl -pi -e "s/vimrc/virc/"  os_unix.h
-%configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/virc\"'" \
-  --prefix=%{_prefix} --with-features=tiny --with-x=no \
+%configure --prefix=%{_prefix} --with-features=small --with-x=no \
   --enable-multibyte \
   --disable-netbeans \
 %if %{WITH_SELINUX}
@@ -441,36 +296,30 @@ perl -pi -e "s/vimrc/virc/"  os_unix.h
   --with-tlib=ncurses --enable-gui=no --disable-gpm --exec-prefix=/ \
   --with-compiledby="<bugzilla@redhat.com>" \
   --with-modified-by="<bugzilla@redhat.com>" \
-  --enable-fips-warning \
-  --enable-fail-if-missing \
-  --disable-canberra \
-  --without-wayland \
-  --enable-year2038 \
-  --disable-libsodium
+  --enable-fail-if-missing
 
-%make_build
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 cp vim minimal-vim
 make clean
 
-
 mv -f os_unix.h.save os_unix.h
+mv -f ex_cmds.c.save ex_cmds.c
 
-%configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \
- --prefix=%{_prefix} --with-features=huge \
- --enable-python3interp=dynamic \
-  --with-python3-stable-abi \
- --disable-tclinterp \
- --with-x=no \
- --enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte \
- --enable-cscope --with-modified-by="<bugzilla@redhat.com>" \
- --with-tlib=ncurses \
- --enable-fips-warning \
- --with-compiledby="<bugzilla@redhat.com>" \
-%if %{with gpm}
- --enable-gpm \
-%else
- --disable-gpm \
-%endif
+# More configure options:
+# --enable-xim - enabling X Input Method - international input module for X,
+#                it is for multibyte languages in Vim with X
+# --enable-termtruecolor - use terminal with true colors
+
+%configure --with-features=huge \
+  --enable-pythoninterp=dynamic \
+  --enable-python3interp=dynamic \
+  --enable-perlinterp=dynamic \
+  --disable-tclinterp --with-x=yes \
+  --enable-xim --enable-multibyte \
+  --with-tlib=ncurses \
+  --enable-gtk3-check --enable-gui=gtk3 \
+  --with-compiledby="<bugzilla@redhat.com>" --enable-cscope \
+  --with-modified-by="<bugzilla@redhat.com>" \
 %if "%{withnetbeans}" == "1"
   --enable-netbeans \
 %else
@@ -481,12 +330,6 @@ mv -f os_unix.h.save os_unix.h
 %else
   --disable-selinux \
 %endif
-%if "%{withperl}" == "1"
-  --enable-perlinterp=dynamic \
-  --with-xsubpp=$(which xsubpp) \
-%else
-  --disable-perlinterp \
-%endif
 %if "%{withruby}" == "1"
   --enable-rubyinterp=dynamic \
 %else
@@ -497,123 +340,77 @@ mv -f os_unix.h.save os_unix.h
 %else
   --disable-luainterp \
 %endif
-%if %{with libsodium_crypt}
-  --enable-libsodium \
-%else
-  --disable-libsodium \
-%endif
-  --enable-fail-if-missing \
-  --without-wayland \
-  --enable-year2038 \
-  --disable-canberra
+  --enable-fail-if-missing
 
-%make_build
-cp vim enhanced-vim
-
-
-%if %{with gui}
-# More configure options:
-# --enable-xim - enabling X Input Method - international input module for X,
-#                it is for multibyte languages in Vim with X
-# --enable-termtruecolor - use terminal with true colors
-
-%configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \
-  --with-features=huge \
-  --enable-python3interp=dynamic \
-  --with-python3-stable-abi \
-  --disable-tclinterp --with-x=yes \
-  --enable-xim --enable-multibyte \
-  --with-tlib=ncurses \
-  --enable-gtk3-check --enable-gui=gtk3 \
-  --enable-fips-warning \
-  --with-compiledby="<bugzilla@redhat.com>" --enable-cscope \
-  --with-modified-by="<bugzilla@redhat.com>" \
-  %if %{with gpm}
-  --enable-gpm \
-  %else
-  --disable-gpm \
-  %endif
-  %if "%{withnetbeans}" == "1"
-  --enable-netbeans \
-  %else
-  --disable-netbeans \
-  %endif
-  %if %{WITH_SELINUX}
-  --enable-selinux \
-  %else
-  --disable-selinux \
-  %endif
-  %if "%{withperl}" == "1"
-  --enable-perlinterp=dynamic \
-  --with-xsubpp=$(which xsubpp) \
-  %else
-  --disable-perlinterp \
-  %endif
-  %if "%{withruby}" == "1"
-  --enable-rubyinterp=dynamic \
-  %else
-  --disable-rubyinterp \
-  %endif
-  %if "%{withlua}" == "1"
-  --enable-luainterp=dynamic \
-  %else
-  --disable-luainterp \
-  %endif
-  %if %{with libsodium_crypt}
-  --enable-libsodium \
-  %else
-  --disable-libsodium \
-  %endif
-  --enable-fail-if-missing \
-  --with-wayland \
-  --enable-year2038 \
-  --enable-socketserver \
-  --enable-canberra
-
-%make_build
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
 cp vim gvim
 make clean
-%endif
 
+%configure --prefix=%{_prefix} --with-features=huge \
+ --enable-pythoninterp=dynamic \
+ --enable-python3interp=dynamic \
+ --enable-perlinterp=dynamic \
+ --disable-tclinterp \
+ --with-x=no \
+ --enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte \
+ --enable-cscope --with-modified-by="<bugzilla@redhat.com>" \
+ --with-tlib=ncurses \
+ --with-compiledby="<bugzilla@redhat.com>" \
+%if "%{withnetbeans}" == "1"
+  --enable-netbeans \
+%else
+  --disable-netbeans \
+%endif
+%if %{WITH_SELINUX}
+  --enable-selinux \
+%else
+  --disable-selinux \
+%endif
+%if "%{withruby}" == "1"
+  --enable-rubyinterp=dynamic \
+%else
+  --disable-rubyinterp \
+%endif
+%if "%{withlua}" == "1"
+  --enable-luainterp=dynamic \
+%else
+  --disable-luainterp \
+%endif
+  --enable-fail-if-missing
+
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
+cp vim enhanced-vim
 
 %install
 mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}/%{_datadir}/%{name}/vimfiles/{after,autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor}
 mkdir -p %{buildroot}/%{_datadir}/%{name}/vimfiles/after/{autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor}
-cp -f %{SOURCE7} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec
+cp -f %{SOURCE14} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec
+cp runtime/doc/uganda.txt LICENSE
 # Those aren't Linux info files but some binary files for Amiga:
 rm -f README*.info
 
+
 cd src
-# related to the issue with `make depend`, auto/osdef.h
-# has to be generated
-make auto/osdef.h auto/gui_gtk_gresources.h auto/wayland/wlr-data-control-unstable-v1.h
 # Adding STRIP=/bin/true, because Vim wants to strip the binaries by himself
 # and put the stripped files into correct dirs. Build system (koji/brew) 
 # does it for us, so there is no need to do it in Vim
-%make_install BINDIR=%{_bindir} STRIP=/bin/true
-
-# make install creates vim binary and view symlink, they will be wrappers
-# so remove them here
-rm -f %{buildroot}%{_bindir}/{vim,view}
+make install DESTDIR=%{buildroot} BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} STRIP=/bin/true
+make installgtutorbin  DESTDIR=%{buildroot} BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
-mkdir -p %{buildroot}%{_libexecdir}
-install -m755 minimal-vim %{buildroot}%{_libexecdir}/vi
+install -m755 minimal-vim %{buildroot}%{_bindir}/vi
 install -m755 enhanced-vim %{buildroot}%{_bindir}/vim
-install -m755 %{SOURCE12} %{buildroot}%{_bindir}/view
-install -m755 %{SOURCE13} %{buildroot}%{_bindir}/vi
-
-%if %{with gui}
-make installgtutorbin  DESTDIR=%{buildroot} BINDIR=%{_bindir}
 install -m755 gvim %{buildroot}%{_bindir}/gvim
-install -p -m644 %{SOURCE3} \
+install -p -m644 %{SOURCE7} \
    %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/gvim.png
-install -p -m644 %{SOURCE4} \
+install -p -m644 %{SOURCE8} \
    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/gvim.png
-install -p -m644 %{SOURCE5} \
+install -p -m644 %{SOURCE9} \
    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/gvim.png
-install -p -m644 %{SOURCE6} \
+install -p -m644 %{SOURCE10} \
    %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/gvim.png
+#cp -f %{SOURCE17} %{buildroot}/%{_datadir}/%{name}/%{vimdir}/ftplugin/spec.vim
+#cp -f %{SOURCE18} %{buildroot}/%{_datadir}/%{name}/%{vimdir}/syntax/spec.vim
 
 # Register as an application to be visible in the software center
 #
@@ -623,19 +420,17 @@ install -p -m644 %{SOURCE6} \
 # See http://www.freedesktop.org/software/appstream/docs/ for more details.
 #
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
-cat > $RPM_BUILD_ROOT%{_datadir}/metainfo/gvim.appdata.xml <<"EOF"
+cat > $RPM_BUILD_ROOT%{_datadir}/metainfo/gvim.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <!--
 EmailAddress: Bram@moolenaar.net>
 SentUpstream: 2014-05-22
 -->
-<component type="desktop-application">
-  <id>org.vim.Vim</id>
-  <name>GVim</name>
+<application>
+  <id type="desktop">gvim.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>Vim</project_license>
-  <summary>The VIM version of the vi editor for the X Window System</summary>
   <description>
     <p>
      Vim is an advanced text editor that seeks to provide the power of the
@@ -650,136 +445,89 @@ SentUpstream: 2014-05-22
      Vim is perfect for all kinds of text editing, from composing email to
      editing configuration files.
     </p>
-    <p>
-     We ship the current Vim stable release - %{baseversion} - with the upstream
-     patchlevel %{patchlevel} applied, which is combined into version %{version}
-     used during packaging.
-    </p>
   </description>
-  <releases>
-    <release version="%{version}" date="%(date +%F -r %{SOURCE0})" />
-  </releases>
   <screenshots>
     <screenshot type="default">
       <image>https://raw.githubusercontent.com/zdohnal/vim/zdohnal-screenshot/gvim16_9.png</image>
     </screenshot>
   </screenshots>
   <url type="homepage">http://www.vim.org/</url>
-  <content_rating type="oars-1.1"/>
-  <!--
-    Without this tag, the G-S does not display icon properly. But also the
-    `appstream-builder` inserts into metadata generic
-    `<launchable type="desktop-id">org.vim.Vim.desktop</launchable>`,
-    which cannot be found. This results in `Vetos: Has no Icon` and
-    therefore rejection of GVim from `appstream-data` package.
-  -->
-  <launchable type="desktop-id">gvim.desktop</launchable>
-</component>
+</application>
 EOF
 
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
-
-# do not put gvim.1, gview.1, eview.1, rgvim and rgview here - they already contains the link,
-# and changing it here will rewrite original vim.1 - bz#2392178
-for i in gex.1 vimx.1 evim.1; do
-  echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man1/$i
-done
-
-echo ".so man1/vimtutor.1" > %{buildroot}/%{_mandir}/man1/gvimtutor.1
-%else
-# Remove files included in X11 subpackage, but built by default:
-rm %{buildroot}/%{_mandir}/man1/evim.*
-rm %{buildroot}/%{_datadir}/applications/{vim,gvim}.desktop
-rm %{buildroot}/%{_datadir}/icons/{hicolor,locolor}/*/apps/gvim.png
-%endif
-
 ( cd %{buildroot}
-  ln -sf ../..%{_libexecdir}/vi .%{_bindir}/rvi
-  ln -sf ../..%{_libexecdir}/vi .%{_bindir}/rview
-  ln -sf ../..%{_libexecdir}/vi .%{_bindir}/ex
-  ln -sf vim .%{_bindir}/rvim
-  ln -sf vim .%{_bindir}/vimdiff
+  ln -sf vi ./%{_bindir}/rvi
+  ln -sf vi ./%{_bindir}/rview
+  ln -sf vi ./%{_bindir}/view
+  ln -sf vi ./%{_bindir}/ex
+  ln -sf vim ./%{_bindir}/rvim
+  ln -sf vim ./%{_bindir}/vimdiff
   perl -pi -e "s,%{buildroot},," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1
   rm -f .%{_mandir}/man1/rvim.1
   cp -p .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vi.1
   ln -sf vi.1.gz .%{_mandir}/man1/rvi.1.gz
-  ln -sf vi.1.gz .%{_mandir}/man1/ex.1
-  ln -sf vi.1.gz .%{_mandir}/man1/view.1
-  ln -sf vi.1.gz .%{_mandir}/man1/rview.1
   ln -sf vim.1.gz .%{_mandir}/man1/vimdiff.1.gz
-
-%if %{with gui}
-  ln -sf gvim ./%{_bindir}/evim
-  ln -sf gvim ./%{_bindir}/eview
   ln -sf gvim ./%{_bindir}/gview
   ln -sf gvim ./%{_bindir}/gex
+  ln -sf gvim ./%{_bindir}/evim
   ln -sf gvim ./%{_bindir}/gvimdiff
-  ln -sf gvim ./%{_bindir}/rgvim
-  ln -sf gvim ./%{_bindir}/rgview
   ln -sf gvim ./%{_bindir}/vimx
-
   %if "%{desktop_file}" == "1"
+    mkdir -p %{buildroot}/%{_datadir}/applications
     desktop-file-install \
+    %if 0%{?fedora} && 0%{?fedora} < 19
+        --vendor fedora \
+    %endif
         --dir %{buildroot}/%{_datadir}/applications \
-        %{buildroot}/%{_datadir}/applications/gvim.desktop
+        %{_builddir}/%{vimdir}/runtime/gvim.desktop
         # --add-category "Development;TextEditor;X-Red-Hat-Base" D\
   %else
     mkdir -p ./%{_sysconfdir}/X11/applnk/Applications
-    cp %{buildroot}/%{_datadir}/applications/gvim.desktop ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop
+    cp %{_builddir}/%{vimdir}/runtime/gvim.desktop ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop
   %endif
-
-%endif
-
   # ja_JP.ujis is obsolete, ja_JP.eucJP is recommended.
   ( cd ./%{_datadir}/%{name}/%{vimdir}/lang; \
     ln -sf menu_ja_jp.ujis.vim menu_ja_jp.eucjp.vim )
 )
 
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
+
+pushd %{buildroot}/%{_datadir}/%{name}/%{vimdir}/tutor
+mkdir conv
+   iconv -f CP1252 -t UTF8 tutor.ca > conv/tutor.ca
+   iconv -f CP1252 -t UTF8 tutor.it > conv/tutor.it
+   #iconv -f CP1253 -t UTF8 tutor.gr > conv/tutor.gr
+   iconv -f CP1252 -t UTF8 tutor.fr > conv/tutor.fr
+   iconv -f CP1252 -t UTF8 tutor.es > conv/tutor.es
+   iconv -f CP1252 -t UTF8 tutor.de > conv/tutor.de
+   #iconv -f CP737 -t UTF8 tutor.gr.cp737 > conv/tutor.gr.cp737
+   #iconv -f EUC-JP -t UTF8 tutor.ja.euc > conv/tutor.ja.euc
+   #iconv -f SJIS -t UTF8 tutor.ja.sjis > conv/tutor.ja.sjis
+   iconv -f UTF8 -t UTF8 tutor.ja.utf-8 > conv/tutor.ja.utf-8
+   iconv -f UTF8 -t UTF8 tutor.ko.utf-8 > conv/tutor.ko.utf-8
+   iconv -f CP1252 -t UTF8 tutor.no > conv/tutor.no
+   iconv -f ISO-8859-2 -t UTF8 tutor.pl > conv/tutor.pl
+   iconv -f ISO-8859-2 -t UTF8 tutor.sk > conv/tutor.sk
+   iconv -f KOI8R -t UTF8 tutor.ru > conv/tutor.ru
+   iconv -f CP1252 -t UTF8 tutor.sv > conv/tutor.sv
+   mv -f tutor.ja.euc tutor.ja.sjis tutor.ko.euc tutor.pl.cp1250 tutor.zh.big5 tutor.ru.cp1251 tutor.zh.euc tutor.sr.cp1250 tutor.sr.utf-8 conv/
+   rm -f tutor.ca tutor.de tutor.es tutor.fr tutor.gr tutor.it tutor.ja.utf-8 tutor.ko.utf-8 tutor.no tutor.pl tutor.sk tutor.ru tutor.sv
+mv -f conv/* .
+rmdir conv
+popd
+
 # Dependency cleanups
 chmod 644 %{buildroot}/%{_datadir}/%{name}/%{vimdir}/doc/vim2html.pl \
  %{buildroot}/%{_datadir}/%{name}/%{vimdir}/tools/*.pl \
  %{buildroot}/%{_datadir}/%{name}/%{vimdir}/tools/vim132
 chmod 644 ../runtime/doc/vim2html.pl
 
-mkdir -p %{buildroot}%{_sysconfdir}
-install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/virc
-install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vimrc
-
-mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
-install -p -m644 %{SOURCE8} %{buildroot}%{_rpmconfigdir}/macros.d/
-
-(cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) 
-rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
-rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/tools
-rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/doc/vim2html.pl
-rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/tutor/tutor.gr.utf-8~
-
-# Remove not UTF-8 manpages
-for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1 da.ISO8859-1 de.ISO8859-1 tr.ISO8859-9; do
-  rm -rf %{buildroot}/%{_mandir}/$i
-done
-
-# use common man1/ru directory
-mv %{buildroot}/%{_mandir}/ru.UTF-8 %{buildroot}/%{_mandir}/ru
-
-# Remove duplicate man pages
-for i in fr.UTF-8 it.UTF-8 pl.UTF-8 da.UTF-8 de.UTF-8 tr.UTF-8; do
-  rm -rf %{buildroot}/%{_mandir}/$i
-done
-
-# Install symlink for rvim man page
-echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man1/rvim.1
-
-mkdir -p %{buildroot}/%{_mandir}/man5
-echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man5/vimrc.5
-echo ".so man1/vi.1" > %{buildroot}/%{_mandir}/man5/virc.5
-touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
-
-# upstream now tries to install LICENSE and README into VIMDIR
-# but we ship them in licensedir and docdir, so we remove the dupes
-# from VIMDIR
-rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/LICENSE
-rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt
+mkdir -p %{buildroot}/%{_sysconfdir}/profile.d
+cp %{SOURCE1} %{buildroot}/%{_sysconfdir}/profile.d/vim.sh
+cp %{SOURCE2} %{buildroot}/%{_sysconfdir}/profile.d/vim.csh
+chmod 0644 %{buildroot}/%{_sysconfdir}/profile.d/vim.*
+install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/virc
+install -p -m644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/vimrc
 
 # if Vim isn't built for Fedora, use redhat augroup
 %if 0%{?rhel} >= 7
@@ -787,15 +535,47 @@ sed -i -e "s/augroup fedora/augroup redhat/" %{buildroot}/%{_sysconfdir}/vimrc
 sed -i -e "s/augroup fedora/augroup redhat/" %{buildroot}/%{_sysconfdir}/virc
 %endif
 
-%if %{with default_editor}
-mkdir -p %{buildroot}/%{_sysconfdir}/profile.d
-install -p -m644 %{SOURCE9} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.sh
-install -p -m644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.csh
-mkdir -p %{buildroot}/%{_datadir}/fish/vendor_conf.d/
-install -p -m644 %{SOURCE11} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish
-mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
-%endif
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
+install -p -m644 %{SOURCE15} %{buildroot}%{_rpmconfigdir}/macros.d/
 
+(cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) 
+rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
+rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/tools
+rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/doc/vim2html.pl
+rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/tutor/tutor.gr.utf-8~
+( cd %{buildroot}/%{_mandir}
+  for i in `find ??/ -type f`; do
+    if [[ "`file $i`" == *UTF-8\ Unicode\ text* ]]; then
+      continue
+    fi
+    bi=`basename $i`
+    iconv -f latin1 -t UTF8 $i > %{buildroot}/$bi
+    mv -f %{buildroot}/$bi $i
+  done
+)
+
+# Remove not UTF-8 manpages
+for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1 da.ISO8859-1 de.ISO8859-1; do
+  rm -rf %{buildroot}/%{_mandir}/$i
+done
+
+# use common man1/ru directory
+mv %{buildroot}/%{_mandir}/ru.UTF-8 %{buildroot}/%{_mandir}/ru
+
+# Remove duplicate man pages
+for i in fr.UTF-8 it.UTF-8 pl.UTF-8 da.UTF-8 de.UTF-8; do
+  rm -rf %{buildroot}/%{_mandir}/$i
+done
+
+for i in rvim.1 gvim.1 gex.1 gview.1 vimx.1; do 
+  echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man1/$i
+done
+echo ".so man1/vimdiff.1" > %{buildroot}/%{_mandir}/man1/gvimdiff.1
+echo ".so man1/vimtutor.1" > %{buildroot}/%{_mandir}/man1/gvimtutor.1
+mkdir -p %{buildroot}/%{_mandir}/man5
+echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man5/vimrc.5
+echo ".so man1/vi.1" > %{buildroot}/%{_mandir}/man5/virc.5
+touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 
 # Refresh documentation helptags
 %transfiletriggerin common -- %{_datadir}/%{name}/vimfiles/doc
@@ -808,18 +588,20 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %files common
 %config(noreplace) %{_sysconfdir}/vimrc
 %{!?_licensedir:%global license %%doc}
+%license LICENSE
 %doc README*
 %doc runtime/docs
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/vimfiles/template.spec
+%dir %{_datadir}/%{name}/%{vimdir}
+%{_datadir}/%{name}/%{vimdir}/rgb.txt
 %{_datadir}/%{name}/%{vimdir}/autoload
 %{_datadir}/%{name}/%{vimdir}/colors
 %{_datadir}/%{name}/%{vimdir}/compiler
 %{_datadir}/%{name}/%{vimdir}/pack
 %{_datadir}/%{name}/%{vimdir}/doc
 %{_datadir}/%{name}/%{vimdir}/*.vim
-%exclude %{_datadir}/%{name}/%{vimdir}/defaults.vim
 %{_datadir}/%{name}/%{vimdir}/ftplugin
-%{_datadir}/%{name}/%{vimdir}/import/dist/vimhelp.vim
-%{_datadir}/%{name}/%{vimdir}/import/dist/vimhighlight.vim
 %{_datadir}/%{name}/%{vimdir}/indent
 %{_datadir}/%{name}/%{vimdir}/keymap
 %{_datadir}/%{name}/%{vimdir}/lang/*.vim
@@ -830,7 +612,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %{_datadir}/%{name}/%{vimdir}/print
 %{_datadir}/%{name}/%{vimdir}/syntax
 %{_datadir}/%{name}/%{vimdir}/tutor
+%if ! %{withvimspell}
 %{_datadir}/%{name}/%{vimdir}/spell
+%endif
 %lang(af) %{_datadir}/%{name}/%{vimdir}/lang/af
 %lang(ca) %{_datadir}/%{name}/%{vimdir}/lang/ca
 %lang(cs) %{_datadir}/%{name}/%{vimdir}/lang/cs
@@ -843,8 +627,6 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %lang(fi) %{_datadir}/%{name}/%{vimdir}/lang/fi
 %lang(fr) %{_datadir}/%{name}/%{vimdir}/lang/fr
 %lang(ga) %{_datadir}/%{name}/%{vimdir}/lang/ga
-%lang(hu) %{_datadir}/%{name}/%{vimdir}/lang/hu
-%lang(hy) %{_datadir}/%{name}/%{vimdir}/lang/hy
 %lang(it) %{_datadir}/%{name}/%{vimdir}/lang/it
 %lang(ja) %{_datadir}/%{name}/%{vimdir}/lang/ja
 %lang(ja.euc-jp) %{_datadir}/%{name}/%{vimdir}/lang/ja.euc-jp
@@ -865,7 +647,6 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %lang(sk.cp1250) %{_datadir}/%{name}/%{vimdir}/lang/sk.cp1250
 %lang(sr) %{_datadir}/%{name}/%{vimdir}/lang/sr
 %lang(sv) %{_datadir}/%{name}/%{vimdir}/lang/sv
-%lang(tr) %{_datadir}/%{name}/%{vimdir}/lang/tr
 %lang(uk) %{_datadir}/%{name}/%{vimdir}/lang/uk
 %lang(uk.cp1251) %{_datadir}/%{name}/%{vimdir}/lang/uk.cp1251
 %lang(vi) %{_datadir}/%{name}/%{vimdir}/lang/vi
@@ -874,23 +655,17 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %lang(zh_TW) %{_datadir}/%{name}/%{vimdir}/lang/zh_TW
 %lang(zh_CN.UTF-8) %{_datadir}/%{name}/%{vimdir}/lang/zh_CN.UTF-8
 %lang(zh_TW.UTF-8) %{_datadir}/%{name}/%{vimdir}/lang/zh_TW.UTF-8
+/%{_bindir}/xxd
+%{_mandir}/man1/gex.*
+%{_mandir}/man1/gview.*
+%{_mandir}/man1/gvim*
 %{_mandir}/man1/rvim.*
 %{_mandir}/man1/vim.*
 %{_mandir}/man1/vimdiff.*
 %{_mandir}/man1/vimtutor.*
-%{_mandir}/man5/vimrc.*
-
-%if %{with gui}
-%{_mandir}/man1/eview.*
-%{_mandir}/man1/evim.*
-%{_mandir}/man1/gex.*
-%{_mandir}/man1/gview.*
-%{_mandir}/man1/gvim*
-%{_mandir}/man1/rgvim.*
-%{_mandir}/man1/rgview.*
 %{_mandir}/man1/vimx.*
-%endif
-
+%{_mandir}/man1/xxd.*
+%{_mandir}/man5/vimrc.*
 %lang(fr) %{_mandir}/fr/man1/*
 %lang(da) %{_mandir}/da/man1/*
 %lang(de) %{_mandir}/de/man1/*
@@ -898,16 +673,71 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %lang(ja) %{_mandir}/ja/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
 %lang(ru) %{_mandir}/ru/man1/*
-%lang(tr) %{_mandir}/tr/man1/*
+
+%if %{withvimspell}
+%files spell
+%dir %{_datadir}/%{name}/%{vimdir}/spell
+%{_datadir}/%{name}/vim70/spell/cleanadd.vim
+%lang(af) %{_datadir}/%{name}/%{vimdir}/spell/af.*
+%lang(am) %{_datadir}/%{name}/%{vimdir}/spell/am.*
+%lang(bg) %{_datadir}/%{name}/%{vimdir}/spell/bg.*
+%lang(ca) %{_datadir}/%{name}/%{vimdir}/spell/ca.*
+%lang(cs) %{_datadir}/%{name}/%{vimdir}/spell/cs.*
+%lang(cy) %{_datadir}/%{name}/%{vimdir}/spell/cy.*
+%lang(da) %{_datadir}/%{name}/%{vimdir}/spell/da.*
+%lang(de) %{_datadir}/%{name}/%{vimdir}/spell/de.*
+%lang(el) %{_datadir}/%{name}/%{vimdir}/spell/el.*
+%lang(en) %{_datadir}/%{name}/%{vimdir}/spell/en.*
+%lang(eo) %{_datadir}/%{name}/%{vimdir}/spell/eo.*
+%lang(es) %{_datadir}/%{name}/%{vimdir}/spell/es.*
+%lang(fo) %{_datadir}/%{name}/%{vimdir}/spell/fo.*
+%lang(fr) %{_datadir}/%{name}/%{vimdir}/spell/fr.*
+%lang(ga) %{_datadir}/%{name}/%{vimdir}/spell/ga.*
+%lang(gd) %{_datadir}/%{name}/%{vimdir}/spell/gd.*
+%lang(gl) %{_datadir}/%{name}/%{vimdir}/spell/gl.*
+%lang(he) %{_datadir}/%{name}/%{vimdir}/spell/he.*
+%lang(hr) %{_datadir}/%{name}/%{vimdir}/spell/hr.*
+%lang(hu) %{_datadir}/%{name}/%{vimdir}/spell/hu.*
+%lang(id) %{_datadir}/%{name}/%{vimdir}/spell/id.*
+%lang(it) %{_datadir}/%{name}/%{vimdir}/spell/it.*
+%lang(ku) %{_datadir}/%{name}/%{vimdir}/spell/ku.*
+%lang(la) %{_datadir}/%{name}/%{vimdir}/spell/la.*
+%lang(lt) %{_datadir}/%{name}/%{vimdir}/spell/lt.*
+%lang(lv) %{_datadir}/%{name}/%{vimdir}/spell/lv.*
+%lang(mg) %{_datadir}/%{name}/%{vimdir}/spell/mg.*
+%lang(mi) %{_datadir}/%{name}/%{vimdir}/spell/mi.*
+%lang(ms) %{_datadir}/%{name}/%{vimdir}/spell/ms.*
+%lang(nb) %{_datadir}/%{name}/%{vimdir}/spell/nb.*
+%lang(nl) %{_datadir}/%{name}/%{vimdir}/spell/nl.*
+%lang(nn) %{_datadir}/%{name}/%{vimdir}/spell/nn.*
+%lang(ny) %{_datadir}/%{name}/%{vimdir}/spell/ny.*
+%lang(pl) %{_datadir}/%{name}/%{vimdir}/spell/pl.*
+%lang(pt) %{_datadir}/%{name}/%{vimdir}/spell/pt.*
+%lang(ro) %{_datadir}/%{name}/%{vimdir}/spell/ro.*
+%lang(ru) %{_datadir}/%{name}/%{vimdir}/spell/ru.*
+%lang(rw) %{_datadir}/%{name}/%{vimdir}/spell/rw.*
+%lang(sk) %{_datadir}/%{name}/%{vimdir}/spell/sk.*
+%lang(sl) %{_datadir}/%{name}/%{vimdir}/spell/sl.*
+%lang(sr) %{_datadir}/%{name}/%{vimdir}/spell/sr.*
+%lang(sv) %{_datadir}/%{name}/%{vimdir}/spell/sv.*
+%lang(sw) %{_datadir}/%{name}/%{vimdir}/spell/sw.*
+%lang(tet) %{_datadir}/%{name}/%{vimdir}/spell/tet.*
+%lang(th) %{_datadir}/%{name}/%{vimdir}/spell/th.*
+%lang(tl) %{_datadir}/%{name}/%{vimdir}/spell/tl.*
+%lang(tn) %{_datadir}/%{name}/%{vimdir}/spell/tn.*
+%lang(uk) %{_datadir}/%{name}/%{vimdir}/spell/uk.*
+%lang(yi) %{_datadir}/%{name}/%{vimdir}/spell/yi.*
+%lang(yi-tr) %{_datadir}/%{name}/%{vimdir}/spell/yi-tr.*
+%lang(zu) %{_datadir}/%{name}/%{vimdir}/spell/zu.*
+%endif
 
 %files minimal
 %config(noreplace) %{_sysconfdir}/virc
 %{_bindir}/ex
-%{_bindir}/rvi
-%{_bindir}/rview
 %{_bindir}/vi
 %{_bindir}/view
-%{_libexecdir}/vi
+%{_bindir}/rvi
+%{_bindir}/rview
 %{_mandir}/man1/vi.*
 %{_mandir}/man1/ex.*
 %{_mandir}/man1/rvi.*
@@ -916,13 +746,15 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %{_mandir}/man5/virc.*
 
 %files enhanced
-%{_bindir}/rvim
 %{_bindir}/vim
+%{_bindir}/rvim
 %{_bindir}/vimdiff
 %{_bindir}/vimtutor
+%config(noreplace) %{_sysconfdir}/profile.d/vim.*
 
 %files filesystem
 %{_rpmconfigdir}/macros.d/macros.vim
+%dir %{_datadir}/%{name}/vimfiles
 %dir %{_datadir}/%{name}/vimfiles/after
 %dir %{_datadir}/%{name}/vimfiles/after/*
 %dir %{_datadir}/%{name}/vimfiles/autoload
@@ -932,8 +764,6 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %ghost %{_datadir}/%{name}/vimfiles/doc/tags
 %dir %{_datadir}/%{name}/vimfiles/ftdetect
 %dir %{_datadir}/%{name}/vimfiles/ftplugin
-%dir %{_datadir}/%{name}/%{vimdir}/import
-%dir %{_datadir}/%{name}/%{vimdir}/import/dist
 %dir %{_datadir}/%{name}/vimfiles/indent
 %dir %{_datadir}/%{name}/vimfiles/keymap
 %dir %{_datadir}/%{name}/vimfiles/lang
@@ -943,15 +773,14 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %dir %{_datadir}/%{name}/vimfiles/syntax
 %dir %{_datadir}/%{name}/vimfiles/tutor
 
-%if %{with gui}
 %files X11
-  %if "%{desktop_file}" == "1"
+%if "%{desktop_file}" == "1"
 %{_datadir}/metainfo/*.appdata.xml
 /%{_datadir}/applications/*
 %exclude /%{_datadir}/applications/vim.desktop
-  %else
+%else
 /%{_sysconfdir}/X11/applnk/*/gvim.desktop
-  %endif
+%endif
 %{_bindir}/gvimtutor
 %{_bindir}/gvim
 %{_bindir}/gvimdiff
@@ -960,1143 +789,11 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 %{_bindir}/vimtutor
 %{_bindir}/vimx
 %{_bindir}/evim
-%{_bindir}/eview
-%{_bindir}/rgvim
-%{_bindir}/rgview
-%dir %{_datadir}/icons/hicolor
-%dir %{_datadir}/icons/hicolor/*
-%dir %{_datadir}/icons/hicolor/*/apps
+%{_mandir}/man1/evim.*
 %{_datadir}/icons/hicolor/*/apps/*
-%dir %{_datadir}/icons/locolor
-%dir %{_datadir}/icons/locolor/*
-%dir %{_datadir}/icons/locolor/*/apps
 %{_datadir}/icons/locolor/*/apps/*
-%endif
-
-%files data
-%license LICENSE
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/%{vimdir}
-%{_datadir}/%{name}/%{vimdir}/defaults.vim
-%dir %{_datadir}/%{name}/vimfiles
-%{_datadir}/%{name}/vimfiles/template.spec
-
-%if %{with default_editor}
-%files default-editor
-%dir %{_datadir}/fish/vendor_conf.d
-%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish
-%config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
-%endif
-
-%files -n xxd
-%license LICENSE
-%{_bindir}/xxd
-%{_mandir}/man1/xxd.*
-
 
 %changelog
-* Fri Jan 09 2026 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.2068-1
-- patchlevel 2068
-
-* Fri Dec 19 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1999-1
-- patchlevel 1999
-
-* Fri Dec 12 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1972-1
-- patchlevel 1972
-
-* Fri Dec 05 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1952-1
-- patchlevel 1952
-
-* Fri Nov 14 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1914-1
-- patchlevel 1914
-
-* Fri Oct 31 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1888-1
-- patchlevel 1888
-
-* Fri Oct 17 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1863-1
-- patchlevel 1863
-
-* Fri Oct 10 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1845-1
-- patchlevel 1845
-
-* Fri Oct 03 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1818-1
-- patchlevel 1818
-
-* Mon Sep 29 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1775-2
-- remove XPM support - GVim icons work without it
-
-* Fri Sep 19 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1775-1
-- patchlevel 1775
-
-* Wed Sep 10 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1723-2
-- Restore lost --remote-tab... functionality on wayland (fedora#2393716)
-
-* Mon Sep 01 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1723-1
-- patchlevel 1723
-
-* Mon Sep 01 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1706-2
-- broken /usr/bin/ex symlink in vim-9.1.1706-1.fc42 (fedora#2392249)
-- vim-common has broken manpages (fedora#2392178)
-
-* Fri Aug 29 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1706-1
-- patchlevel 1706
-
-* Mon Aug 11 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1623-1
-- patchlevel 1623
-
-* Fri Aug 01 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1591-1
-- patchlevel 1591
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2:9.1.1552-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Wed Jul 16 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1552-1
-- patchlevel 1552
-
-* Mon Jul 14 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1537-2
-- 2379759 - remove wayland-libs from vim and vi (fedora#2379759)
-
-* Fri Jul 11 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1537-1
-- patchlevel 1537
-
-* Fri Jun 27 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1484-1
-- patchlevel 1484
-
-* Thu Jun 19 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1435-2
-- FTBFS with Python 3.14 (fedora#2373314)
-
-* Fri Jun 06 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1435-1
-- patchlevel 1435
-
-* Fri May 30 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1418-1
-- patchlevel 1418
-
-* Fri Apr 11 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1291-1
-- patchlevel 1291
-
-* Fri Apr 04 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1275-1
-- patchlevel 1275
-
-* Fri Mar 21 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1227-1
-- patchlevel 1227
-
-* Fri Mar 14 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1202-1
-- patchlevel 1202
-
-* Fri Mar 07 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1179-1
-- patchlevel 1179
-
-* Tue Mar 04 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1169-1
-- patchlevel 1169
-
-* Wed Feb 19 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1122-1
-- patchlevel 1122
-
-* Fri Feb 07 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1081-1
-- patchlevel 1081
-
-* Mon Feb 03 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1000-2
-- Fix FTBFS (fedora#2341508)
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2:9.1.1000-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Jan 10 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1000-1
-- patchlevel 1000
-
-* Fri Jan 03 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.984-1
-- patchlevel 984
-
-* Fri Dec 13 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.919-1
-- patchlevel 919
-
-* Fri Dec 06 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.906-1
-- patchlevel 906
-
-* Fri Nov 29 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.895-1
-- patchlevel 895
-
-* Fri Nov 15 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.866-1
-- patchlevel 866
-
-* Fri Nov 01 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.825-1
-- patchlevel 825
-
-* Tue Oct 15 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.785-1
-- patchlevel 785
-
-* Fri Sep 20 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.737-1
-- patchlevel 737 (fedora#2311860)
-
-* Fri Sep 06 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.719-1
-- patchlevel 719
-
-* Fri Aug 30 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.703-1
-- patchlevel 703
-
-* Mon Aug 12 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.672-1
-- patchlevel 672
-
-* Fri Aug 09 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.660-2
-- 2303669 - vim in rawhide (41) can't load python library
-
-* Mon Aug 05 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.660-1
-- patchlevel 660
-
-* Fri Jul 26 2024 Benjamin Gilbert <bgilbert@backtick.net> - 2:9.1.571-3
-- Require gdk-pixbuf2-modules-extra on F41+ -X11 for XPM loading (rhbz#2277751)
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:9.1.571-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jul 12 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.571-1
-- patchlevel 571
-
-* Fri Jul 12 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.544-2
-- fix upstream-scripttests in CI - new test needs our downstream 'set mouse=a' to pass
-
-* Mon Jul 08 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.544-1
-- patchlevel 544
-
-* Fri May 31 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.452-1
-- patchlevel 452
-
-* Mon May 06 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.393-1
-- patchlevel 393
-
-* Fri Apr 19 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.354-1
-- patchlevel 354
-
-* Fri Apr 12 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.309-1
-- patchlevel 309
-
-* Fri Apr 05 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.264-1
-- patchlevel 264
-
-* Tue Apr 02 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.252-1
-- patchlevel 252
-
-* Fri Mar 15 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.181-1
-- patchlevel 181
-
-* Fri Mar 08 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.158-1
-- patchlevel 158
-
-* Fri Feb 16 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.113-1
-- patchlevel 113
-
-* Fri Feb 09 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.083-1
-- patchlevel 083
-
-* Mon Feb 05 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.076-2
-- enable building without GPM support - build with GPM in Fedora
-- 2262371 - gvim: symbol lookup error: gvim: undefined symbol: g_once_init_enter_pointer
-
-* Mon Feb 05 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.076-1
-- patchlevel 076
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:9.1.031-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Jan 16 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.031-1
-- patchlevel 031
-
-* Mon Jan 08 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.016-1
-- patchlevel 016
-
-* Tue Jan 02 2024 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.2190-1
-- patchlevel 2190
-
-* Fri Dec 15 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.2167-1
-- patchlevel 2167
-
-* Fri Dec 08 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.2153-1
-- patchlevel 2153
-
-* Wed Nov 22 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.2120-1
-- patchlevel 2120
-
-* Thu Nov 16 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.2105-1
-- patchlevel 2105
-
-* Wed Nov 01 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.2081-1
-- patchlevel 2081
-
-* Wed Oct 18 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.2048-1
-- patchlevel 2048
-
-* Thu Oct 05 2023 Remi Collet <remi@remirepo.net> - 2:9.0.1984-2
-- rebuild for new libsodium
-
-* Thu Oct 05 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1984-1
-- patchlevel 1984
-
-* Mon Oct 02 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1968-1
-- patchlevel 1968
-
-* Fri Sep 22 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1927-1
-- patchlevel 1927
-
-* Thu Sep 07 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1882-1
-- patchlevel 1882
-
-* Wed Sep 06 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1872-2
-- test_xxd_color2 is flaky
-
-* Tue Sep 05 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1872-1
-- patchlevel 1872
-
-* Wed Aug 30 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1822-1
-- patchlevel 1822
-
-* Mon Aug 14 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1712-1
-- patchlevel 1712
-
-* Fri Aug 11 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1677-4
-- fix test suite from python3 syntax warnings
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:9.0.1677-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jul 13 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1677-2
-- 2222671 - fix FTBFS due Python3 rebase
-- 2222648 - fix FailToInstall due Perl rebase
-
-* Tue Jul 11 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1677-2
-- patchlevel 1677
-
-* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 2:9.0.1671-2
-- Perl 5.38 rebuild
-
-* Fri Jun 30 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1671-1
-- patchlevel 1671
-
-* Fri Jun 23 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1649-1
-- patchlevel 1649
-
-* Tue Jun 13 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1627-1
-- patchlevel 1627
-
-* Mon Jun 05 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1607-1
-- patchlevel 1607
-
-* Wed May 31 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1592-1
-- patchlevel 1592
-
-* Mon May 29 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1587-1
-- patchlevel 1587
-
-* Wed May 24 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1575-1
-- patchlevel 1575
-
-* Thu May 18 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1562-1
-- patchlevel 1562
-
-* Thu Apr 27 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1491-1
-- patchlevel 1491
-
-* Tue Apr 25 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1486-1
-- patchlevel 1486
-
-* Fri Apr 21 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1472-1
-- patchlevel 1472
-
-* Tue Apr 11 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1443-1
-- patchlevel 1443
-
-* Tue Apr 11 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1440-2
-- incorporate License tag changes based on legal team response
-
-* Wed Apr 05 2023 Andreas Schneider <asn@redhat.com> - 2:9.0.1440-2
-- create xxd package, because it is used by hex.nvim
-
-* Wed Apr 05 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1440-2
-- list most licenses available in binary rpms and migrate them into SPDX syntax
-
-* Wed Apr 05 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1440-1
-- patchlevel 1440
-
-* Mon Mar 27 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1429-1
-- patchlevel 1429
-
-* Wed Mar 22 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1423-1
-- patchlevel 1423
-
-* Thu Mar 16 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1407-1
-- patchlevel 1407
-
-* Tue Mar 14 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1403-1
-- patchlevel 1403
-
-* Thu Mar 02 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1367-1
-- patchlevel 1367
-
-* Fri Feb 17 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1314-1
-- patchlevel 1314
-
-* Tue Feb 14 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1307-1
-- patchlevel 1307
-
-* Tue Feb 14 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1293-2
-- 2169641 - Syntax highlight for sh files broken
-
-* Thu Feb 09 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1293-1
-- patchlevel 1293
-
-* Mon Jan 30 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1262-1
-- patchlevel 1262
-
-* Thu Jan 19 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1221-1
-- patchlevel 1221
-
-* Thu Jan 12 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1182-1
-- patchlevel 1182
-
-* Mon Jan 09 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1160-1
-- patchlevel 1160
-
-* Mon Jan 09 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1054-2
-- FTBFS with new FORTIFY_SOURCE=3 - remove it since Vim wants level 1
-
-* Wed Dec 14 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1054-1
-- patchlevel 1054
-
-* Mon Dec 05 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1006-1
-- patchlevel 1006
-
-* Mon Nov 28 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.963-1
-- patchlevel 963
-
-* Mon Nov 21 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.915-1
-- patchlevel 915
-
-* Thu Nov 03 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.828-1
-- patchlevel 828
-
-* Thu Oct 20 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.803-1
-- patchlevel 803
-
-* Mon Oct 17 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.777-1
-- patchlevel 777
-
-* Wed Oct 12 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.720-2
-- the current configure option for Vi is 'tiny'
-
-* Tue Oct 11 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.720-1
-- patchlevel 720
-
-* Wed Sep 28 2022 Carl George <carl@george.computer> - 2:9.0.475-2
-- Obsolete vim-toml since the runtime files are now part of vim-common
-
-* Fri Sep 16 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.475-1
-- patchlevel 475
-
-* Fri Sep 16 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.412-2
-- provide 'vim(plugins-supported)' for plugins to require Vim/GVim
-
-* Thu Sep 08 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.412-1
-- patchlevel 412
-
-* Thu Sep 01 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.348-1
-- patchlevel 348
-
-* Tue Aug 30 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.327-1
-- patchlevel 327
-
-* Tue Aug 23 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.246-1
-- patchlevel 246
-
-* Mon Aug 15 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.213-1
-- patchlevel 213
-
-* Thu Aug 11 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.189-1
-- patchlevel 189
-
-* Thu Aug 04 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.137-1
-- patchlevel 137
-
-* Tue Jul 26 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.077-1
-- patchlevel 077
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:9.0.049-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jul 11 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.049-1
-- patchlevel 049
-
-* Tue Jun 28 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.5172-1
-- patchlevel 5172
-
-* Tue Jun 21 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.5141-1
-- patchlevel 5141
-
-* Tue Jun 14 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.5085-1
-- patchlevel 5085
-
-* Fri Jun 03 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.5052-1
-- patchlevel 5052
-
-* Tue May 31 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.5046-1
-- patchlevel 5046
-
-* Wed May 18 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4975-1
-- patchlevel 4975
-
-* Tue May 17 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4969-1
-- patchlevel 4969
-
-* Mon May 09 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4927-1
-- patchlevel 4927
-
-* Mon May 09 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4877-2
-- add new file vimhelp.vim
-
-* Fri May 06 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4877-1
-- patchlevel 4877
-
-* Mon May 02 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4857-1
-- patchlevel 4857
-
-* Fri Apr 29 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4845-1
-- patchlevel 4845
-
-* Fri Apr 22 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4804-1
-- patchlevel 4804
-
-* Fri Apr 08 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4701-2
-- fix the upstream testsuite failure due downstream patch
-
-* Thu Apr 07 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4701-1
-- patchlevel 4701
-
-* Fri Mar 25 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4621-1
-- patchlevel 4621
-
-* Wed Mar 16 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4579-1
-- patchlevel 4579
-
-* Wed Mar 09 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4529-1
-- patchlevel 4529
-
-* Tue Mar 01 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4485-1
-- patchlevel 4485
-
-* Thu Feb 24 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4460-1
-- patchlevel 4460
-
-* Mon Feb 21 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4428-1
-- patchlevel 4428
-
-* Tue Feb 15 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4386-1
-- patchlevel 4386
-
-* Mon Feb 07 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4314-1
-- patchlevel 4314
-
-* Thu Jan 27 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4232-1
-- patchlevel 4232
-
-* Mon Jan 24 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4198-1
-- patchlevel 4198
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:8.2.4068-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jan 12 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4068-1
-- patchlevel 4068
-
-* Mon Jan 10 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4051-1
-- patchlevel 4051
-
-* Fri Jan 07 2022 Malcolm Inglis <miinglis@amazon.com> - 2:8.2.4006-2
-- add 'gui' build condition for vim-X11
-
-* Wed Jan 05 2022 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.4006-1
-- patchlevel 4006
-
-* Wed Dec 15 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3811-1
-- patchlevel 3811
-
-* Tue Dec 07 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3755-1
-- patchlevel 3755
-
-* Thu Dec 02 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3717-1
-- patchlevel 3717
-
-* Thu Nov 25 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3642-2
-- 2026651 - defaults.vim changes create conflicts between vim-minimal and vim-common
-
-* Mon Nov 22 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3642-1
-- patchlevel 3642
-
-* Mon Nov 08 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3582-1
-- patchlevel 3582
-
-* Mon Nov 01 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3568-1
-- patchlevel 3568
-
-* Fri Oct 15 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3512-1
-- patchlevel 3512
-
-* Thu Oct 14 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3404-2
-- adjust test suite to Python 3.10
-
-* Thu Oct 14 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3404-2
-- remove filetype plugin from virc - it doesn't work with vi
-
-* Mon Oct 11 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3404-2
-- set system vimrc via compiler macros
-
-* Thu Sep 23 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3404-2
-- remove downstream patch vim-8.0-copypaste.patch - put mouse settings into defaults.vim again
-
-* Mon Sep 06 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3404-1
-- patchlevel 3404
-
-* Wed Sep 01 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3391-1
-- patchlevel 3391
-
-* Mon Aug 23 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3367-1
-- patchlevel 3367
-
-* Mon Aug 16 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3354-1
-- patchlevel 3354
-
-* Mon Aug 09 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3318-1
-- patchlevel 3318
-
-* Thu Aug 05 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3290-1
-- patchlevel 3290
-
-* Mon Aug 02 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3273-1
-- patchlevel 3273
-
-* Mon Jul 26 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3223-1
-- patchlevel 3223
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:8.2.3182-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jul 19 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3182-1
-- patchlevel 3182
-
-* Mon Jul 12 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3154-1
-- patchlevel 3154
-
-* Mon Jun 28 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3070-1
-- patchlevel 3070
-
-* Fri Jun 25 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3046-1
-- patchlevel 3046
-
-* Thu Jun 24 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3043-1
-- patchlevel 3043
-- enable libsodium encryption in Fedora
-- require glibc-gconv-extra on F35 and later
-
-* Wed Jun 16 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3009-1
-- patchlevel 3009
-
-* Thu Jun 10 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2956-2
-- 1969936 - Failed to source defaults.vim
-
-* Mon Jun 07 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2956-1
-- patchlevel 2956
-
-* Fri Jun 04 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2932-1
-- patchlevel 2932
-
-* Mon May 24 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2879-1
-- patchlevel 2879
-
-* Fri May 21 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2875-1
-- patchlevel 2875
-
-* Mon May 10 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2846-1
-- patchlevel 2846
-
-* Wed May 05 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2825-2
-- make default-editor built only on Fedora
-
-* Mon May 03 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2825-1
-- patchlevel 2825
-
-* Mon Apr 26 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2811-1
-- patchlevel 2811
-
-* Tue Apr 20 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2787-1
-- patchlevel 2787
-
-* Mon Apr 12 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2756-1
-- patchlevel 2756
-
-* Thu Apr 08 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2735-1
-- patchlevel 2735
-
-* Mon Mar 22 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2637-1
-- patchlevel 2637
-
-* Mon Mar 15 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2607-1
-- patchlevel 2607
-
-* Mon Mar 08 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2576-1
-- patchlevel 2576
-
-* Mon Mar 01 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2559-1
-- patchlevel 2559
-
-* Mon Mar 01 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2541-2
-- 1928442 - vim-enhanced is replacing vim-wrappers-8.2.2465-1
-
-* Mon Feb 22 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2541-1
-- patchlevel 2541
-- 1931099 - Build version numbers don't match the actual build patchlevel
-
-* Thu Feb 18 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2529-1
-- patchlevel 2529
-
-* Tue Feb 09 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2488-1
-- patchlevel 2488
-
-* Tue Feb 09 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2465-2
-- remove vim-wrappers, vim is a binary again, vi and view stay as wrappers
-- removed vim -> vi functionality, because it cannot be optional and work
-  for all cases at the same time
-
-* Mon Feb 08 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2465-2
-- view is not readonly right now, fix it by -R
-
-* Thu Feb 04 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2465-1
-- patchlevel 2465
-- 1918575 - Use wrappers for vi/vim instead of aliases
-
-* Thu Feb 04 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2451-2
-- vim-update.sh: apply changes master->rawhide
-
-* Tue Feb 02 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2451-1
-- patchlevel 2451
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:8.2.2311-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jan 11 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2311-2
-- conflicting the version when the change happened doesnt make sense
-
-* Fri Jan 08 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2311-1
-- patchlevel 2311
-
-* Fri Dec 18 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2146-2
-- install vim-minimal profiles under different name to avoid future conflicts
-- remove old conflicts
-
-* Wed Dec 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2146-1
-- patchlevel 2146
-
-* Wed Dec 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2143-2
-- make profile files as ghosts to prevent further conflicts
-- remove ownership of /etc/profile.d - rpmlinter reports it as an error
-- remove interactive prompt from profile scripts
-
-* Mon Dec 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2143-1
-- patchlevel 2143
-
-* Mon Dec 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2115-2
-- 1907335 - installing vim no longer works, due to package conflicts with vim-minimal
-
-* Wed Dec 09 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2115-1
-- patchlevel 2115
-
-* Wed Dec 09 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2108-2
-- 1902772 - "vim" from vim-minimal defunct on zsh
-
-* Tue Dec 08 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2108-1
-- patchlevel 2108
-
-* Fri Dec 04 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2086-1
-- patchlevel 2086
-
-* Tue Dec 01 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2072-1
-- patchlevel 2072
-
-* Fri Nov 20 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2018-1
-- patchlevel 2018
-
-* Tue Nov 10 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1971-1
-- patchlevel 1971
-
-* Fri Nov 06 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1961-1
-- patchlevel 1961
-
-* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1941-2
-- make is no longer in buildroot by default
-- disable F31 updating
-
-* Mon Nov 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1941-1
-- patchlevel 1941
-
-* Mon Nov 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1885-2
-- move vim.fish to vendor_functions.d
-
-* Thu Oct 22 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1885-1
-- patchlevel 1885
-
-* Mon Oct 19 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1815-2
-- vim.sh, vim.csh, vim.fish - drop 'which', use 'command'
-
-* Thu Oct 15 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1815-2
-- vim-default-editor.fish - dont give EDITOR universal scope
-- vim.sh, vim.csh - set aliases only for OS default vi and vim
-- add fish profile for Vim
-
-* Mon Oct 12 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1815-2
-- fix installing fish profile, set virtual provide for default editor
-  (thanks Neal Gompa and Kamil Dudka)
-- set conflicts to nano-default-editor which doesnt provide system-default-editor
-
-* Fri Oct 09 2020 Paweł Marciniak <sunwire+repo@gmail.com> - 2:8.2.1815-2
-- A new subpackage, set vim as a default editor.
-
-* Fri Oct 09 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1815-1
-- patchlevel 1815
-
-* Tue Oct 06 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1805-1
-- patchlevel 1805
-
-* Tue Sep 29 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1770-1
-- patchlevel 1770
-
-* Tue Sep 15 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1687-1
-- patchlevel 1687
-
-* Thu Sep 10 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1651-1
-- patchlevel 1651
-
-* Tue Sep 08 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1634-1
-- patchlevel 1634
-
-* Mon Aug 31 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1551-1
-- patchlevel 1551
-
-* Mon Aug 31 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1522-3
-- F33 has update-testing now
-
-* Tue Aug 25 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1522-2
-- typo in vim-update.sh
-
-* Tue Aug 25 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1522-1
-- patchlevel 1522
-
-* Mon Aug 24 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1520-1
-- patchlevel 1520
-
-* Thu Aug 20 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1484-2
-- explicitly disable canberra for vi and vim
-
-* Wed Aug 19 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1484-1
-- patchlevel 1484
-
-* Tue Aug 18 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1412-2
-- F33 got branched, updates-testing isn't enabled for it yet
-- enable sounds for gvim
-
-* Mon Aug 10 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1412-1
-- patchlevel 1412
-
-* Fri Aug 07 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1382-1
-- patchlevel 1382
-
-* Wed Aug 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1359-2
-- own directories for icons
-
-* Mon Aug 03 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1359-1
-- patchlevel 1359
-
-* Fri Jul 31 2020 Zane Bitter <zbitter@redhat.com> - 2:8.2.1328-2
-- Alias view to "vim -R" when available
-
-* Fri Jul 31 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1328-1
-- patchlevel 1328
-
-* Wed Jul 29 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1307-2
-- 1703774 - ex, view and rview manpages were dangling symlinks
-
-* Tue Jul 28 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1307-1
-- patchlevel 1307
-
-* Fri Jul 24 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1273-2
-- vim-update.sh: bodhi no longer sets a default automatic time to stable
-
-* Thu Jul 23 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1273-1
-- patchlevel 1273
-
-* Thu Jul 23 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1224-4
-- python3 dynamic linking patch is already in upstream, remove it
-
-* Wed Jul 22 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1224-3
-- use %%make_build and %%make_install according FPG
-
-* Thu Jul 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1224-2
-- proper fix for python3 dynamic linking
-
-* Thu Jul 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1224-1
-- patchlevel 1224
-
-* Wed Jul 15 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1217-1
-- patchlevel 1217
-
-* Wed Jul 15 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1199-1
-- fix python3 dynamic linking with python >= 3.8
-- clean up unused stuff
-
-* Tue Jul 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1199-1
-- FTBFS with Lua - backported patch from upstream pull request to prevent linking with lua
-
-* Mon Jul 13 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1199-1
-- patchlevel 1199
-
-* Mon Jun 29 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1081-1
-- patchlevel 1081
-
-* Thu Jun 25 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1052-2
-- remove python2 stuff for RHEL
-- %%{fedora} macro is undefined in ELN, causes python3-config to use old options
-
-* Thu Jun 25 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1052-1
-- patchlevel 1052
-
-* Fri Jun 19 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1009-1
-- patchlevel 1009
-
-* Wed Jun 17 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.993-1
-- patchlevel 993
-
-* Tue Jun 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.987-1
-- patchlevel 987
-
-* Fri Jun 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.905-1
-- patchlevel 905
-
-* Tue Jun 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.869-2
-- remove tests from dist-git, we use base os ci
-
-* Mon Jun 01 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.869-1
-- patchlevel 869
-
-* Thu May 28 2020 Miro Hrončok <mhroncok@redhat.com> - 2:8.2.834-2
-- Rebuilt for Python 3.9
-
-* Thu May 28 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.834-1
-- patchlevel 834
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2:8.2.806-2
-- Rebuilt for Python 3.9
-
-* Fri May 22 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.806-1
-- patchlevel 806
-
-* Mon May 18 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.789-1
-- patchlevel 789
-
-* Thu May 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.752-2
-- F30 will be EOL in less than 14 days, remove it from automatic updates
-
-* Thu May 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.752-1
-- patchlevel 752
-
-* Mon May 11 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.735-1
-- patchlevel 735
-
-* Mon May 04 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.694-1
-- patchlevel 694
-
-* Fri Apr 24 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.628-1
-- patchlevel 628
-
-* Tue Apr 21 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.613-1
-- patchlevel 613
-
-* Fri Apr 17 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.587-1
-- patchlevel 587
-
-* Thu Apr 09 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.534-1
-- patchlevel 534
-
-* Tue Apr 07 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.525-1
-- patchlevel 525
-
-* Mon Apr 06 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.520-1
-- patchlevel 520
-
-* Mon Mar 30 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.480-1
-- patchlevel 480
-
-* Thu Mar 26 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.448-1
-- patchlevel 448
-
-* Wed Mar 25 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.444-1
-- patchlevel 444
-
-* Mon Mar 16 2020 Lubomir Rintel <lkundrak@v3.sk> - 2:8.2.390-2
-- source /etc/vimrc.local if it exists
-
-* Mon Mar 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.390-1
-- patchlevel 390
-
-* Tue Mar 10 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.357-2
-- put providing bundled libvterm into subpackage vim-enhanced
-
-* Fri Mar 06 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.357-1
-- patchlevel 357
-
-* Thu Mar 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.356-1
-- patchlevel 356
-
-* Tue Mar 03 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.348-1
-- patchlevel 348
-
-* Thu Feb 13 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.236-2
-- F32 got branched - do separate update for it
-
-* Mon Feb 10 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.236-1
-- patchlevel 236
-
-* Wed Jan 29 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.158-2
-- man page file format conversion is not needed anymore
-
-* Mon Jan 27 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.158-1
-- patchlevel 158
-
-* Fri Jan 10 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.109-1
-- patchlevel 109
-
-* Thu Jan 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.076-1
-- patchlevel 076
-
-* Wed Dec 18 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.019-1
-- patchlevel 019
-
-* Mon Dec 16 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.012-1
-- patchlevel 012
-
-* Thu Dec 12 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2424-1
-- patchlevel 2424
-
-* Thu Nov 28 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2352-1
-- patchlevel 2352
-
-* Thu Nov 28 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2267-2
-- leave out f29, will be soon EOL
-
-* Thu Nov 07 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2267-1
-- patchlevel 2267
-
-* Wed Nov 06 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2234-2
-- do not add python-libs into LDFLAGS until we build vim and gvim
-
-* Wed Oct 30 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2234-1
-- patchlevel 2234
-
-* Tue Oct 22 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2198-1
-- patchlevel 2198
-
-* Mon Oct 21 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2197-1
-- patchlevel 2197
-
-* Thu Oct 17 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2168-1
-- patchlevel 2168
-
-* Mon Oct 07 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2120-1
-- patchlevel 2120
-
-* Mon Sep 30 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2102-1
-- patchlevel 2102
-
-* Thu Sep 19 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2056-1
-- patchlevel 2056
-
-* Mon Sep 16 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2019-2
-- enable fips warning
-
-* Tue Sep 10 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.2019-1
-- patchlevel 2019
-
-* Fri Sep 06 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1991-2
-- add f32 as rawhide and f31 as standalone branch
-
-* Fri Sep 06 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1991-1
-- patchlevel 1991
-
-* Tue Sep 03 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1912-3
-- 1744956 - vim does not build with python3.8
-
-* Mon Aug 26 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1912-2
-- remove python2 interpreter - python2 will be retired soon.
-- use 'file' with '--mime' option - output is more stable
-
-* Fri Aug 23 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1912-1
-- patchlevel 1912
-
-* Fri Aug 23 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1890-2
-- revert vimx removal
-
-* Tue Aug 20 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1890-1
-- patchlevel 1890
-
-* Tue Aug 20 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1790-2
-- 1740892 - vimx is symlink to gvim instead of vim
-
-* Fri Aug 02 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1790-1
-- patchlevel 1790
-
-* Fri Jul 26 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1749-1
-- patchlevel 1749
-
-* Tue Jul 23 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1713-6
-- Provides must be unversioned according FPG
-
-* Mon Jul 22 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1713-5
-- remove perl-libs, because they are supplied perl MODULE_COMPAT
-
-* Fri Jul 19 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1713-4
-- remove unused patch
-
-* Fri Jul 19 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1713-3
-- 1724126 - disable showing spec template for new file with .spec suffix
-- minor changes in spec.template - tabs->spaces
-
-* Fri Jul 19 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1713-2
-- remove skip_defaults_vim - it does not make sense to have it in system vimrc
-
-* Thu Jul 18 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1713-1
-- patchlevel 1713
-
-* Thu Jul 18 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1661-2
-- 1643311 - add several defaults from Vim upstream and remove forcing fileencodings
-
-* Thu Jul 11 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1661-1
-- patchlevel 1661
-
-* Fri Jun 28 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1602-1
-- patchlevel 1602
-
-* Mon Jun 17 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1561-1
-- patchlevel 1561
-
-* Tue Jun 11 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1517-1
-- patchlevel 1517
-
-* Tue Jun 11 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1471-2
-- remove desktop patch, already in upstream
-
-* Thu Jun 06 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1471-1
-- patchlevel 1471
-
-* Tue May 28 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1413-1
-- patchlevel 1413
-
-* Mon May 20 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1359-2
-- stop updating f28
-
 * Mon May 20 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.1359-1
 - patchlevel 1359
 
diff --git a/vimrc b/vimrc
index 4ef9d92d..cf660612 100644
--- a/vimrc
+++ b/vimrc
@@ -1,51 +1,15 @@
-" When started as "evim", evim.vim will already have done these settings.
-if v:progname =~? "evim"
-  finish
+if v:lang =~ "utf8$" || v:lang =~ "UTF-8$"
+   set fileencodings=ucs-bom,utf-8,latin1
 endif
 
-" Use Vim settings, rather than Vi settings (much better!).
-" This must be first, because it changes other options as a side effect.
-" Avoid side effects when it was already reset.
-if &compatible
-  set nocompatible
-endif
-
-" When the +eval feature is missing, the set command above will be skipped.
-" Use a trick to reset compatible only when the +eval feature is missing.
-silent! while 0
-  set nocompatible
-silent! endwhile
-
-" Allow backspacing over everything in insert mode.
-set backspace=indent,eol,start
-
+set nocompatible	" Use Vim defaults (much better!)
+set bs=indent,eol,start		" allow backspacing over everything in insert mode
 "set ai			" always set autoindenting on
 "set backup		" keep a backup file
 set viminfo='20,\"50	" read/write a .viminfo file, don't store more
 			" than 50 lines of registers
 set history=50		" keep 50 lines of command line history
 set ruler		" show the cursor position all the time
-set showcmd		" display incomplete commands
-set wildmenu		" display completion matches in a status line
-
-set ttimeout		" time out for key codes
-set ttimeoutlen=100	" wait up to 100ms after Esc for special key
-
-" Show @@@ in the last line if it is truncated.
-set display=truncate
-
-" Show a few lines of context around the cursor.  Note that this makes the
-" text scroll if you mouse-click near the start or end of the window.
-set scrolloff=5
-
-" Do incremental searching when it's possible to timeout.
-if has('reltime')
-  set incsearch
-endif
-
-" Do not recognize octal numbers for Ctrl-A and Ctrl-X, most users find it
-" confusing.
-set nrformats-=octal
 
 " Only do this part when compiled with support for autocommands
 if has("autocmd")
@@ -54,21 +18,14 @@ if has("autocmd")
   " In text files, always limit the width of text to 78 characters
   " autocmd BufRead *.txt set tw=78
   " When editing a file, always jump to the last cursor position
-  " (taken from Vim's defaults.vim)
   autocmd BufReadPost *
-  \ let line = line("'\"")
-  \ | if line >= 1 && line <= line("$") && &filetype !~# 'commit'
-  \      && index(['xxd', 'gitrebase', 'tutor'], &filetype) == -1
-  \      && !&diff
-  \ |   execute "normal! g`\""
-  \ | endif
+  \ if line("'\"") > 0 && line ("'\"") <= line("$") |
+  \   exe "normal! g'\"" |
+  \ endif
   " don't write swapfile on most commonly used directories for NFS mounts or USB sticks
   autocmd BufNewFile,BufReadPre /media/*,/run/media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
   " start with spec file template
-  " 1724126 - do not open new file with .spec suffix with spec file template
-  " apparently there are other file types with .spec suffix, so disable the
-  " template
-  " autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
+  autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
   augroup END
 endif
 
@@ -90,12 +47,7 @@ endif
 " Switch syntax highlighting on, when the terminal has colors
 " Also switch on highlighting the last used search pattern.
 if &t_Co > 2 || has("gui_running")
-  " Revert with ":syntax off".
   syntax on
-
-  " I like highlighting strings inside C comments.
-  " Revert with ":unlet c_comment_strings".
-  let c_comment_strings=1
   set hlsearch
 endif
 
@@ -107,26 +59,6 @@ if &term=="xterm"
      set t_Sf=[3%dm
 endif
 
-" Convenient command to see the difference between the current buffer and the
-" file it was loaded from, thus the changes you made.
-" Only define it when not defined already.
-" Revert with: ":delcommand DiffOrig".
-if !exists(":DiffOrig")
-  command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis
-		  \ | wincmd p | diffthis
-endif
-
-if has('langmap') && exists('+langremap')
-  " Prevent that the langmap option applies to characters that result from a
-  " mapping.  If set (default), this may break plugins (but it's backward
-  " compatible).
-  set nolangremap
-endif
-
 " Don't wake up system with blinking cursor:
+" http://www.linuxpowertop.org/known.php
 let &guicursor = &guicursor . ",a:blinkon0"
-
-" Source a global configuration file if available
-if filereadable("/etc/vimrc.local")
-  source /etc/vimrc.local
-endif
diff --git a/virc b/virc
index 6d779826..808e7d61 100644
--- a/virc
+++ b/virc
@@ -27,6 +27,9 @@ if has("autocmd")
   augroup END
 endif
 
+
+filetype plugin on
+
 if &term=="xterm"
      set t_Co=8
      set t_Sb=[4%dm
diff --git a/zip.vim b/zip.vim
new file mode 100644
index 00000000..af56944c
--- /dev/null
+++ b/zip.vim
@@ -0,0 +1,387 @@
+" zip.vim: Handles browsing zipfiles
+"            AUTOLOAD PORTION
+" Date:		Jul 30, 2008
+" Version:	22
+" Maintainer:	Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
+" License:	Vim License  (see vim's :help license)
+" Copyright:    Copyright (C) 2005-2008 Charles E. Campbell, Jr. {{{1
+"               Permission is hereby granted to use and distribute this code,
+"               with or without modifications, provided that this copyright
+"               notice is copied with it. Like anything else that's free,
+"               zip.vim and zipPlugin.vim are provided *as is* and comes with
+"               no warranty of any kind, either expressed or implied. By using
+"               this plugin, you agree that in no event will the copyright
+"               holder be liable for any damages resulting from the use
+"               of this software.
+
+" ---------------------------------------------------------------------
+" Load Once: {{{1
+let s:keepcpo= &cpo
+set cpo&vim
+if &cp || exists("g:loaded_zip") || v:version < 700
+ finish
+endif
+
+let g:loaded_zip     = "v22"
+let s:zipfile_escape = ' ?&;\'
+let s:ERROR          = 2
+let s:WARNING        = 1
+let s:NOTE           = 0
+
+" ---------------------------------------------------------------------
+"  Global Values: {{{1
+if !exists("g:zip_shq")
+ if &shq != ""
+  let g:zip_shq= &shq
+ elseif has("unix")
+  let g:zip_shq= "'"
+ else
+  let g:zip_shq= '"'
+ endif
+endif
+if !exists("g:zip_zipcmd")
+ let g:zip_zipcmd= "zip"
+endif
+if !exists("g:zip_unzipcmd")
+ let g:zip_unzipcmd= "unzip"
+endif
+
+" ----------------
+"  Functions: {{{1
+" ----------------
+
+" ---------------------------------------------------------------------
+" zip#Browse: {{{2
+fun! zip#Browse(zipfile)
+"  call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
+  let repkeep= &report
+  set report=10
+
+  " sanity checks
+  if !exists("*fnameescape")
+   if &verbose > 1
+    echoerr "the zip plugin is not available (your vim doens't support fnameescape())"
+   endif
+   return
+  endif
+  if !executable(g:zip_unzipcmd)
+   redraw!
+   echohl Error | echo "***error*** (zip#Browse) unzip not available on your system"
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   let &report= repkeep
+"   call Dret("zip#Browse")
+   return
+  endif
+  if !filereadable(a:zipfile)
+   if a:zipfile !~# '^\a\+://'
+    " if its an url, don't complain, let url-handlers such as vim do its thing
+    redraw!
+    echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None
+"    call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   endif
+   let &report= repkeep
+"   call Dret("zip#Browse : file<".a:zipfile."> not readable")
+   return
+  endif
+"  call Decho("passed sanity checks")
+  if &ma != 1
+   set ma
+  endif
+  let b:zipfile= a:zipfile
+
+  setlocal noswapfile
+  setlocal buftype=nofile
+  setlocal bufhidden=hide
+  setlocal nobuflisted
+  setlocal nowrap
+  set ft=tar
+
+  " give header
+  let lastline= line("$")
+  call setline(lastline+1,'" zip.vim version '.g:loaded_zip)
+  call setline(lastline+2,'" Browsing zipfile '.a:zipfile)
+  call setline(lastline+3,'" Select a file with cursor and press ENTER')
+  $put =''
+  0d
+  $
+
+"  call Decho("exe silent r! ".g:zip_unzipcmd." -l -- ".s:Escape(a:zipfile,1))
+  exe "silent r! ".g:zip_unzipcmd." -l -- ".s:Escape(a:zipfile,1)
+  if v:shell_error != 0
+   redraw!
+   echohl WarningMsg | echo "***warning*** (zip#Browse) ".fnameescape(a:zipfile)." is not a zip file" | echohl None
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   silent %d
+   let eikeep= &ei
+   set ei=BufReadCmd,FileReadCmd
+   exe "r ".fnameescape(a:zipfile)
+   let &ei= eikeep
+   1d
+"   call Dret("zip#Browse")
+   return
+  endif
+"  call Decho("line 6: ".getline(6))
+  let namecol= stridx(getline(6),'Name') + 1
+"  call Decho("namecol=".namecol)
+  4,$g/^\s*----/d
+  4,$g/^\s*\a/d
+  $d
+  if namecol > 0
+   exe 'silent 4,$s/^.*\%'.namecol.'c//'
+  endif
+
+  setlocal noma nomod ro
+  noremap <silent> <buffer> <cr> :call <SID>ZipBrowseSelect()<cr>
+
+  let &report= repkeep
+"  call Dret("zip#Browse")
+endfun
+
+" ---------------------------------------------------------------------
+" ZipBrowseSelect: {{{2
+fun! s:ZipBrowseSelect()
+"  call Dfunc("ZipBrowseSelect() zipfile<".b:zipfile."> curfile<".expand("%").">")
+  let repkeep= &report
+  set report=10
+  let fname= getline(".")
+
+  " sanity check
+  if fname =~ '^"'
+   let &report= repkeep
+"   call Dret("ZipBrowseSelect")
+   return
+  endif
+  if fname =~ '/$'
+   redraw!
+   echohl Error | echo "***error*** (zip#Browse) Please specify a file, not a directory" | echohl None
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   let &report= repkeep
+"   call Dret("ZipBrowseSelect")
+   return
+  endif
+
+"  call Decho("fname<".fname.">")
+
+  " get zipfile to the new-window
+  let zipfile = b:zipfile
+  let curfile= expand("%")
+"  call Decho("zipfile<".zipfile.">")
+"  call Decho("curfile<".curfile.">")
+
+  new
+  if !exists("g:zip_nomax") || g:zip_nomax == 0
+   wincmd _
+  endif
+  let s:zipfile_{winnr()}= curfile
+"  call Decho("exe e ".fnameescape("zipfile:".zipfile.'::'.fname))
+  exe "e ".fnameescape("zipfile:".zipfile.'::'.fname)
+  filetype detect
+
+  let &report= repkeep
+"  call Dret("ZipBrowseSelect : s:zipfile_".winnr()."<".s:zipfile_{winnr()}.">")
+endfun
+
+" ---------------------------------------------------------------------
+" zip#Read: {{{2
+fun! zip#Read(fname,mode)
+"  call Dfunc("zip#Read(fname<".a:fname.">,mode=".a:mode.")")
+  let repkeep= &report
+  set report=10
+
+  if has("unix")
+   let zipfile = substitute(a:fname,'zipfile:\(.\{-}\)::[^\\].*$','\1','')
+   let fname   = substitute(a:fname,'zipfile:.\{-}::\([^\\].*\)$','\1','')
+  else
+   let zipfile = substitute(a:fname,'^.\{-}zipfile:\(.\{-}\)::[^\\].*$','\1','')
+   let fname   = substitute(a:fname,'^.\{-}zipfile:.\{-}::\([^\\].*\)$','\1','')
+   let fname = substitute(fname, '[', '[[]', 'g')
+  endif
+"  call Decho("zipfile<".zipfile.">")
+"  call Decho("fname  <".fname.">")
+
+"  call Decho("exe r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1))
+  exe "silent r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1)
+
+  " cleanup
+  0d
+  set nomod
+
+  let &report= repkeep
+"  call Dret("zip#Read")
+endfun
+
+" ---------------------------------------------------------------------
+" zip#Write: {{{2
+fun! zip#Write(fname)
+"  call Dfunc("zip#Write(fname<".a:fname.">) zipfile_".winnr()."<".s:zipfile_{winnr()}.">")
+  let repkeep= &report
+  set report=10
+
+  " sanity checks
+  if !executable(g:zip_zipcmd)
+   redraw!
+   echohl Error | echo "***error*** (zip#Write) sorry, your system doesn't appear to have the zip pgm" | echohl None
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   let &report= repkeep
+"   call Dret("zip#Write")
+   return
+  endif
+  if !exists("*mkdir")
+   redraw!
+   echohl Error | echo "***error*** (zip#Write) sorry, mkdir() doesn't work on your system" | echohl None
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   let &report= repkeep
+"   call Dret("zip#Write")
+   return
+  endif
+
+  let curdir= getcwd()
+  let tmpdir= tempname()
+"  call Decho("orig tempname<".tmpdir.">")
+  if tmpdir =~ '\.'
+   let tmpdir= substitute(tmpdir,'\.[^.]*$','','e')
+  endif
+"  call Decho("tmpdir<".tmpdir.">")
+  call mkdir(tmpdir,"p")
+
+  " attempt to change to the indicated directory
+  if s:ChgDir(tmpdir,s:ERROR,"(zip#Write) cannot cd to temporary directory")
+   let &report= repkeep
+"   call Dret("zip#Write")
+   return
+  endif
+"  call Decho("current directory now: ".getcwd())
+
+  " place temporary files under .../_ZIPVIM_/
+  if isdirectory("_ZIPVIM_")
+   call s:Rmdir("_ZIPVIM_")
+  endif
+  call mkdir("_ZIPVIM_")
+  cd _ZIPVIM_
+"  call Decho("current directory now: ".getcwd())
+
+  if has("unix")
+   let zipfile = substitute(a:fname,'zipfile:\(.\{-}\)::[^\\].*$','\1','')
+   let fname   = substitute(a:fname,'zipfile:.\{-}::\([^\\].*\)$','\1','')
+  else
+   let zipfile = substitute(a:fname,'^.\{-}zipfile:\(.\{-}\)::[^\\].*$','\1','')
+   let fname   = substitute(a:fname,'^.\{-}zipfile:.\{-}::\([^\\].*\)$','\1','')
+  endif
+"  call Decho("zipfile<".zipfile.">")
+"  call Decho("fname  <".fname.">")
+
+  if fname =~ '/'
+   let dirpath = substitute(fname,'/[^/]\+$','','e')
+   if executable("cygpath")
+    let dirpath = substitute(system("cygpath ".s:Escape(dirpath,0)),'\n','','e')
+   endif
+"   call Decho("mkdir(dirpath<".dirpath.">,p)")
+   call mkdir(dirpath,"p")
+  endif
+  if zipfile !~ '/'
+   let zipfile= curdir.'/'.zipfile
+  endif
+"  call Decho("zipfile<".zipfile."> fname<".fname.">")
+
+  exe "w! ".fnameescape(fname)
+  if executable("cygpath")
+   let zipfile = substitute(system("cygpath ".s:Escape(zipfile,0)),'\n','','e')
+  endif
+
+  if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$'
+    let fname = substitute(fname, '[', '[[]', 'g')
+  endif
+
+"  call Decho(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0))
+  call system(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0))
+  if v:shell_error != 0
+   redraw!
+   echohl Error | echo "***error*** (zip#Write) sorry, unable to update ".zipfile." with ".fname | echohl None
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+
+  elseif s:zipfile_{winnr()} =~ '^\a\+://'
+   " support writing zipfiles across a network
+   let netzipfile= s:zipfile_{winnr()}
+"   call Decho("handle writing <".zipfile."> across network as <".netzipfile.">")
+   1split|enew
+   let binkeep= &binary
+   let eikeep = &ei
+   set binary ei=all
+   exe "e! ".fnameescape(zipfile)
+   call netrw#NetWrite(netzipfile)
+   let &ei     = eikeep
+   let &binary = binkeep
+   q!
+   unlet s:zipfile_{winnr()}
+  endif
+  
+  " cleanup and restore current directory
+  cd ..
+  call s:Rmdir("_ZIPVIM_")
+  call s:ChgDir(curdir,s:WARNING,"(zip#Write) unable to return to ".curdir."!")
+  call s:Rmdir(tmpdir)
+  setlocal nomod
+
+  let &report= repkeep
+"  call Dret("zip#Write")
+endfun
+
+" ---------------------------------------------------------------------
+" s:Escape: {{{2
+fun! s:Escape(fname,isfilt)
+"  call Dfunc("QuoteFileDir(fname<".a:fname."> isfilt=".a:isfilt.")")
+  if exists("*shellescape")
+   if a:isfilt
+    let qnameq= shellescape(a:fname,1)
+   else
+    let qnameq= shellescape(a:fname)
+   endif
+  else
+   let qnameq= g:zip_shq.escape(a:fname,g:zip_shq).g:zip_shq
+  endif
+"  call Dret("QuoteFileDir <".qnameq.">")
+  return qnameq
+endfun
+
+" ---------------------------------------------------------------------
+" ChgDir: {{{2
+fun! s:ChgDir(newdir,errlvl,errmsg)
+"  call Dfunc("ChgDir(newdir<".a:newdir."> errlvl=".a:errlvl."  errmsg<".a:errmsg.">)")
+
+  try
+   exe "cd ".fnameescape(a:newdir)
+  catch /^Vim\%((\a\+)\)\=:E344/
+   redraw!
+   if a:errlvl == s:NOTE
+    echo "***note*** ".a:errmsg
+   elseif a:errlvl == s:WARNING
+    echohl WarningMsg | echo "***warning*** ".a:errmsg | echohl NONE
+   elseif a:errlvl == s:ERROR
+    echohl Error | echo "***error*** ".a:errmsg | echohl NONE
+   endif
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+"   call Dret("ChgDir 1")
+   return 1
+  endtry
+
+"  call Dret("ChgDir 0")
+  return 0
+endfun
+
+" ---------------------------------------------------------------------
+" s:Rmdir: {{{2
+fun! s:Rmdir(fname)
+"  call Dfunc("Rmdir(fname<".a:fname.">)")
+  if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$'
+   call system("rmdir /S/Q ".s:Escape(a:fname,0))
+  else
+   call system("/bin/rm -rf ".s:Escape(a:fname,0))
+  endif
+"  call Dret("Rmdir")
+endfun
+
+" ------------------------------------------------------------------------
+" Modelines And Restoration: {{{1
+let &cpo= s:keepcpo
+unlet s:keepcpo
+" vim:ts=8 fdm=marker