Compare commits

...
Sign in to create a new pull request.

18 commits

Author SHA1 Message Date
Zdenek Dohnal
1c41e7bc76 patchlevel 2068 2026-01-09 14:22:39 +01:00
Zdenek Dohnal
adc245613d patchlevel 1999 2025-12-19 08:04:51 +01:00
Zdenek Dohnal
2d920d79a5 patchlevel 1972 2025-12-12 08:37:13 +01:00
Zdenek Dohnal
3ec84a36c6 patchlevel 1952 2025-12-05 08:50:19 +01:00
Zdenek Dohnal
8550947499 patchlevel 1914 2025-11-14 12:15:00 +01:00
Zdenek Dohnal
19644cce76 patchlevel 1888 2025-10-31 09:16:09 +01:00
Zdenek Dohnal
daa31588d4 patchlevel 1863 2025-10-17 10:34:30 +02:00
Zdenek Dohnal
73edc28fd0 patchlevel 1818 2025-10-03 11:42:05 +02:00
Zdenek Dohnal
a1f8e6615a patchlevel 1775 2025-09-19 10:07:47 +02:00
Zdenek Dohnal
114a46778b Restore lost --remote-tab... functionality on wayland (fedora#2393716) 2025-09-10 15:44:51 +02:00
Zdenek Dohnal
2417ef3c89 patchlevel 1723 2025-09-01 18:51:15 +02:00
Zdenek Dohnal
d014ed1adb - patchlevel 1706 2025-08-29 10:13:22 +02:00
Zdenek Dohnal
b22f469cf1 Enable F43 2025-08-29 10:13:22 +02:00
Carl George
908674c9f0 Switch to https URL 2025-08-29 10:13:22 +02:00
Zdenek Dohnal
ffd268aae6 Remove vimspell conditions and subpackage
The source used for spell package was removed in Vim 7.1, and the
package was not built at least for 9 years, so IMO no need to obsolete
the package.
2025-08-29 10:13:22 +02:00
Zdenek Dohnal
82d973027f SPEC file cleanup
- renumber patches
- move conditional stuff at the end of each sections
2025-08-29 10:13:22 +02:00
Zdenek Dohnal
7807236fd9 Remove old conflicts 2025-08-29 10:13:22 +02:00
František Hrdina
fca8d831fc Update of fmf plans 2025-08-12 10:15:16 +02:00
4 changed files with 54 additions and 39 deletions

View file

@ -1 +1 @@
SHA512 (vim-9.1-1723.tar.bz2) = 8e4474f5b693c517658779e31d884f4c74bc2ff424975cfc745680817e007f90e9dd4d860342c8a31a2186a3f3d7ccb1b7b4d23c2dd60c6131056d67d8b2b06b SHA512 (vim-9.1-2068.tar.bz2) = f19ae5898f7c388f437fe03af23d956ef66706c2a629a3389622e0b583d9bd831dd4e250badb181fceacb2b52b1f8a6bda4f72fbece122b5f5097153daf774f3

View file

@ -1,7 +1,7 @@
diff -up vim91/runtime/syntax/spec.vim.spec-syntax vim91/runtime/syntax/spec.vim diff -up vim91/runtime/syntax/spec.vim.spec-syntax vim91/runtime/syntax/spec.vim
--- vim91/runtime/syntax/spec.vim.spec-syntax 2024-03-08 07:18:14.000000000 +0100 --- vim91/runtime/syntax/spec.vim.spec-syntax 2025-11-14 07:38:27.000000000 +0100
+++ vim91/runtime/syntax/spec.vim 2024-03-08 07:37:57.157339625 +0100 +++ vim91/runtime/syntax/spec.vim 2025-11-14 07:52:56.081212607 +0100
@@ -35,7 +35,7 @@ syn match specNoNumberHilite 'X11\|X11R6 @@ -38,7 +38,7 @@ syn match specNoNumberHilite 'X11\|X11R6
syn match specManpageFile '[a-zA-Z]\.1' syn match specManpageFile '[a-zA-Z]\.1'
"Day, Month and most used license acronyms "Day, Month and most used license acronyms
@ -10,24 +10,12 @@ 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 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 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 syn keyword specMonth contained January February March April May June July August September October November December
@@ -58,9 +58,9 @@ syn cluster specListedFiles contains=spe @@ -105,7 +105,7 @@ syn case ignore
"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
@@ -102,7 +102,7 @@ syn case ignore
"%% PreAmble Section %% "%% PreAmble Section %%
"Copyright and Serial were deprecated by License and Epoch "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 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\|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\|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\|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 +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
"%% Description Section %% "%% Description Section %%
syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment

View file

@ -1,7 +1,7 @@
diff -up vim90/src/config.h.in.fips-warning vim90/src/config.h.in diff -up vim91/src/config.h.in.fips-warning vim91/src/config.h.in
--- vim90/src/config.h.in.fips-warning 2023-05-29 09:30:59.000000000 +0200 --- vim91/src/config.h.in.fips-warning 2025-10-31 08:12:59.598267544 +0100
+++ vim90/src/config.h.in 2023-05-29 09:34:47.261645612 +0200 +++ vim91/src/config.h.in 2025-10-31 08:14:45.661859595 +0100
@@ -498,5 +498,14 @@ @@ -526,5 +526,14 @@
/* Define if _SC_SIGSTKSZ is available via sysconf() */ /* Define if _SC_SIGSTKSZ is available via sysconf() */
#undef HAVE_SYSCONF_SIGSTKSZ #undef HAVE_SYSCONF_SIGSTKSZ
@ -16,10 +16,10 @@ diff -up vim90/src/config.h.in.fips-warning vim90/src/config.h.in
+ +
/* Define if you want to load libgpm dynamically */ /* Define if you want to load libgpm dynamically */
#undef DYNAMIC_GPM #undef DYNAMIC_GPM
diff -up vim90/src/configure.ac.fips-warning vim90/src/configure.ac diff -up vim91/src/configure.ac.fips-warning vim91/src/configure.ac
--- vim90/src/configure.ac.fips-warning 2023-05-29 09:34:47.257645645 +0200 --- vim91/src/configure.ac.fips-warning 2025-10-31 08:12:59.596711911 +0100
+++ vim90/src/configure.ac 2023-05-29 09:34:47.262645604 +0200 +++ vim91/src/configure.ac 2025-10-31 08:12:59.598566242 +0100
@@ -589,6 +589,38 @@ else @@ -631,6 +631,38 @@ else
AC_SUBST(XDIFF_OBJS_USED) AC_SUBST(XDIFF_OBJS_USED)
fi fi
@ -58,10 +58,10 @@ diff -up vim90/src/configure.ac.fips-warning vim90/src/configure.ac
dnl Check for Lua feature. dnl Check for Lua feature.
AC_MSG_CHECKING(--enable-luainterp argument) AC_MSG_CHECKING(--enable-luainterp argument)
AC_ARG_ENABLE(luainterp, AC_ARG_ENABLE(luainterp,
diff -up vim90/src/crypt.c.fips-warning vim90/src/crypt.c diff -up vim91/src/crypt.c.fips-warning vim91/src/crypt.c
--- vim90/src/crypt.c.fips-warning 2023-05-29 09:34:47.263645596 +0200 --- vim91/src/crypt.c.fips-warning 2025-10-10 07:16:11.000000000 +0200
+++ vim90/src/crypt.c 2023-05-29 09:51:23.209779115 +0200 +++ vim91/src/crypt.c 2025-10-31 08:12:59.598872032 +0100
@@ -795,6 +795,21 @@ crypt_check_method(int method) @@ -806,6 +806,21 @@ crypt_check_method(int method)
msg_scroll = TRUE; msg_scroll = TRUE;
msg(_("Warning: Using a weak encryption method; see :help 'cm'")); msg(_("Warning: Using a weak encryption method; see :help 'cm'"));
} }

View file

@ -12,7 +12,7 @@
%endif %endif
%define patchlevel 1723 %define patchlevel 2068
%define withnetbeans 1 %define withnetbeans 1
%define withhunspell 0 %define withhunspell 0
@ -315,8 +315,6 @@ BuildRequires: libICE-devel
BuildRequires: libSM-devel BuildRequires: libSM-devel
# core X11 protocol client library # core X11 protocol client library
BuildRequires: libX11-devel BuildRequires: libX11-devel
# X PixMap library for X11 - for creating images in X PixMap format
BuildRequires: libXpm-devel
# X Toolkit Intrinsics library - working with widgets? # X Toolkit Intrinsics library - working with widgets?
BuildRequires: libXt-devel BuildRequires: libXt-devel
# for testing validity of appdata file # for testing validity of appdata file
@ -345,11 +343,6 @@ Requires: vim-common = %{epoch}:%{version}-%{release}
Suggests: python3 Suggests: python3
Suggests: python3-libs Suggests: python3-libs
%if 0%{?fedora} >= 41
# needed for icons (#2277751)
Requires: gdk-pixbuf2-modules-extra%{?_isa}
%endif
# suggest python3, python2, lua, ruby and perl packages because of their # suggest python3, python2, lua, ruby and perl packages because of their
# embedded functionality in Vim/GVim # embedded functionality in Vim/GVim
%if "%{withlua}" == "1" %if "%{withlua}" == "1"
@ -570,6 +563,7 @@ cp vim enhanced-vim
--enable-fail-if-missing \ --enable-fail-if-missing \
--with-wayland \ --with-wayland \
--enable-year2038 \ --enable-year2038 \
--enable-socketserver \
--enable-canberra --enable-canberra
%make_build %make_build
@ -994,6 +988,39 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
%changelog %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 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 * Mon Sep 01 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1723-1
- patchlevel 1723 - patchlevel 1723