From a6b4cc345e9fc5c2a06fc40468f97aeeee638634 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Sun, 23 Nov 2025 13:00:29 +0800
Subject: [PATCH] 9.1.1924

---
 v9.1.1900.tar.gz => v9.1.1924.tar.gz |  4 ++--
 vim-9.1-specsyntax.patch             | 19 +++----------------
 vim.spec                             | 26 +++++++++++++++++++++++---
 3 files changed, 28 insertions(+), 21 deletions(-)
 rename v9.1.1900.tar.gz => v9.1.1924.tar.gz (32%)

diff --git a/v9.1.1900.tar.gz b/v9.1.1924.tar.gz
similarity index 32%
rename from v9.1.1900.tar.gz
rename to v9.1.1924.tar.gz
index de630ef..610a63f 100644
--- a/v9.1.1900.tar.gz
+++ b/v9.1.1924.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98685e31e3dd8acb150febeb8721f344643c1973c0e82d1f2df1a5d2cdc855b4
-size 19168142
+oid sha256:1137a417309eab3060b82155cc350e0800a609c455e4789fd77eae58d5b13003
+size 19183723
diff --git a/vim-9.1-specsyntax.patch b/vim-9.1-specsyntax.patch
index 67de12e..ce356fe 100644
--- a/vim-9.1-specsyntax.patch
+++ b/vim-9.1-specsyntax.patch
@@ -1,7 +1,6 @@
-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
-@@ -35,7 +35,7 @@
+--- a/runtime/syntax/spec.vim	2025-11-23 10:57:40.095470200 +0800
++++ b/runtime/syntax/spec.vim	2025-11-23 10:58:40.767094700 +0800
+@@ -38,7 +38,7 @@
  syn match specManpageFile '[a-zA-Z]\.1'
  
  "Day, Month and most used license acronyms
@@ -10,15 +9,3 @@ diff -up vim74/runtime/syntax/spec.vim.highlite vim74/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
-@@ -58,9 +58,9 @@
- 
- "specCommands
- 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
diff --git a/vim.spec b/vim.spec
index 4164ec0..b1b33b5 100644
--- a/vim.spec
+++ b/vim.spec
@@ -4,7 +4,7 @@
 %{!?_with_netbeans__:%define _with_netbeans__ 1}
 
 %define baseversion 9.1
-%define patchlevel 1900
+%define patchlevel 1924
 %define vimdir vim91
 
 Name:           vim
@@ -51,7 +51,8 @@ systems.
 %package common
 Summary:        This contains some common files to use vim editor.
 Requires:       %{name}-filesystem
-Conflicts:      man-pages-fr < 0.9.7-14 man-pages-it < 0.3.0-17 man-pages-pl < 0.24-2 %{name}-minimal < 8.0.1428-4
+Conflicts:      man-pages-fr < 0.9.7-14 man-pages-it < 0.3.0-17 man-pages-pl < 0.24-2
+Requires: %{name}-data = %{epoch}:%{version}-%{release}
 
 %description common
 This common package contains files that will be needed when you run vim editor. This is also needed by vim-enhaned and vim-X11 packages.
@@ -59,11 +60,21 @@ This common package contains files that will be needed when you run vim editor.
 %package minimal
 Summary:        This package provides the basic and minimal functionalities of vim editor.
 Provides:       vi = %{version}-%{release} %{_bindir}/vi
-Conflicts:      %{name}-common < 8.0.1428-4
+Requires: %{name}-data = %{epoch}:%{version}-%{release}
 
 %description minimal
 The minimal package provides a minimal version of vim editor. It will be installed as /usr/bin/vi.
 
+%package data
+Summary:        Shared data for Vi and Vim
+Buildarch:      noarch
+Conflicts:      %{name}-common < %{epoch}:%{version}
+Conflicts:      %{name}-minimal < %{epoch}:%{version}
+
+%description data
+The subpackage is used for shipping files and directories, which need to be
+shared between vim-minimal and vim-common packages.
+
 %package enhanced
 Summary:        This is a package containing enhanced vim editor.
 Requires:       vim-common = %{epoch}:%{version}-%{release} which
@@ -344,6 +355,7 @@ LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests."
 %{_datadir}/%{name}/%{vimdir}/{*.vim,ftplugin,indent,keymap,macros,plugin}
 %{_datadir}/%{name}/%{vimdir}/{print,syntax,tutor,spell}
 %{_datadir}/%{name}/%{vimdir}/lang/{*.vim,*.txt}
+%exclude %{_datadir}/%{name}/%{vimdir}/defaults.vim
 %{_datadir}/%{name}/%{vimdir}/import/dist/{vimhelp.vim,vimhighlight.vim}
 %{_bindir}/xxd
 %lang(af) %{_datadir}/%{name}/%{vimdir}/lang/af
@@ -406,6 +418,11 @@ LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests."
 %{_bindir}/{ex,vi,view,rvi,rview}
 %{_mandir}/man1/{vi.*,ex.*,rvi.*,rview.*,view.*}
 %{_mandir}/man5/virc.*
+
+%files data
+%license LICENSE
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/%{vimdir}
 %{_datadir}/%{name}/%{vimdir}/defaults.vim
 
 %files enhanced
@@ -429,6 +446,9 @@ LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests."
 %{_mandir}/man1/evim.*
 
 %changelog
+* Sun Nov 23 2025 Funda Wang <fundawang@yeah.net> - 2:9.1.1924-1
+- update to 9.1 patchlevel 1924
+
 * Thu Nov 13 2025 dillon chen <dillon.chen@gmail.com> - 2:9.1.1900-1
 - update to 9.1 patchlevel 1900
 
-- 
Gitee