From fca8d831fcd439be806ece0fa6181f11ade1efa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= Date: Tue, 12 Aug 2025 10:15:16 +0200 Subject: [PATCH 01/17] Update of fmf plans --- gating.yaml | 10 +++++----- plans.fmf | 35 +++++++++++++++++++++++++++++++++++ plans/public.fmf | 6 ------ plans/tier1-internal.fmf | 12 ------------ 4 files changed, 40 insertions(+), 23 deletions(-) create mode 100644 plans.fmf delete mode 100644 plans/public.fmf delete mode 100644 plans/tier1-internal.fmf diff --git a/gating.yaml b/gating.yaml index 3c35f7d3..80852883 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,8 +4,8 @@ product_versions: decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional} - + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} + #Rawhide --- !Policy product_versions: @@ -13,13 +13,13 @@ product_versions: decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional} - + - !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} - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional} diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 00000000..0b2564f3 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,35 @@ +/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/plans/public.fmf b/plans/public.fmf deleted file mode 100644 index 880a0d4c..00000000 --- a/plans/public.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: Test plan with all Fedora tests -discover: - how: fmf - url: https://src.fedoraproject.org/tests/vim.git -execute: - how: tmt diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf deleted file mode 100644 index 1e8030df..00000000 --- a/plans/tier1-internal.fmf +++ /dev/null @@ -1,12 +0,0 @@ -summary: CI plan, picks internal Tier1 tests, runs in beakerlib. -discover: - - name: rhel - how: fmf - filter: 'tier: 1' - url: https://pkgs.devel.redhat.com/git/tests/vim -execute: - how: tmt -adjust: - enabled: false - when: distro == centos-stream or distro == fedora - because: They don't have access to internal repos. From 7807236fd90141c42b1c5afdc9cc8f078a8ba731 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 12 Aug 2025 08:41:08 +0200 Subject: [PATCH 02/17] Remove old conflicts --- vim.spec | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/vim.spec b/vim.spec index 05b37eb8..001976b1 100644 --- a/vim.spec +++ b/vim.spec @@ -32,6 +32,7 @@ %define withhunspell 0 %define withlua 1 %define withperl 1 + %if 0%{?flatpak} %define withruby 0 %else @@ -124,6 +125,7 @@ BuildRequires: glibc-gconv-extra # for mouse support in console BuildRequires: gpm-devel %endif + # for setting ACL on created files BuildRequires: libacl-devel @@ -149,6 +151,7 @@ BuildRequires: lua-devel BuildRequires: make # screen handling library BuildRequires: ncurses-devel + # for perl plugin %if "%{withperl}" == "1" BuildRequires: perl-devel @@ -156,6 +159,7 @@ BuildRequires: perl-generators BuildRequires: perl(ExtUtils::Embed) BuildRequires: perl(ExtUtils::ParseXS) %endif + # for python plugin BuildRequires: python3-devel @@ -174,24 +178,12 @@ multiple windows, multi-level undo, block highlighting and more. %package common Summary: The common files needed by any version of the VIM editor -# conflicts in package because of manpage move (bug #1599663) -# conflicts because of defaults.vim (bug #2026651) -# remove after F36 EOL+after release CentOS Stream > 9 -Conflicts: %{name}-minimal < %{epoch}:8.2.3642-2 # shared files between common and minimal Requires: %{name}-data = %{epoch}:%{version}-%{release} Requires: %{name}-filesystem # the hexdump binary was part of the package for long time, ship it with it # still for convenience Requires: xxd -# vim-toml was a separate package but the runtime files have been included -# directly in vim since 8.2.3519. The vim-toml package has been retired in -# Fedora, obsolete it so it doesn't get left on users' systems. Added in F38, -# can be removed in F40. -# https://github.com/cespare/vim-toml/commit/2c8983cc391287e5e26e015c3ab9c38de9f9b759 -# https://github.com/vim/vim/commit/2286304cdbba53ceb52b3ba2ba4a521b0a2f8d0f -Provides: vim-toml = %{epoch}:%{version}-%{release} -Obsoletes: vim-toml < 0^1.717bd87-4 %description common VIM (VIsual editor iMproved) is an updated and improved version of the @@ -214,10 +206,6 @@ many different languages. %package minimal Summary: A minimal version of the VIM editor -# conflicts in package because of manpage move (bug #1599663) -# conflicts because of defaults.vim (bug #2026651) -# remove after F36 EOL+after release CentOS Stream > 9 -Conflicts: %{name}-common < %{epoch}:8.2.3642-2 Provides: vi Provides: %{_bindir}/vi # shared files between common and minimal @@ -364,11 +352,6 @@ vim-common package. %package data Summary: Shared data for Vi and Vim BuildArch: noarch -# moved files from filesystem, common and minimal to data -# remove after F36 EOL+after release of CentOS Stream > 9 -Conflicts: %{name}-common < 2:8.2.3642-2 -Conflicts: %{name}-filesystem < 2:8.2.3642-2 -Conflicts: %{name}-minimal < 2:8.2.3642-2 %description data The subpackage is used for shipping files and directories, which need to be @@ -388,10 +371,6 @@ This subpackage contains files needed to set Vim as the default editor. %package -n xxd Summary: A hex dump utility -# the xxd related file were shipped in vim-common in the past, -# we have to conflict with the old ones -# remove this Conflicts once C10S is released -Conflicts: %{name}-common < 2:9.0.1440-2 %description -n xxd xxd creates a hex dump of a given file or standard input. It can also convert From 82d973027f5cb713b7e068f1af697eb91c9e156a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 12 Aug 2025 11:55:11 +0200 Subject: [PATCH 03/17] SPEC file cleanup - renumber patches - move conditional stuff at the end of each sections --- vim.spec | 403 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 214 insertions(+), 189 deletions(-) diff --git a/vim.spec b/vim.spec index 001976b1..2d5a1a14 100644 --- a/vim.spec +++ b/vim.spec @@ -1,5 +1,6 @@ %bcond_without gui + %if 0%{?fedora} %bcond_without default_editor %bcond_without gpm @@ -10,7 +11,24 @@ %bcond_with libsodium_crypt %endif + %define patchlevel 1623 +%define withnetbeans 1 + +%define withvimspell 0 +%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 + %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -26,27 +44,12 @@ %define desktop_file_utils_version 0.2.93 %endif -%define withnetbeans 1 - -%define withvimspell 0 -%define withhunspell 0 -%define withlua 1 -%define withperl 1 - %if 0%{?flatpak} %define withruby 0 %else %define withruby 1 %endif -# 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 Summary: The VIM editor URL: http://www.vim.org/ @@ -83,34 +86,26 @@ Source100: vim-spell-files.tar.bz2 %endif -Patch2000: vim-7.0-fixkeys.patch -Patch2001: vim-7.4-specsyntax.patch - -%if %{withhunspell} -Patch2002: vim-7.0-hunspell.patch -BuildRequires: hunspell-devel -%endif - -Patch3000: vim-7.3-manpage-typo-668894-675480.patch -Patch3001: vim-manpagefixes-948566.patch -Patch3002: vim-7.4-globalsyntax.patch +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 -Patch3003: vim-python3-tests.patch +Patch6: vim-python3-tests.patch # fips warning (Fedora downstream patch) -Patch3004: vim-crypto-warning.patch +Patch7: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) -Patch3005: vim-8.0-copy-paste.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 -%if %{desktop_file} -# for /usr/bin/desktop-file-install -BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} -Requires: desktop-file-utils -%endif - # gcc is no longer in buildroot by default BuildRequires: gcc # for translations @@ -121,17 +116,34 @@ BuildRequires: gettext # 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 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 %endif -# for setting ACL on created files -BuildRequires: libacl-devel - -# selinux support -%if %{WITH_SELINUX} -BuildRequires: libselinux-devel +%if %{withhunspell} +BuildRequires: hunspell-devel %endif # for xchacha20 encryption @@ -139,19 +151,11 @@ BuildRequires: libselinux-devel BuildRequires: libsodium-devel %endif -# uses libtool for linking -BuildRequires: libtool - # for lua plugin %if "%{withlua}" == "1" BuildRequires: lua-devel %endif -# uses make -BuildRequires: make -# screen handling library -BuildRequires: ncurses-devel - # for perl plugin %if "%{withperl}" == "1" BuildRequires: perl-devel @@ -160,15 +164,17 @@ BuildRequires: perl(ExtUtils::Embed) BuildRequires: perl(ExtUtils::ParseXS) %endif -# for python plugin -BuildRequires: python3-devel - # for ruby plugin %if "%{withruby}" == "1" BuildRequires: ruby BuildRequires: ruby-devel %endif +# selinux support +%if %{WITH_SELINUX} +BuildRequires: libselinux-devel +%endif + %description VIM (VIsual editor iMproved) is an updated and improved version of the @@ -176,6 +182,7 @@ 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 # shared files between common and minimal @@ -196,6 +203,7 @@ 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} @@ -204,6 +212,7 @@ Requires: vim-common = %{epoch}:%{version}-%{release} This subpackage contains dictionaries for vim spell checking in many different languages. + %package minimal Summary: A minimal version of the VIM editor Provides: vi @@ -220,6 +229,7 @@ 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 @@ -232,6 +242,9 @@ 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 %if "%{withlua}" == "1" @@ -242,9 +255,6 @@ Suggests: lua-libs Suggests: perl-devel %endif -Suggests: python3 -Suggests: python3-libs - %if "%{withruby}" == "1" Suggests: ruby Suggests: ruby-libs @@ -263,6 +273,7 @@ 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 @@ -271,6 +282,36 @@ 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 @@ -298,25 +339,27 @@ Provides: vim(plugins-supported) Provides: %{_bindir}/mergetool Provides: %{_bindir}/gvim -%if 0%{?fedora} >= 40 || 0%{?rhel} > 9 # 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 -%endif # GVIM graphics are based on GTK3 Requires: gtk3 # needed for icons (#226526) Requires: hicolor-icon-theme -%if 0%{?fedora} >= 41 -# needed for icons (#2277751) -Requires: gdk-pixbuf2-modules-extra%{?_isa} -%endif # 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 + + %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 # embedded functionality in Vim/GVim %if "%{withlua}" == "1" @@ -327,9 +370,6 @@ Suggests: lua-libs Suggests: perl-devel %endif -Suggests: python3 -Suggests: python3-libs - %if "%{withruby}" == "1" Suggests: ruby Suggests: ruby-libs @@ -349,63 +389,36 @@ with graphics and mouse capabilities. You'll also need to install the vim-common package. %endif -%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. - -%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 - -%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. - %prep %setup -q -b 0 -n %{vimdir} # use %%{__python3} macro for defining shebangs in python3 tests -sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3005} +sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH6} # fix rogue dependencies from sample code chmod -x runtime/tools/mve.awk -%patch -P 2000 -p1 -b .fixkeys -%patch -P 2001 -p1 -b .spec-syntax - -%if %{withhunspell} -%patch -P 2002 -p1 -%endif +%patch -P 1 -p1 -b .fixkeys +%patch -P 2 -p1 -b .spec-syntax 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 +%endif + # install spell files %if %{withvimspell} %{__tar} xjf %{SOURCE100} %endif -%patch -P 3000 -p1 -b .mantypo -%patch -P 3001 -p1 -b .manpagefixes -%patch -P 3002 -p1 -b .globalsyntax -%patch -P 3003 -p1 -b .python-tests -%patch -P 3004 -p1 -b .fips-warning -%patch -P 3005 -p1 -b .copypaste - %build cd src @@ -457,71 +470,9 @@ perl -pi -e "s/vimrc/virc/" os_unix.h cp vim minimal-vim make clean + mv -f os_unix.h.save os_unix.h -%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="" --enable-cscope \ - --with-modified-by="" \ -%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-canberra - -%make_build -cp vim gvim -make clean -%endif - %configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ --prefix=%{_prefix} --with-features=huge \ --enable-python3interp=dynamic \ @@ -577,6 +528,71 @@ make clean %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="" --enable-cscope \ + --with-modified-by="" \ + %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-canberra + +%make_build +cp vim gvim +make clean +%endif + + %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} @@ -585,12 +601,12 @@ cp -f %{SOURCE7} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec # Those aren't Linux info files but some binary files for Amiga: rm -f README*.info - cd src # 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} @@ -677,7 +693,7 @@ EOF appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml -for i in gvim.1 gex.1 gview.1 vimx.1; do +for i in gvim.1 gex.1 gview.1 vimx.1 eview.1 rgvim.1 rgview.1; do echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man1/$i done echo ".so man1/vimdiff.1" > %{buildroot}/%{_mandir}/man1/gvimdiff.1 @@ -690,9 +706,9 @@ 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 .%{_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 perl -pi -e "s,%{buildroot},," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1 @@ -705,10 +721,13 @@ rm %{buildroot}/%{_datadir}/icons/{hicolor,locolor}/*/apps/gvim.png 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" @@ -738,21 +757,6 @@ mkdir -p %{buildroot}%{_sysconfdir} install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/virc install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vimrc -# if Vim isn't built for Fedora, use redhat augroup -%if 0%{?rhel} >= 7 -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 %{SOURCE8} %{buildroot}%{_rpmconfigdir}/macros.d/ @@ -789,6 +793,21 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/LICENSE rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt +# if Vim isn't built for Fedora, use redhat augroup +%if 0%{?rhel} >= 7 +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 + # Refresh documentation helptags %transfiletriggerin common -- %{_datadir}/%{name}/vimfiles/doc @@ -878,9 +897,12 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %{_mandir}/man5/vimrc.* %if %{with gui} +%{_mandir}/man1/eview.* %{_mandir}/man1/gex.* %{_mandir}/man1/gview.* %{_mandir}/man1/gvim* +%{_mandir}/man1/rgvim.* +%{_mandir}/man1/rgview.* %{_mandir}/man1/vimx.* %endif @@ -1010,6 +1032,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %{_bindir}/vimtutor %{_bindir}/vimx %{_bindir}/evim +%{_bindir}/eview +%{_bindir}/rgvim +%{_bindir}/rgview %{_mandir}/man1/evim.* %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/* From ffd268aae6353c721d3f677a27cc62ba2b7d2fdd Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 12 Aug 2025 12:24:50 +0200 Subject: [PATCH 04/17] 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. --- vim.spec | 80 -------------------------------------------------------- 1 file changed, 80 deletions(-) diff --git a/vim.spec b/vim.spec index 2d5a1a14..dd667eca 100644 --- a/vim.spec +++ b/vim.spec @@ -15,7 +15,6 @@ %define patchlevel 1623 %define withnetbeans 1 -%define withvimspell 0 %define withhunspell 0 %define withlua 1 %define withperl 1 @@ -81,10 +80,6 @@ Source11: vim-default-editor.fish Source12: view_wrapper Source13: vi_wrapper -%if %{withvimspell} -Source100: vim-spell-files.tar.bz2 -%endif - Patch1: vim-7.0-fixkeys.patch Patch2: vim-7.4-specsyntax.patch @@ -204,15 +199,6 @@ 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 @@ -414,11 +400,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch -P 10000 -p1 %endif -# install spell files -%if %{withvimspell} -%{__tar} xjf %{SOURCE100} -%endif - %build cd src @@ -842,11 +823,7 @@ 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 @@ -915,63 +892,6 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %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 From 908674c9f08b47480cea13e659a980ac8bd12a92 Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 14 Aug 2025 14:37:56 -0500 Subject: [PATCH 05/17] Switch to https URL --- vim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index dd667eca..0e563439 100644 --- a/vim.spec +++ b/vim.spec @@ -51,7 +51,7 @@ Summary: The VIM editor -URL: http://www.vim.org/ +URL: https://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} Release: 1%{?dist} From b22f469cf1b94c99da50798de8019529cc6f826d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 29 Aug 2025 09:12:07 +0200 Subject: [PATCH 06/17] Enable F43 --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 81b69dee..4961ece1 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f42" "f41" ) -releases=( "fc43" "fc42" "fc41" ) +branches=( "rawhide" "f43" "f42" "f41" ) +releases=( "fc44" "fc43" "fc42" "fc41" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc43" "fc42" "\|fc41" ) -bodhi_enabled=( "0" "1" "1" ) +regexps=( "fc44" "fc43" "\|fc42" "\|fc41" ) +bodhi_enabled=( "0" "1" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From d014ed1adbfcabad5153f714b53724247cb4e8da Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 29 Aug 2025 09:13:35 +0200 Subject: [PATCH 07/17] - patchlevel 1706 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index e3183ba7..c20b1ad4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1623.tar.bz2) = dc8bf5abe856e50a43c1eb7d5f0797665bc14443738748075365cbdc6c89330d6fd4a61136d4d47078bcad6ab099e719f3a38ebe8eb6852d891127debb025faa +SHA512 (vim-9.1-1706.tar.bz2) = 4b936add54c8068202dedc532202af6d78d951144b74dcc5015e4f7fcf8c4c384509c14f1036579b39c176110cd78eea257601d8e16bd63a410f7290a9d1174b diff --git a/vim.spec b/vim.spec index 0e563439..0ff8cf2e 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1623 +%define patchlevel 1706 %define withnetbeans 1 %define withhunspell 0 @@ -988,6 +988,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Fri Aug 29 2025 Zdenek Dohnal - 2:9.1.1706-1 +- patchlevel 1706 + * Mon Aug 11 2025 Zdenek Dohnal - 2:9.1.1623-1 - patchlevel 1623 From 114a46778ba3e4e6be88dcd837415a9a1c45fe7d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 10 Sep 2025 15:44:51 +0200 Subject: [PATCH 08/17] Restore lost --remote-tab... functionality on wayland (fedora#2393716) --- vim.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index e7649e6a..b0e5f0da 100644 --- a/vim.spec +++ b/vim.spec @@ -54,7 +54,7 @@ Summary: The VIM editor URL: https://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?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 @@ -570,6 +570,7 @@ cp vim enhanced-vim --enable-fail-if-missing \ --with-wayland \ --enable-year2038 \ + --enable-socketserver \ --enable-canberra %make_build @@ -994,6 +995,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Wed Sep 10 2025 Zdenek Dohnal - 2:9.1.1723-2 +- Restore lost --remote-tab... functionality on wayland (fedora#2393716) + * Mon Sep 01 2025 Zdenek Dohnal - 2:9.1.1723-1 - patchlevel 1723 From a1f8e6615ae1c2cd21a94c69a51d3aa2eebd7759 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 19 Sep 2025 10:07:47 +0200 Subject: [PATCH 09/17] patchlevel 1775 --- sources | 2 +- vim.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 299c0369..63d32a44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1723.tar.bz2) = 8e4474f5b693c517658779e31d884f4c74bc2ff424975cfc745680817e007f90e9dd4d860342c8a31a2186a3f3d7ccb1b7b4d23c2dd60c6131056d67d8b2b06b +SHA512 (vim-9.1-1775.tar.bz2) = d1b21d9ec938e752c5e2be73c92dfe0ed122ade3bbaddde551bcb8556e42d42fe66a897e6473b79ba833b507cfd9de7d49b5da5585843c1ea04c7fecddcbe9da diff --git a/vim.spec b/vim.spec index b0e5f0da..93277fed 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1723 +%define patchlevel 1775 %define withnetbeans 1 %define withhunspell 0 @@ -54,7 +54,7 @@ Summary: The VIM editor URL: https://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +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 @@ -995,6 +995,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Fri Sep 19 2025 Zdenek Dohnal - 2:9.1.1775-1 +- patchlevel 1775 + * Wed Sep 10 2025 Zdenek Dohnal - 2:9.1.1723-2 - Restore lost --remote-tab... functionality on wayland (fedora#2393716) From 73edc28fd0fd6e4ca1f8a57dc4cde400906aea85 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 3 Oct 2025 11:42:05 +0200 Subject: [PATCH 10/17] patchlevel 1818 --- sources | 2 +- vim.spec | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sources b/sources index 63d32a44..f8e7f622 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1775.tar.bz2) = d1b21d9ec938e752c5e2be73c92dfe0ed122ade3bbaddde551bcb8556e42d42fe66a897e6473b79ba833b507cfd9de7d49b5da5585843c1ea04c7fecddcbe9da +SHA512 (vim-9.1-1818.tar.bz2) = 15633ab4ceac42312d411daa791cc923e51145826816ca73abd638c99c63efe5f0ba7341e10e8c087c0fb5a324814a8c2cac3d9ead23248371e95039f724901d diff --git a/vim.spec b/vim.spec index 93277fed..cd6d76a5 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1775 +%define patchlevel 1818 %define withnetbeans 1 %define withhunspell 0 @@ -315,8 +315,6 @@ BuildRequires: libICE-devel BuildRequires: libSM-devel # core X11 protocol client library 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? BuildRequires: libXt-devel # for testing validity of appdata file @@ -345,11 +343,6 @@ Requires: vim-common = %{epoch}:%{version}-%{release} Suggests: python3 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 # embedded functionality in Vim/GVim %if "%{withlua}" == "1" @@ -995,6 +988,12 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Fri Oct 03 2025 Zdenek Dohnal - 2:9.1.1818-1 +- patchlevel 1818 + +* Mon Sep 29 2025 Zdenek Dohnal - 2:9.1.1775-2 +- remove XPM support - GVim icons work without it + * Fri Sep 19 2025 Zdenek Dohnal - 2:9.1.1775-1 - patchlevel 1775 From daa31588d4c57d2c16253759d1416df7c648ccda Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 17 Oct 2025 10:34:30 +0200 Subject: [PATCH 11/17] patchlevel 1863 --- sources | 2 +- vim-crypto-warning.patch | 25 +++++++++++++------------ vim.spec | 5 ++++- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/sources b/sources index f8e7f622..432ae958 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1818.tar.bz2) = 15633ab4ceac42312d411daa791cc923e51145826816ca73abd638c99c63efe5f0ba7341e10e8c087c0fb5a324814a8c2cac3d9ead23248371e95039f724901d +SHA512 (vim-9.1-1863.tar.bz2) = 60a49add050158c7ab14b0af4b699188d067c6ec5665aa081bd0dd04dae90b8eb1b15e022ef252bb5bda0f4c5edd83d6db2214ef1e1bde1b855f934174a21ef7 diff --git a/vim-crypto-warning.patch b/vim-crypto-warning.patch index 195d7025..7f5391e2 100644 --- a/vim-crypto-warning.patch +++ b/vim-crypto-warning.patch @@ -1,7 +1,7 @@ -diff -up vim90/src/config.h.in.fips-warning vim90/src/config.h.in ---- vim90/src/config.h.in.fips-warning 2023-05-29 09:30:59.000000000 +0200 -+++ vim90/src/config.h.in 2023-05-29 09:34:47.261645612 +0200 -@@ -498,5 +498,14 @@ +diff -up vim91/src/config.h.in.fips-warning vim91/src/config.h.in +--- vim91/src/config.h.in.fips-warning 2025-10-17 09:03:56.910426660 +0200 ++++ vim91/src/config.h.in 2025-10-17 09:05:42.301128292 +0200 +@@ -526,6 +526,15 @@ /* Define if _SC_SIGSTKSZ is available via sysconf() */ #undef HAVE_SYSCONF_SIGSTKSZ @@ -16,10 +16,11 @@ diff -up vim90/src/config.h.in.fips-warning vim90/src/config.h.in + /* Define if you want to load libgpm dynamically */ #undef DYNAMIC_GPM -diff -up vim90/src/configure.ac.fips-warning vim90/src/configure.ac ---- vim90/src/configure.ac.fips-warning 2023-05-29 09:34:47.257645645 +0200 -+++ vim90/src/configure.ac 2023-05-29 09:34:47.262645604 +0200 -@@ -589,6 +589,38 @@ else + +diff -up vim91/src/configure.ac.fips-warning vim91/src/configure.ac +--- vim91/src/configure.ac.fips-warning 2025-10-17 09:03:56.891369117 +0200 ++++ vim91/src/configure.ac 2025-10-17 09:03:56.917397669 +0200 +@@ -631,6 +631,38 @@ else AC_SUBST(XDIFF_OBJS_USED) fi @@ -58,10 +59,10 @@ diff -up vim90/src/configure.ac.fips-warning vim90/src/configure.ac dnl Check for Lua feature. AC_MSG_CHECKING(--enable-luainterp argument) AC_ARG_ENABLE(luainterp, -diff -up vim90/src/crypt.c.fips-warning vim90/src/crypt.c ---- vim90/src/crypt.c.fips-warning 2023-05-29 09:34:47.263645596 +0200 -+++ vim90/src/crypt.c 2023-05-29 09:51:23.209779115 +0200 -@@ -795,6 +795,21 @@ crypt_check_method(int method) +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-17 09:03:56.920982655 +0200 +@@ -806,6 +806,21 @@ crypt_check_method(int method) msg_scroll = TRUE; msg(_("Warning: Using a weak encryption method; see :help 'cm'")); } diff --git a/vim.spec b/vim.spec index cd6d76a5..42debf11 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1818 +%define patchlevel 1863 %define withnetbeans 1 %define withhunspell 0 @@ -988,6 +988,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Fri Oct 17 2025 Zdenek Dohnal - 2:9.1.1863-1 +- patchlevel 1863 + * Fri Oct 03 2025 Zdenek Dohnal - 2:9.1.1818-1 - patchlevel 1818 From 19644cce7613e44f3a4a65d5a00e18bbb62b89bf Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 31 Oct 2025 09:16:09 +0100 Subject: [PATCH 12/17] patchlevel 1888 --- sources | 2 +- vim-crypto-warning.patch | 13 ++++++------- vim.spec | 5 ++++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sources b/sources index 432ae958..1bbd6961 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1863.tar.bz2) = 60a49add050158c7ab14b0af4b699188d067c6ec5665aa081bd0dd04dae90b8eb1b15e022ef252bb5bda0f4c5edd83d6db2214ef1e1bde1b855f934174a21ef7 +SHA512 (vim-9.1-1888.tar.bz2) = a3cad492f9418f71eafbdfb1ccf3607ccacc595d5eabde443ff2fa11f8d32c4d45b60f3c68ae030b115544e74395dcc8738cca6a0de59b1e0e45153a69fc99d4 diff --git a/vim-crypto-warning.patch b/vim-crypto-warning.patch index 7f5391e2..6f55807f 100644 --- a/vim-crypto-warning.patch +++ b/vim-crypto-warning.patch @@ -1,7 +1,7 @@ diff -up vim91/src/config.h.in.fips-warning vim91/src/config.h.in ---- vim91/src/config.h.in.fips-warning 2025-10-17 09:03:56.910426660 +0200 -+++ vim91/src/config.h.in 2025-10-17 09:05:42.301128292 +0200 -@@ -526,6 +526,15 @@ +--- 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 @@ -16,10 +16,9 @@ diff -up vim91/src/config.h.in.fips-warning vim91/src/config.h.in + /* 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-17 09:03:56.891369117 +0200 -+++ vim91/src/configure.ac 2025-10-17 09:03:56.917397669 +0200 +--- 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 @@ -61,7 +60,7 @@ diff -up vim91/src/configure.ac.fips-warning vim91/src/configure.ac 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-17 09:03:56.920982655 +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'")); diff --git a/vim.spec b/vim.spec index 42debf11..188b6c66 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1863 +%define patchlevel 1888 %define withnetbeans 1 %define withhunspell 0 @@ -988,6 +988,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Fri Oct 31 2025 Zdenek Dohnal - 2:9.1.1888-1 +- patchlevel 1888 + * Fri Oct 17 2025 Zdenek Dohnal - 2:9.1.1863-1 - patchlevel 1863 From 8550947499b306fa25f267a9975ddd3c8ff583b1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 14 Nov 2025 12:15:00 +0100 Subject: [PATCH 13/17] patchlevel 1914 --- sources | 2 +- vim-7.4-specsyntax.patch | 24 ++++++------------------ vim.spec | 5 ++++- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/sources b/sources index 1bbd6961..0581ebdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1888.tar.bz2) = a3cad492f9418f71eafbdfb1ccf3607ccacc595d5eabde443ff2fa11f8d32c4d45b60f3c68ae030b115544e74395dcc8738cca6a0de59b1e0e45153a69fc99d4 +SHA512 (vim-9.1-1914.tar.bz2) = 7db432217859bf6e74f705484f1ed84f06d94503a2a39ee67e727adb8d96a3ad17b7eb4c2e5afcc12d0339dbdb81d62341ae7e41668adb1d84093603f43c99fb diff --git a/vim-7.4-specsyntax.patch b/vim-7.4-specsyntax.patch index 71720a46..ace7607f 100644 --- a/vim-7.4-specsyntax.patch +++ b/vim-7.4-specsyntax.patch @@ -1,7 +1,7 @@ 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 2024-03-08 07:37:57.157339625 +0100 -@@ -35,7 +35,7 @@ syn match specNoNumberHilite 'X11\|X11R6 +--- 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 +@@ -38,7 +38,7 @@ syn match specNoNumberHilite 'X11\|X11R6 syn match specManpageFile '[a-zA-Z]\.1' "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 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 @@ syn cluster specListedFiles contains=spe - - "specCommands - syn match specConfigure contained '\./configure' --syn match specTarCommand contained '\ - 2:9.1.1914-1 +- patchlevel 1914 + * Fri Oct 31 2025 Zdenek Dohnal - 2:9.1.1888-1 - patchlevel 1888 From 3ec84a36c613969d516f4513dd7803755cb3a5ab Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 5 Dec 2025 08:50:19 +0100 Subject: [PATCH 14/17] patchlevel 1952 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 0581ebdb..7d192ff7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1914.tar.bz2) = 7db432217859bf6e74f705484f1ed84f06d94503a2a39ee67e727adb8d96a3ad17b7eb4c2e5afcc12d0339dbdb81d62341ae7e41668adb1d84093603f43c99fb +SHA512 (vim-9.1-1952.tar.bz2) = a08f2421872da4cbf262fabe1ce8b8f22342589956d02b0bd44b6d2505b5fb0cd9ac8da50e8af859038c047bb4a5ee314a12b2c3a86d85c7410437726f1928cc diff --git a/vim.spec b/vim.spec index 87aff1a8..e92bcabc 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1914 +%define patchlevel 1952 %define withnetbeans 1 %define withhunspell 0 @@ -988,6 +988,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Fri Dec 05 2025 Zdenek Dohnal - 2:9.1.1952-1 +- patchlevel 1952 + * Fri Nov 14 2025 Zdenek Dohnal - 2:9.1.1914-1 - patchlevel 1914 From 2d920d79a5d7780744cf056e5a95c1f24e2961b9 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 12 Dec 2025 08:37:13 +0100 Subject: [PATCH 15/17] patchlevel 1972 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7d192ff7..0ffd898e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1952.tar.bz2) = a08f2421872da4cbf262fabe1ce8b8f22342589956d02b0bd44b6d2505b5fb0cd9ac8da50e8af859038c047bb4a5ee314a12b2c3a86d85c7410437726f1928cc +SHA512 (vim-9.1-1972.tar.bz2) = 5bc15e34323c1a6b37e684f6d55eb175c21bc857b212d1c56946f2fce7d4ba0f35a892738040a0e3983a7bbb6020ede77ea8a53a5ea1ff63baf8f163a51b1dff diff --git a/vim.spec b/vim.spec index e92bcabc..3bfab600 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1952 +%define patchlevel 1972 %define withnetbeans 1 %define withhunspell 0 @@ -988,6 +988,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Fri Dec 12 2025 Zdenek Dohnal - 2:9.1.1972-1 +- patchlevel 1972 + * Fri Dec 05 2025 Zdenek Dohnal - 2:9.1.1952-1 - patchlevel 1952 From adc245613d57ffb6cfecfdf3f672ba51c893031a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 19 Dec 2025 08:04:51 +0100 Subject: [PATCH 16/17] patchlevel 1999 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 0ffd898e..d752b083 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1972.tar.bz2) = 5bc15e34323c1a6b37e684f6d55eb175c21bc857b212d1c56946f2fce7d4ba0f35a892738040a0e3983a7bbb6020ede77ea8a53a5ea1ff63baf8f163a51b1dff +SHA512 (vim-9.1-1999.tar.bz2) = 2b3c3ac0790e5b4914bb7eb1f3c46a0a22ff4ba13da4ed083bbcbc053ad6f4b82dee00e12318698f7edfcd757e5c2bc6f4e623482f4d3d3d6662547d265c9e51 diff --git a/vim.spec b/vim.spec index 3bfab600..598115ab 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1972 +%define patchlevel 1999 %define withnetbeans 1 %define withhunspell 0 @@ -988,6 +988,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Fri Dec 19 2025 Zdenek Dohnal - 2:9.1.1999-1 +- patchlevel 1999 + * Fri Dec 12 2025 Zdenek Dohnal - 2:9.1.1972-1 - patchlevel 1972 From 1c41e7bc760edbb1e506175c88c66543c1035a17 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 9 Jan 2026 14:22:39 +0100 Subject: [PATCH 17/17] patchlevel 2068 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d752b083..14532821 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1999.tar.bz2) = 2b3c3ac0790e5b4914bb7eb1f3c46a0a22ff4ba13da4ed083bbcbc053ad6f4b82dee00e12318698f7edfcd757e5c2bc6f4e623482f4d3d3d6662547d265c9e51 +SHA512 (vim-9.1-2068.tar.bz2) = f19ae5898f7c388f437fe03af23d956ef66706c2a629a3389622e0b583d9bd831dd4e250badb181fceacb2b52b1f8a6bda4f72fbece122b5f5097153daf774f3 diff --git a/vim.spec b/vim.spec index 598115ab..e0e45657 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1999 +%define patchlevel 2068 %define withnetbeans 1 %define withhunspell 0 @@ -988,6 +988,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Fri Jan 09 2026 Zdenek Dohnal - 2:9.1.2068-1 +- patchlevel 2068 + * Fri Dec 19 2025 Zdenek Dohnal - 2:9.1.1999-1 - patchlevel 1999