From 03c93d9b05cc8a1fb69a35e6cc9d39670669bb41 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 1 Mar 2021 12:06:52 +0100 Subject: [PATCH 001/324] 1928442 - vim-enhanced is replacing vim-wrappers-8.2.2465-1 --- vim.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index f4df9d40..57361b7f 100644 --- a/vim.spec +++ b/vim.spec @@ -21,7 +21,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: virc @@ -143,7 +143,6 @@ only available when the vim-common package is installed. %package enhanced Summary: A version of the VIM editor which includes recent enhancements Conflicts: vim-wrappers < 2:8.2.2488-1 -Obsoletes: vim-wrappers < 2:8.2.2488-1 # vim bundles libvterm, which is used during build - so we need to provide # bundled libvterm for catching possible libvterm CVEs Provides: bundled(libvterm) @@ -820,6 +819,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Mon Mar 01 2021 Zdenek Dohnal - 2:8.2.2541-2 +- 1928442 - vim-enhanced is replacing vim-wrappers-8.2.2465-1 + * Mon Feb 22 2021 Zdenek Dohnal - 2:8.2.2541-1 - patchlevel 2541 - 1931099 - Build version numbers don't match the actual build patchlevel From 6125fc96fc365a4a500cafb930966603295f5c5f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 1 Mar 2021 12:07:30 +0100 Subject: [PATCH 002/324] vim-update.sh: enable F34 in bodhi --- vim-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim-update.sh b/vim-update.sh index 34184df8..e19a8cdd 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -4,7 +4,7 @@ debug="" branches=( "rawhide" "f34" "f33" "f32" ) releases=( "fc35" "fc34" "fc33" "fc32" ) regexps=( "fc35" "\|fc34" "\|fc33" "\|fc32" ) -bodhi_enabled=( "0" "0" "1" "1" ) +bodhi_enabled=( "0" "1" "1" "1" ) #releases_regexp=fc28\\\|fc27\\\|fc28 branches_index=0 From 79e14ea7280e8191d2b801d80e5289f6bb1d58cd Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 1 Mar 2021 12:13:25 +0100 Subject: [PATCH 003/324] - patchlevel 2559 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f1a52df4..666b18aa 100644 --- a/.gitignore +++ b/.gitignore @@ -344,3 +344,4 @@ /vim-8.2-2488.tar.bz2 /vim-8.2-2529.tar.bz2 /vim-8.2-2541.tar.bz2 +/vim-8.2-2559.tar.bz2 diff --git a/sources b/sources index f0aeecdd..af27dba7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2541.tar.bz2) = dbe254c609dac6fecd96ab8347f04bc6260efe0bf6703cc835dc46d952186db58508b5810adedc2e05ddccc663e67a14353f21ec8b712aded9921953af54be80 +SHA512 (vim-8.2-2559.tar.bz2) = f7926cd032272eb2d79bf1b2ad8257c67943833dc5c8f601ee8ca0ac7045be0ebcb2fc3620216984465734369126ce5ff4b45094e19be06fea939d9bbff05929 diff --git a/vim.spec b/vim.spec index 57361b7f..f8fa8f9b 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2541 +%define patchlevel 2559 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -21,7 +21,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: virc @@ -819,6 +819,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Mon Mar 01 2021 Zdenek Dohnal - 2:8.2.2559-1 +- patchlevel 2559 + * Mon Mar 01 2021 Zdenek Dohnal - 2:8.2.2541-2 - 1928442 - vim-enhanced is replacing vim-wrappers-8.2.2465-1 From 181cf84eba44e830035eb2d455c4bd88535651de Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 1 Mar 2021 12:30:41 +0100 Subject: [PATCH 004/324] vim-crypto-messages.patch: update the patch --- vim-crypto-warning.patch | 28 ++++++++++++++-------------- vim.spec | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/vim-crypto-warning.patch b/vim-crypto-warning.patch index 6d5e6ac1..80c36da9 100644 --- a/vim-crypto-warning.patch +++ b/vim-crypto-warning.patch @@ -1,10 +1,10 @@ -diff -up vim81/src/config.h.in.crypto vim81/src/config.h.in ---- vim81/src/config.h.in.crypto 2019-07-26 07:58:51.000000000 +0200 -+++ vim81/src/config.h.in 2019-09-16 14:18:32.994110646 +0200 -@@ -490,3 +490,12 @@ +diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in +--- vim82/src/config.h.in.fips-warning 2021-03-01 12:20:20.887162181 +0100 ++++ vim82/src/config.h.in 2021-03-01 12:20:42.520977438 +0100 +@@ -499,3 +499,12 @@ - /* Define to inline symbol or empty */ - #undef inline + /* Define if _SC_SIGSTKSZ is available via sysconf() */ + #undef HAVE_SYSCONF_SIGSTKSZ + +/* Do we need FIPS warning? */ +#undef HAVE_FIPS_WARNING @@ -14,10 +14,10 @@ diff -up vim81/src/config.h.in.crypto vim81/src/config.h.in + +/* Link to fips_enabled file */ +#undef FIPS_ENABLED_FILE_LINK -diff -up vim81/src/configure.ac.crypto vim81/src/configure.ac ---- vim81/src/configure.ac.crypto 2019-09-16 14:18:32.990110675 +0200 -+++ vim81/src/configure.ac 2019-09-16 14:18:32.996110631 +0200 -@@ -534,6 +534,38 @@ else +diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac +--- vim82/src/configure.ac.fips-warning 2021-03-01 12:20:20.885162198 +0100 ++++ vim82/src/configure.ac 2021-03-01 12:20:20.888162173 +0100 +@@ -541,6 +541,38 @@ else AC_MSG_RESULT(yes) fi @@ -56,10 +56,10 @@ diff -up vim81/src/configure.ac.crypto vim81/src/configure.ac dnl Check for Lua feature. AC_MSG_CHECKING(--enable-luainterp argument) AC_ARG_ENABLE(luainterp, -diff -up vim81/src/crypt.c.crypto vim81/src/crypt.c ---- vim81/src/crypt.c.crypto 2019-09-16 14:18:32.996110631 +0200 -+++ vim81/src/crypt.c 2019-09-16 14:19:48.953550617 +0200 -@@ -524,6 +524,21 @@ crypt_check_method(int method) +diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c +--- vim82/src/crypt.c.fips-warning 2021-03-01 12:13:11.000000000 +0100 ++++ vim82/src/crypt.c 2021-03-01 12:20:20.888162173 +0100 +@@ -523,6 +523,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 f8fa8f9b..2d442e06 100644 --- a/vim.spec +++ b/vim.spec @@ -268,7 +268,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 -b .copypaste %patch3017 -p1 -b .python-tests -%patch3018 -p1 +%patch3018 -p1 -b .fips-warning %build cd src From 58548886ab26cb9a9faf570adf109198b71fd930 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 8 Mar 2021 07:00:27 +0100 Subject: [PATCH 005/324] - patchlevel 2576 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 666b18aa..a38a4517 100644 --- a/.gitignore +++ b/.gitignore @@ -345,3 +345,4 @@ /vim-8.2-2529.tar.bz2 /vim-8.2-2541.tar.bz2 /vim-8.2-2559.tar.bz2 +/vim-8.2-2576.tar.bz2 diff --git a/sources b/sources index af27dba7..517da652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2559.tar.bz2) = f7926cd032272eb2d79bf1b2ad8257c67943833dc5c8f601ee8ca0ac7045be0ebcb2fc3620216984465734369126ce5ff4b45094e19be06fea939d9bbff05929 +SHA512 (vim-8.2-2576.tar.bz2) = a3e0fa23c5ba99678741e4852e46f221e75917be30d5b3fe00e9ac63bd6cdfcc0e7167f59fc43efe6e6918466851c74ee310380c4da7b23ae8f31b40e3272164 diff --git a/vim.spec b/vim.spec index 2d442e06..f33fa6b8 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2559 +%define patchlevel 2576 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -819,6 +819,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Mon Mar 08 2021 Zdenek Dohnal - 2:8.2.2576-1 +- patchlevel 2576 + * Mon Mar 01 2021 Zdenek Dohnal - 2:8.2.2559-1 - patchlevel 2559 From ac5bbd3ba09f90d3a1279a6bbfdfbb42f9f6e751 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 15 Mar 2021 10:11:34 +0100 Subject: [PATCH 006/324] - patchlevel 2607 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a38a4517..cd84aea0 100644 --- a/.gitignore +++ b/.gitignore @@ -346,3 +346,4 @@ /vim-8.2-2541.tar.bz2 /vim-8.2-2559.tar.bz2 /vim-8.2-2576.tar.bz2 +/vim-8.2-2607.tar.bz2 diff --git a/sources b/sources index 517da652..e9dd356c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2576.tar.bz2) = a3e0fa23c5ba99678741e4852e46f221e75917be30d5b3fe00e9ac63bd6cdfcc0e7167f59fc43efe6e6918466851c74ee310380c4da7b23ae8f31b40e3272164 +SHA512 (vim-8.2-2607.tar.bz2) = ffaa4ed2d5c2c1661a1b5538d652c50b2427b3064a2c816e384a30b0588065d1f549ceb76e27822bad2120d65456ee1af6cf749a87730ecd0350c783ed63ec4b diff --git a/vim.spec b/vim.spec index f33fa6b8..c3ac97ce 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2576 +%define patchlevel 2607 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -819,6 +819,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Mon Mar 15 2021 Zdenek Dohnal - 2:8.2.2607-1 +- patchlevel 2607 + * Mon Mar 08 2021 Zdenek Dohnal - 2:8.2.2576-1 - patchlevel 2576 From 7a77071e60ff9fe21c251058345921368b37a2a8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 22 Mar 2021 10:03:04 +0100 Subject: [PATCH 007/324] - patchlevel 2637 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cd84aea0..18c5ee7f 100644 --- a/.gitignore +++ b/.gitignore @@ -347,3 +347,4 @@ /vim-8.2-2559.tar.bz2 /vim-8.2-2576.tar.bz2 /vim-8.2-2607.tar.bz2 +/vim-8.2-2637.tar.bz2 diff --git a/sources b/sources index e9dd356c..af3d1479 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2607.tar.bz2) = ffaa4ed2d5c2c1661a1b5538d652c50b2427b3064a2c816e384a30b0588065d1f549ceb76e27822bad2120d65456ee1af6cf749a87730ecd0350c783ed63ec4b +SHA512 (vim-8.2-2637.tar.bz2) = 2355bdc0eff241943d7c0e2dcf196e4ceefed0470aece58a1d3a44688496c2befb597c87efc01af385455ff3fd3d047306413ea450b3221800653f9d293aa737 diff --git a/vim.spec b/vim.spec index c3ac97ce..75b95fb8 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2607 +%define patchlevel 2637 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -819,6 +819,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Mon Mar 22 2021 Zdenek Dohnal - 2:8.2.2637-1 +- patchlevel 2637 + * Mon Mar 15 2021 Zdenek Dohnal - 2:8.2.2607-1 - patchlevel 2607 From 42547257903d72821077f290e0a44823a23e848f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 8 Apr 2021 13:40:21 +0200 Subject: [PATCH 008/324] - patchlevel 2735 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 18c5ee7f..52087e87 100644 --- a/.gitignore +++ b/.gitignore @@ -348,3 +348,4 @@ /vim-8.2-2576.tar.bz2 /vim-8.2-2607.tar.bz2 /vim-8.2-2637.tar.bz2 +/vim-8.2-2735.tar.bz2 diff --git a/sources b/sources index af3d1479..ffb66aaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2637.tar.bz2) = 2355bdc0eff241943d7c0e2dcf196e4ceefed0470aece58a1d3a44688496c2befb597c87efc01af385455ff3fd3d047306413ea450b3221800653f9d293aa737 +SHA512 (vim-8.2-2735.tar.bz2) = 6543fdc8d97316ced20eec62fdd064d6b68da1ebcd82cf52e2a6a1d1d9d374e95f5e319ef69b19756729adaa46b7ca3ca7bdabb5bbb42b137eb498b82ca7748c diff --git a/vim.spec b/vim.spec index 75b95fb8..66be1c47 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2637 +%define patchlevel 2735 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -819,6 +819,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Thu Apr 08 2021 Zdenek Dohnal - 2:8.2.2735-1 +- patchlevel 2735 + * Mon Mar 22 2021 Zdenek Dohnal - 2:8.2.2637-1 - patchlevel 2637 From 35110373b2d25ed0e5e417fd5b037875fa0d3418 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 12 Apr 2021 10:04:15 +0200 Subject: [PATCH 009/324] - patchlevel 2756 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 52087e87..20b87e15 100644 --- a/.gitignore +++ b/.gitignore @@ -349,3 +349,4 @@ /vim-8.2-2607.tar.bz2 /vim-8.2-2637.tar.bz2 /vim-8.2-2735.tar.bz2 +/vim-8.2-2756.tar.bz2 diff --git a/sources b/sources index ffb66aaf..0b827f87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2735.tar.bz2) = 6543fdc8d97316ced20eec62fdd064d6b68da1ebcd82cf52e2a6a1d1d9d374e95f5e319ef69b19756729adaa46b7ca3ca7bdabb5bbb42b137eb498b82ca7748c +SHA512 (vim-8.2-2756.tar.bz2) = cb397fe8202776150f617cd7f0d5315a6c7821ebfad114942a2279b7b46895bb7d92f8a56775163f6d83723b051eb423d6c75419221c24a68ebfe1114e59729b diff --git a/vim.spec b/vim.spec index 66be1c47..e8263ca2 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2735 +%define patchlevel 2756 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -819,6 +819,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Mon Apr 12 2021 Zdenek Dohnal - 2:8.2.2756-1 +- patchlevel 2756 + * Thu Apr 08 2021 Zdenek Dohnal - 2:8.2.2735-1 - patchlevel 2735 From 652328b33c1c4a39af63a1d3458c893605007683 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 20 Apr 2021 12:05:22 +0200 Subject: [PATCH 010/324] - patchlevel 2787 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 20b87e15..6e48b58b 100644 --- a/.gitignore +++ b/.gitignore @@ -350,3 +350,4 @@ /vim-8.2-2637.tar.bz2 /vim-8.2-2735.tar.bz2 /vim-8.2-2756.tar.bz2 +/vim-8.2-2787.tar.bz2 diff --git a/sources b/sources index 0b827f87..e7e67a0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2756.tar.bz2) = cb397fe8202776150f617cd7f0d5315a6c7821ebfad114942a2279b7b46895bb7d92f8a56775163f6d83723b051eb423d6c75419221c24a68ebfe1114e59729b +SHA512 (vim-8.2-2787.tar.bz2) = a798b61e021614e5ad3ac2c64274a46d29ddcdc03641e9f1e4cd0c0d104e19763530fe3d8ca3b13e630ce5a845b6b0699bac6d2b402ca06ae82f140e175881e4 diff --git a/vim.spec b/vim.spec index e8263ca2..cabb0bd8 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2756 +%define patchlevel 2787 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -819,6 +819,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Tue Apr 20 2021 Zdenek Dohnal - 2:8.2.2787-1 +- patchlevel 2787 + * Mon Apr 12 2021 Zdenek Dohnal - 2:8.2.2756-1 - patchlevel 2756 From f47caf25c552ef2ccea1019d044081e3285bd23c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 26 Apr 2021 10:13:49 +0200 Subject: [PATCH 011/324] - patchlevel 2811 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6e48b58b..10d2f752 100644 --- a/.gitignore +++ b/.gitignore @@ -351,3 +351,4 @@ /vim-8.2-2735.tar.bz2 /vim-8.2-2756.tar.bz2 /vim-8.2-2787.tar.bz2 +/vim-8.2-2811.tar.bz2 diff --git a/sources b/sources index e7e67a0c..0bdfbe48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2787.tar.bz2) = a798b61e021614e5ad3ac2c64274a46d29ddcdc03641e9f1e4cd0c0d104e19763530fe3d8ca3b13e630ce5a845b6b0699bac6d2b402ca06ae82f140e175881e4 +SHA512 (vim-8.2-2811.tar.bz2) = ac1220d464c0e8ed1c7ad0499d4ee84a39e6f65c63408121592e59345c4444fdd5a7041b6a3e5f15c02b8f386618f1957e9767d277f09836a3073291cf07a644 diff --git a/vim.spec b/vim.spec index cabb0bd8..086a4c9f 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2787 +%define patchlevel 2811 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -819,6 +819,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Mon Apr 26 2021 Zdenek Dohnal - 2:8.2.2811-1 +- patchlevel 2811 + * Tue Apr 20 2021 Zdenek Dohnal - 2:8.2.2787-1 - patchlevel 2787 From 1a2cea45bcc7534f9bf57240d2345b81ac5548c9 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 3 May 2021 10:14:55 +0200 Subject: [PATCH 012/324] - patchlevel 2825 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 10d2f752..b8392c55 100644 --- a/.gitignore +++ b/.gitignore @@ -352,3 +352,4 @@ /vim-8.2-2756.tar.bz2 /vim-8.2-2787.tar.bz2 /vim-8.2-2811.tar.bz2 +/vim-8.2-2825.tar.bz2 diff --git a/sources b/sources index 0bdfbe48..d0c80d99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2811.tar.bz2) = ac1220d464c0e8ed1c7ad0499d4ee84a39e6f65c63408121592e59345c4444fdd5a7041b6a3e5f15c02b8f386618f1957e9767d277f09836a3073291cf07a644 +SHA512 (vim-8.2-2825.tar.bz2) = b1ccba07ef1a7eb4fd65e509185cb490bf173239f828edce7bacb2e3533efc8ec8cb1d623673ba22efd5709bac437fab5588dc12bc9bf9bcd49cceb6ec5af2f2 diff --git a/vim.spec b/vim.spec index 086a4c9f..35ca4dee 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2811 +%define patchlevel 2825 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -819,6 +819,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Mon May 03 2021 Zdenek Dohnal - 2:8.2.2825-1 +- patchlevel 2825 + * Mon Apr 26 2021 Zdenek Dohnal - 2:8.2.2811-1 - patchlevel 2811 From 90c92e56934939fd2952dba67c140074519ec27a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 6 May 2021 10:02:38 +0200 Subject: [PATCH 013/324] make default-editor built only on Fedora --- vim.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 35ca4dee..4ee61644 100644 --- a/vim.spec +++ b/vim.spec @@ -7,6 +7,12 @@ %define desktop_file_utils_version 0.2.93 %endif +%if 0%{?fedora} +%bcond_without default_editor +%else +%bcond_with default_editor +%endif + %define withnetbeans 1 %define withvimspell 0 @@ -21,7 +27,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: virc @@ -224,6 +230,7 @@ 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. +%if %{with default_editor} %package default-editor Summary: Set vim as the default editor BuildArch: noarch @@ -235,6 +242,7 @@ Requires: vim-enhanced %description default-editor This subpackage contains files needed to set Vim as the default editor. +%endif %prep @@ -540,12 +548,17 @@ chmod 644 %{buildroot}/%{_datadir}/%{name}/%{vimdir}/doc/vim2html.pl \ %{buildroot}/%{_datadir}/%{name}/%{vimdir}/tools/vim132 chmod 644 ../runtime/doc/vim2html.pl +mkdir -p %{buildroot}/%{_sysconfdir} + +%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 + install -p -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/virc install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/vimrc @@ -812,13 +825,18 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %dir %{_datadir}/icons/locolor/*/apps %{_datadir}/icons/locolor/*/apps/* +%if %{with default_editor} %files default-editor %dir %{_datadir}/fish/vendor_conf.d %{_datadir}/fish/vendor_conf.d/vim-default-editor.fish %dir %{_sysconfdir}/profile.d %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* +%endif %changelog +* Wed May 05 2021 Zdenek Dohnal - 2:8.2.2825-2 +- make default-editor built only on Fedora + * Mon May 03 2021 Zdenek Dohnal - 2:8.2.2825-1 - patchlevel 2825 From 388a57eac52985ea4682f26822a9e1d043765cfd Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 10 May 2021 10:01:42 +0200 Subject: [PATCH 014/324] - patchlevel 2846 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b8392c55..a2d0ec6e 100644 --- a/.gitignore +++ b/.gitignore @@ -353,3 +353,4 @@ /vim-8.2-2787.tar.bz2 /vim-8.2-2811.tar.bz2 /vim-8.2-2825.tar.bz2 +/vim-8.2-2846.tar.bz2 diff --git a/sources b/sources index d0c80d99..8eeee433 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2825.tar.bz2) = b1ccba07ef1a7eb4fd65e509185cb490bf173239f828edce7bacb2e3533efc8ec8cb1d623673ba22efd5709bac437fab5588dc12bc9bf9bcd49cceb6ec5af2f2 +SHA512 (vim-8.2-2846.tar.bz2) = 0e28f39f614f28d111840d47dd77ebfa88411e5bbf592c21ec494aa912611a7cbcad5b294ca1f29edf1ac07bd15c81003617d7ee87ecde945bf1eb68ffee52b1 diff --git a/vim.spec b/vim.spec index 4ee61644..7724e354 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2825 +%define patchlevel 2846 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -27,7 +27,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: virc @@ -834,6 +834,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon May 10 2021 Zdenek Dohnal - 2:8.2.2846-1 +- patchlevel 2846 + * Wed May 05 2021 Zdenek Dohnal - 2:8.2.2825-2 - make default-editor built only on Fedora From f179e9f17001bb67c1a53599da5c963944b0ed4c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 20 May 2021 06:15:50 +0200 Subject: [PATCH 015/324] vim-update.sh: F32 is EOL in 5 days --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index e19a8cdd..b86818f4 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,10 +1,10 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f34" "f33" "f32" ) -releases=( "fc35" "fc34" "fc33" "fc32" ) -regexps=( "fc35" "\|fc34" "\|fc33" "\|fc32" ) -bodhi_enabled=( "0" "1" "1" "1" ) +branches=( "rawhide" "f34" "f33" ) +releases=( "fc35" "fc34" "fc33" ) +regexps=( "fc35" "\|fc34" "\|fc33" ) +bodhi_enabled=( "0" "1" "1" ) #releases_regexp=fc28\\\|fc27\\\|fc28 branches_index=0 From 2f9ee18039b1b87574e522868beaeb47fa5161c7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 21 May 2021 07:27:06 +0200 Subject: [PATCH 016/324] - patchlevel 2875 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a2d0ec6e..e01c69bd 100644 --- a/.gitignore +++ b/.gitignore @@ -354,3 +354,4 @@ /vim-8.2-2811.tar.bz2 /vim-8.2-2825.tar.bz2 /vim-8.2-2846.tar.bz2 +/vim-8.2-2875.tar.bz2 diff --git a/sources b/sources index 8eeee433..a9bf9fa3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2846.tar.bz2) = 0e28f39f614f28d111840d47dd77ebfa88411e5bbf592c21ec494aa912611a7cbcad5b294ca1f29edf1ac07bd15c81003617d7ee87ecde945bf1eb68ffee52b1 +SHA512 (vim-8.2-2875.tar.bz2) = f7484b939f431b1ceec2b6408e26b6f0b568fd5c12fe5828675db7b31a295f37a39cf9f2bade0e7334016799c49581f9d5cd9231820ce61b82b7b284444b49e9 diff --git a/vim.spec b/vim.spec index 7724e354..853989eb 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2846 +%define patchlevel 2875 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -834,6 +834,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri May 21 2021 Zdenek Dohnal - 2:8.2.2875-1 +- patchlevel 2875 + * Mon May 10 2021 Zdenek Dohnal - 2:8.2.2846-1 - patchlevel 2846 From 9539622bf1ce854cea91b24b35d7650442a57d52 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 24 May 2021 11:07:48 +0200 Subject: [PATCH 017/324] - patchlevel 2879 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e01c69bd..76952b5e 100644 --- a/.gitignore +++ b/.gitignore @@ -355,3 +355,4 @@ /vim-8.2-2825.tar.bz2 /vim-8.2-2846.tar.bz2 /vim-8.2-2875.tar.bz2 +/vim-8.2-2879.tar.bz2 diff --git a/sources b/sources index a9bf9fa3..7e2073c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2875.tar.bz2) = f7484b939f431b1ceec2b6408e26b6f0b568fd5c12fe5828675db7b31a295f37a39cf9f2bade0e7334016799c49581f9d5cd9231820ce61b82b7b284444b49e9 +SHA512 (vim-8.2-2879.tar.bz2) = aa30aa1eeeeda589b1c766ae5ab973d0ef0a2ad36867a3523dce02eb7d3721ee83b2d164ffc461de1d62f2356d495e9dd918baa8841d667d43f93fd2c3fe9a15 diff --git a/vim.spec b/vim.spec index 853989eb..afd3dda4 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2875 +%define patchlevel 2879 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -834,6 +834,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon May 24 2021 Zdenek Dohnal - 2:8.2.2879-1 +- patchlevel 2879 + * Fri May 21 2021 Zdenek Dohnal - 2:8.2.2875-1 - patchlevel 2875 From 8c16b13b37c6d2dc0e12d0c154cca3e30a3a0177 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 4 Jun 2021 06:59:28 +0200 Subject: [PATCH 018/324] - patchlevel 2932 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 76952b5e..c96bda60 100644 --- a/.gitignore +++ b/.gitignore @@ -356,3 +356,4 @@ /vim-8.2-2846.tar.bz2 /vim-8.2-2875.tar.bz2 /vim-8.2-2879.tar.bz2 +/vim-8.2-2932.tar.bz2 diff --git a/sources b/sources index 7e2073c0..948439f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2879.tar.bz2) = aa30aa1eeeeda589b1c766ae5ab973d0ef0a2ad36867a3523dce02eb7d3721ee83b2d164ffc461de1d62f2356d495e9dd918baa8841d667d43f93fd2c3fe9a15 +SHA512 (vim-8.2-2932.tar.bz2) = 69ab6e09f7d4902969cb86fb19767feabfcf8f043a91b1794c4f4a21da040fdac4a65af69aa1daa60c6d23f8b74ac2164f5008a958a6de4c67f408cf1330af2c diff --git a/vim.spec b/vim.spec index afd3dda4..0ea9213b 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2879 +%define patchlevel 2932 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -834,6 +834,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Jun 04 2021 Zdenek Dohnal - 2:8.2.2932-1 +- patchlevel 2932 + * Mon May 24 2021 Zdenek Dohnal - 2:8.2.2879-1 - patchlevel 2879 From 48589239bd1592529d801b3b417fb8f6a48684a7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 7 Jun 2021 14:26:40 +0200 Subject: [PATCH 019/324] - patchlevel 2956 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c96bda60..4e8b54cf 100644 --- a/.gitignore +++ b/.gitignore @@ -357,3 +357,4 @@ /vim-8.2-2875.tar.bz2 /vim-8.2-2879.tar.bz2 /vim-8.2-2932.tar.bz2 +/vim-8.2-2956.tar.bz2 diff --git a/sources b/sources index 948439f1..d99ad770 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2932.tar.bz2) = 69ab6e09f7d4902969cb86fb19767feabfcf8f043a91b1794c4f4a21da040fdac4a65af69aa1daa60c6d23f8b74ac2164f5008a958a6de4c67f408cf1330af2c +SHA512 (vim-8.2-2956.tar.bz2) = aad227a2e8e640ecb894d7aa6e863826ce8d713e4db2a2e1514e5a725cde65cfcae55f2f2d1546750890d22e5750ea274947020c885391e1fab9759a65106ad9 diff --git a/vim.spec b/vim.spec index 0ea9213b..09c53951 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2932 +%define patchlevel 2956 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -834,6 +834,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Jun 07 2021 Zdenek Dohnal - 2:8.2.2956-1 +- patchlevel 2956 + * Fri Jun 04 2021 Zdenek Dohnal - 2:8.2.2932-1 - patchlevel 2932 From 6a934f62de5b7be6af1d14174aa9049b9ea8d027 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 10 Jun 2021 10:42:09 +0200 Subject: [PATCH 020/324] 1969936 - Failed to source defaults.vim --- vim.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/vim.spec b/vim.spec index 09c53951..ba71360f 100644 --- a/vim.spec +++ b/vim.spec @@ -27,7 +27,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: virc @@ -104,8 +104,10 @@ multiple windows, multi-level undo, block highlighting and more. %package common Summary: The common files needed by any version of the VIM editor -# remove when a new RHEL is released (current 8) -Conflicts: %{name}-minimal < %{epoch}:8.1.1-1 +# conflicts in package because of manpage move (bug #1599663) +# conflicts because of defaults.vim (bug #1969936) +# remove after RHEL 8+2 is released +Conflicts: %{name}-minimal < %{epoch}:8.2.2956-2 Requires: %{name}-filesystem %description common @@ -130,8 +132,10 @@ many different languages. %package minimal Summary: A minimal version of the VIM editor # conflicts in package because of manpage move (bug #1599663) -# remove when a new RHEL is released (current 8) -Conflicts: %{name}-common < %{epoch}:8.1.1-1 +# conflicts because of defaults.vim (bug #1969936) +# remove after RHEL 8+2 is released +Conflicts: %{name}-common < %{epoch}:8.2.2956-2 +# remove Conflicts+Obsoletes for wrappers after F34 is EOL Conflicts: vim-wrappers < 2:8.2.2488-1 Obsoletes: vim-wrappers < 2:8.2.2488-1 Provides: vi @@ -764,6 +768,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_bindir}/rview %{_bindir}/vi %{_bindir}/view +%{_datadir}/%{name}/%{vimdir}/defaults.vim %{_libexecdir}/vi %{_mandir}/man1/vi.* %{_mandir}/man1/ex.* @@ -834,6 +839,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Jun 10 2021 Zdenek Dohnal - 2:8.2.2956-2 +- 1969936 - Failed to source defaults.vim + * Mon Jun 07 2021 Zdenek Dohnal - 2:8.2.2956-1 - patchlevel 2956 From f1e1f1d882f6d94f32549e110bd0261f16139fcf Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 14 Jun 2021 15:27:40 +0200 Subject: [PATCH 021/324] 1969936 - Failed to source defaults.vim --- ...ython-configure-check-uses-deprecate.patch | 63 +++++++++++++++ ...inker-errors-with-dynamic-Python-3.1.patch | 79 +++++++++++++++++++ vim.spec | 6 ++ 3 files changed, 148 insertions(+) create mode 100644 0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch create mode 100644 0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch diff --git a/0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch b/0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch new file mode 100644 index 00000000..ba6afa89 --- /dev/null +++ b/0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch @@ -0,0 +1,63 @@ +From 31e299c08f250b126b2c2c0ecce12ee563b70fdc Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Thu, 10 Jun 2021 18:50:55 +0200 +Subject: [PATCH] patch 8.2.2970: Python configure check uses deprecated + command + +Problem: Python configure check uses deprecated command. +Solution: Use sysconfig instead of distutils if possible. (Zdenek Dohnal, + closes #8354) +--- + src/auto/configure | 5 ++++- + src/configure.ac | 5 ++++- + src/version.c | 2 ++ + 3 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/auto/configure b/src/auto/configure +index 5702a2171..7ecc40ca5 100755 +--- a/src/auto/configure ++++ b/src/auto/configure +@@ -6755,7 +6755,10 @@ else + + vi_cv_path_python3_conf= + config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" +- d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` ++ d=`${vi_cv_path_python3} -c "import sysconfig; print(sysconfig.get_config_var('LIBPL'))" 2> /dev/null` ++ if test "x$d" = "x"; then ++ d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` ++ fi + if test -d "$d" && test -f "$d/config.c"; then + vi_cv_path_python3_conf="$d" + else +diff --git a/src/configure.ac b/src/configure.ac +index 2db04496f..9810ea1fc 100644 +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -1487,7 +1487,10 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; + [ + vi_cv_path_python3_conf= + config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" +- d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` ++ d=`${vi_cv_path_python3} -c "import sysconfig; print(sysconfig.get_config_var('LIBPL'))" 2> /dev/null` ++ if test "x$d" = "x"; then ++ d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` ++ fi + if test -d "$d" && test -f "$d/config.c"; then + vi_cv_path_python3_conf="$d" + else +diff --git a/src/version.c b/src/version.c +index 055179cd2..628658199 100644 +--- a/src/version.c ++++ b/src/version.c +@@ -750,6 +750,8 @@ static char *(features[]) = + + static int included_patches[] = + { /* Add new patch number below this line */ ++/**/ ++ 2970, + /**/ + 2969, + /**/ +-- +2.31.1 + diff --git a/0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch b/0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch new file mode 100644 index 00000000..1b00efab --- /dev/null +++ b/0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch @@ -0,0 +1,79 @@ +From 90478f35a8c78e2e10a4b4a8f135998dc04c91fa Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Mon, 14 Jun 2021 15:08:30 +0200 +Subject: [PATCH] patch 8.2.2995: linker errors with dynamic Python 3.10 + +Problem: Linker errors with dynamic Python 3.10. +Solution: Add a couple of library entries. (Zdenek Dohnal, closes #8381, + closes #8356) +--- + src/if_python3.c | 18 ++++++++++++++++++ + src/version.c | 2 ++ + 2 files changed, 20 insertions(+) + +diff --git a/src/if_python3.c b/src/if_python3.c +index f9c8002da..c7db9d7a2 100644 +--- a/src/if_python3.c ++++ b/src/if_python3.c +@@ -184,6 +184,9 @@ typedef PySliceObject PySliceObject_T; + # ifndef PyMapping_Keys + # define PyMapping_Keys py3_PyMapping_Keys + # endif ++# if PY_VERSION_HEX >= 0x030a00b2 ++# define PyIter_Check py3_PyIter_Check ++# endif + # define PyIter_Next py3_PyIter_Next + # define PyObject_GetIter py3_PyObject_GetIter + # define PyObject_Repr py3_PyObject_Repr +@@ -358,6 +361,9 @@ static PyObject* (*py3_PyDict_GetItemString)(PyObject *, const char *); + static int (*py3_PyDict_Next)(PyObject *, Py_ssize_t *, PyObject **, PyObject **); + static PyObject* (*py3_PyLong_FromLong)(long); + static PyObject* (*py3_PyDict_New)(void); ++# if PY_VERSION_HEX >= 0x030a00b2 ++static int (*py3_PyIter_Check)(PyObject *o); ++# endif + static PyObject* (*py3_PyIter_Next)(PyObject *); + static PyObject* (*py3_PyObject_GetIter)(PyObject *); + static PyObject* (*py3_PyObject_Repr)(PyObject *); +@@ -538,6 +544,9 @@ static struct + {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next}, + {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check}, + {"PyMapping_Keys", (PYTHON_PROC*)&py3_PyMapping_Keys}, ++# if PY_VERSION_HEX >= 0x030a00b2 ++ {"PyIter_Check", (PYTHON_PROC*)&py3_PyIter_Check}, ++# endif + {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next}, + {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter}, + {"PyObject_Repr", (PYTHON_PROC*)&py3_PyObject_Repr}, +@@ -671,6 +680,15 @@ py3_PyType_HasFeature(PyTypeObject *type, unsigned long feature) + # define PyType_HasFeature(t,f) py3_PyType_HasFeature(t,f) + # endif + ++# if PY_VERSION_HEX >= 0x030a00b2 ++ static inline int ++py3__PyObject_TypeCheck(PyObject *ob, PyTypeObject *type) ++{ ++ return Py_IS_TYPE(ob, type) || PyType_IsSubtype(Py_TYPE(ob), type); ++} ++# define _PyObject_TypeCheck(o,t) py3__PyObject_TypeCheck(o,t) ++# endif ++ + # ifdef MSWIN + /* + * Look up the library "libname" using the InstallPath registry key. +diff --git a/src/version.c b/src/version.c +index 58bd42016..b146efb69 100644 +--- a/src/version.c ++++ b/src/version.c +@@ -750,6 +750,8 @@ static char *(features[]) = + + static int included_patches[] = + { /* Add new patch number below this line */ ++/**/ ++ 2995, + /**/ + 2994, + /**/ +-- +2.31.1 + diff --git a/vim.spec b/vim.spec index ba71360f..4b6b9002 100644 --- a/vim.spec +++ b/vim.spec @@ -70,6 +70,10 @@ Patch3016: vim-8.0-copy-paste.patch Patch3017: vim-python3-tests.patch # fips warning Patch3018: vim-crypto-warning.patch +# distutils deprecated - use sysconfig if available +Patch3019: 0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch +# FTBFS with Python 3.10 +Patch3020: 0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -281,6 +285,8 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3016 -p1 -b .copypaste %patch3017 -p1 -b .python-tests %patch3018 -p1 -b .fips-warning +%patch3019 -p1 -b .distutils-deprecated +%patch3020 -p1 -b .python310-ftbfs %build cd src From 4002807a0a985cb2a35a1db25b251280a66c47bc Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 14 Jun 2021 15:38:55 +0200 Subject: [PATCH 022/324] Remove patch chunks for version.c --- ...970-Python-configure-check-uses-deprecate.patch | 14 -------------- ...995-linker-errors-with-dynamic-Python-3.1.patch | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch b/0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch index ba6afa89..9dd74c73 100644 --- a/0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch +++ b/0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch @@ -45,19 +45,5 @@ index 2db04496f..9810ea1fc 100644 if test -d "$d" && test -f "$d/config.c"; then vi_cv_path_python3_conf="$d" else -diff --git a/src/version.c b/src/version.c -index 055179cd2..628658199 100644 ---- a/src/version.c -+++ b/src/version.c -@@ -750,6 +750,8 @@ static char *(features[]) = - - static int included_patches[] = - { /* Add new patch number below this line */ -+/**/ -+ 2970, - /**/ - 2969, - /**/ --- 2.31.1 diff --git a/0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch b/0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch index 1b00efab..45f731eb 100644 --- a/0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch +++ b/0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch @@ -61,19 +61,5 @@ index f9c8002da..c7db9d7a2 100644 # ifdef MSWIN /* * Look up the library "libname" using the InstallPath registry key. -diff --git a/src/version.c b/src/version.c -index 58bd42016..b146efb69 100644 ---- a/src/version.c -+++ b/src/version.c -@@ -750,6 +750,8 @@ static char *(features[]) = - - static int included_patches[] = - { /* Add new patch number below this line */ -+/**/ -+ 2995, - /**/ - 2994, - /**/ --- 2.31.1 From 75d4a33b4e0c80451cb372570a0bef749eba3019 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 16 Jun 2021 13:00:50 +0200 Subject: [PATCH 023/324] vim.spec: Remove backported patches They are in the newest patchlevel. --- ...ython-configure-check-uses-deprecate.patch | 49 -------------- ...inker-errors-with-dynamic-Python-3.1.patch | 65 ------------------- vim.spec | 6 -- 3 files changed, 120 deletions(-) delete mode 100644 0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch delete mode 100644 0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch diff --git a/0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch b/0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch deleted file mode 100644 index 9dd74c73..00000000 --- a/0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 31e299c08f250b126b2c2c0ecce12ee563b70fdc Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Thu, 10 Jun 2021 18:50:55 +0200 -Subject: [PATCH] patch 8.2.2970: Python configure check uses deprecated - command - -Problem: Python configure check uses deprecated command. -Solution: Use sysconfig instead of distutils if possible. (Zdenek Dohnal, - closes #8354) ---- - src/auto/configure | 5 ++++- - src/configure.ac | 5 ++++- - src/version.c | 2 ++ - 3 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/auto/configure b/src/auto/configure -index 5702a2171..7ecc40ca5 100755 ---- a/src/auto/configure -+++ b/src/auto/configure -@@ -6755,7 +6755,10 @@ else - - vi_cv_path_python3_conf= - config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" -- d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` -+ d=`${vi_cv_path_python3} -c "import sysconfig; print(sysconfig.get_config_var('LIBPL'))" 2> /dev/null` -+ if test "x$d" = "x"; then -+ d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` -+ fi - if test -d "$d" && test -f "$d/config.c"; then - vi_cv_path_python3_conf="$d" - else -diff --git a/src/configure.ac b/src/configure.ac -index 2db04496f..9810ea1fc 100644 ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -1487,7 +1487,10 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; - [ - vi_cv_path_python3_conf= - config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" -- d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` -+ d=`${vi_cv_path_python3} -c "import sysconfig; print(sysconfig.get_config_var('LIBPL'))" 2> /dev/null` -+ if test "x$d" = "x"; then -+ d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` -+ fi - if test -d "$d" && test -f "$d/config.c"; then - vi_cv_path_python3_conf="$d" - else -2.31.1 - diff --git a/0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch b/0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch deleted file mode 100644 index 45f731eb..00000000 --- a/0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 90478f35a8c78e2e10a4b4a8f135998dc04c91fa Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Mon, 14 Jun 2021 15:08:30 +0200 -Subject: [PATCH] patch 8.2.2995: linker errors with dynamic Python 3.10 - -Problem: Linker errors with dynamic Python 3.10. -Solution: Add a couple of library entries. (Zdenek Dohnal, closes #8381, - closes #8356) ---- - src/if_python3.c | 18 ++++++++++++++++++ - src/version.c | 2 ++ - 2 files changed, 20 insertions(+) - -diff --git a/src/if_python3.c b/src/if_python3.c -index f9c8002da..c7db9d7a2 100644 ---- a/src/if_python3.c -+++ b/src/if_python3.c -@@ -184,6 +184,9 @@ typedef PySliceObject PySliceObject_T; - # ifndef PyMapping_Keys - # define PyMapping_Keys py3_PyMapping_Keys - # endif -+# if PY_VERSION_HEX >= 0x030a00b2 -+# define PyIter_Check py3_PyIter_Check -+# endif - # define PyIter_Next py3_PyIter_Next - # define PyObject_GetIter py3_PyObject_GetIter - # define PyObject_Repr py3_PyObject_Repr -@@ -358,6 +361,9 @@ static PyObject* (*py3_PyDict_GetItemString)(PyObject *, const char *); - static int (*py3_PyDict_Next)(PyObject *, Py_ssize_t *, PyObject **, PyObject **); - static PyObject* (*py3_PyLong_FromLong)(long); - static PyObject* (*py3_PyDict_New)(void); -+# if PY_VERSION_HEX >= 0x030a00b2 -+static int (*py3_PyIter_Check)(PyObject *o); -+# endif - static PyObject* (*py3_PyIter_Next)(PyObject *); - static PyObject* (*py3_PyObject_GetIter)(PyObject *); - static PyObject* (*py3_PyObject_Repr)(PyObject *); -@@ -538,6 +544,9 @@ static struct - {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next}, - {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check}, - {"PyMapping_Keys", (PYTHON_PROC*)&py3_PyMapping_Keys}, -+# if PY_VERSION_HEX >= 0x030a00b2 -+ {"PyIter_Check", (PYTHON_PROC*)&py3_PyIter_Check}, -+# endif - {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next}, - {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter}, - {"PyObject_Repr", (PYTHON_PROC*)&py3_PyObject_Repr}, -@@ -671,6 +680,15 @@ py3_PyType_HasFeature(PyTypeObject *type, unsigned long feature) - # define PyType_HasFeature(t,f) py3_PyType_HasFeature(t,f) - # endif - -+# if PY_VERSION_HEX >= 0x030a00b2 -+ static inline int -+py3__PyObject_TypeCheck(PyObject *ob, PyTypeObject *type) -+{ -+ return Py_IS_TYPE(ob, type) || PyType_IsSubtype(Py_TYPE(ob), type); -+} -+# define _PyObject_TypeCheck(o,t) py3__PyObject_TypeCheck(o,t) -+# endif -+ - # ifdef MSWIN - /* - * Look up the library "libname" using the InstallPath registry key. -2.31.1 - diff --git a/vim.spec b/vim.spec index 4b6b9002..ba71360f 100644 --- a/vim.spec +++ b/vim.spec @@ -70,10 +70,6 @@ Patch3016: vim-8.0-copy-paste.patch Patch3017: vim-python3-tests.patch # fips warning Patch3018: vim-crypto-warning.patch -# distutils deprecated - use sysconfig if available -Patch3019: 0001-patch-8.2.2970-Python-configure-check-uses-deprecate.patch -# FTBFS with Python 3.10 -Patch3020: 0001-patch-8.2.2995-linker-errors-with-dynamic-Python-3.1.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -285,8 +281,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3016 -p1 -b .copypaste %patch3017 -p1 -b .python-tests %patch3018 -p1 -b .fips-warning -%patch3019 -p1 -b .distutils-deprecated -%patch3020 -p1 -b .python310-ftbfs %build cd src From e4c5a986eff170726a2569edd3445f7d7eb154a1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 16 Jun 2021 13:02:19 +0200 Subject: [PATCH 024/324] - patchlevel 3009 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4e8b54cf..70decb9c 100644 --- a/.gitignore +++ b/.gitignore @@ -358,3 +358,4 @@ /vim-8.2-2879.tar.bz2 /vim-8.2-2932.tar.bz2 /vim-8.2-2956.tar.bz2 +/vim-8.2-3009.tar.bz2 diff --git a/sources b/sources index d99ad770..384077c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2956.tar.bz2) = aad227a2e8e640ecb894d7aa6e863826ce8d713e4db2a2e1514e5a725cde65cfcae55f2f2d1546750890d22e5750ea274947020c885391e1fab9759a65106ad9 +SHA512 (vim-8.2-3009.tar.bz2) = 95cd26275eb7638a67b75b325b5b2b5411260fb9f7566824eebb364d9113418cb0f54418615b80e87b476fdb5533d8fb28204b851fd82a3b90c9a73c9285599d diff --git a/vim.spec b/vim.spec index ba71360f..58d77af5 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2956 +%define patchlevel 3009 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -27,7 +27,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: virc @@ -839,6 +839,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Jun 16 2021 Zdenek Dohnal - 2:8.2.3009-1 +- patchlevel 3009 + * Thu Jun 10 2021 Zdenek Dohnal - 2:8.2.2956-2 - 1969936 - Failed to source defaults.vim From 706601d84fcfb8a20dcd19fa982666dd557fddc7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 24 Jun 2021 09:26:41 +0200 Subject: [PATCH 025/324] - patchlevel 3043 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 70decb9c..4b8abe5b 100644 --- a/.gitignore +++ b/.gitignore @@ -359,3 +359,4 @@ /vim-8.2-2932.tar.bz2 /vim-8.2-2956.tar.bz2 /vim-8.2-3009.tar.bz2 +/vim-8.2-3043.tar.bz2 diff --git a/sources b/sources index 384077c7..498d354e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3009.tar.bz2) = 95cd26275eb7638a67b75b325b5b2b5411260fb9f7566824eebb364d9113418cb0f54418615b80e87b476fdb5533d8fb28204b851fd82a3b90c9a73c9285599d +SHA512 (vim-8.2-3043.tar.bz2) = 1e70fffe3eff913fc8b8829fbca29380e952f985b63666e083226124649d8eb64a5e322e998c33454cd155091a277ff5c0e26ef3174c981c030ad7fe81898c6b diff --git a/vim.spec b/vim.spec index 58d77af5..28cf4ede 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3009 +%define patchlevel 3043 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -839,6 +839,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Jun 24 2021 Zdenek Dohnal - 2:8.2.3043-1 +- patchlevel 3043 + * Wed Jun 16 2021 Zdenek Dohnal - 2:8.2.3009-1 - patchlevel 3009 From 1efb730ae40d5bdfdd9b9a79b10c5b3c1fb4cc9d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 24 Jun 2021 09:30:40 +0200 Subject: [PATCH 026/324] Fix conflicts in vim-crypto-warning.patch --- vim-crypto-warning.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vim-crypto-warning.patch b/vim-crypto-warning.patch index 80c36da9..ba1a35ea 100644 --- a/vim-crypto-warning.patch +++ b/vim-crypto-warning.patch @@ -1,7 +1,7 @@ diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in ---- vim82/src/config.h.in.fips-warning 2021-03-01 12:20:20.887162181 +0100 -+++ vim82/src/config.h.in 2021-03-01 12:20:42.520977438 +0100 -@@ -499,3 +499,12 @@ +--- vim82/src/config.h.in.fips-warning 2021-06-23 11:46:55.000000000 +0200 ++++ vim82/src/config.h.in 2021-06-23 11:55:03.165480970 +0200 +@@ -501,3 +501,12 @@ /* Define if _SC_SIGSTKSZ is available via sysconf() */ #undef HAVE_SYSCONF_SIGSTKSZ @@ -15,8 +15,8 @@ diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in +/* Link to fips_enabled file */ +#undef FIPS_ENABLED_FILE_LINK diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac ---- vim82/src/configure.ac.fips-warning 2021-03-01 12:20:20.885162198 +0100 -+++ vim82/src/configure.ac 2021-03-01 12:20:20.888162173 +0100 +--- vim82/src/configure.ac.fips-warning 2021-06-23 11:55:03.163480985 +0200 ++++ vim82/src/configure.ac 2021-06-23 11:55:03.166480962 +0200 @@ -541,6 +541,38 @@ else AC_MSG_RESULT(yes) fi @@ -57,9 +57,9 @@ diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac AC_MSG_CHECKING(--enable-luainterp argument) AC_ARG_ENABLE(luainterp, diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c ---- vim82/src/crypt.c.fips-warning 2021-03-01 12:13:11.000000000 +0100 -+++ vim82/src/crypt.c 2021-03-01 12:20:20.888162173 +0100 -@@ -523,6 +523,21 @@ crypt_check_method(int method) +--- vim82/src/crypt.c.fips-warning 2021-06-23 11:55:03.166480962 +0200 ++++ vim82/src/crypt.c 2021-06-23 12:36:22.295488425 +0200 +@@ -603,6 +603,21 @@ crypt_check_method(int method) msg_scroll = TRUE; msg(_("Warning: Using a weak encryption method; see :help 'cm'")); } @@ -80,4 +80,4 @@ diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c +#endif } - void + #ifdef FEAT_SODIUM From a111617db23d0c857c24192d65f284a712674d68 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 24 Jun 2021 09:41:44 +0200 Subject: [PATCH 027/324] enable libsodium encryption in Fedora --- vim.spec | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 28cf4ede..01d0e27f 100644 --- a/vim.spec +++ b/vim.spec @@ -9,8 +9,10 @@ %if 0%{?fedora} %bcond_without default_editor +%bcond_without libsodium_crypt %else %bcond_with default_editor +%bcond_with libsodium_crypt %endif %define withnetbeans 1 @@ -76,6 +78,9 @@ BuildRequires: gcc # uses make BuildRequires: make +%if %{with libsodium_crypt} +BuildRequires: libsodium +%endif BuildRequires: python3-devel ncurses-devel gettext perl-devel BuildRequires: perl-generators BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) @@ -322,7 +327,8 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --with-modified-by="" \ --enable-fips-warning \ --enable-fail-if-missing \ - --disable-canberra + --disable-canberra \ + --disable-libsodium %make_build VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} cp vim minimal-vim @@ -365,6 +371,11 @@ mv -f ex_cmds.c.save ex_cmds.c --enable-luainterp=dynamic \ %else --disable-luainterp \ +%endif +%if %{with libsodium_crypt} + --enable-libsodium \ +%else + --disable-libsodium \ %endif --enable-fail-if-missing \ --enable-canberra @@ -402,6 +413,11 @@ make clean --enable-luainterp=dynamic \ %else --disable-luainterp \ +%endif +%if %{with libsodium_crypt} + --enable-libsodium \ +%else + --disable-libsodium \ %endif --enable-fail-if-missing \ --disable-canberra @@ -841,6 +857,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog * Thu Jun 24 2021 Zdenek Dohnal - 2:8.2.3043-1 - patchlevel 3043 +- enable libsodium encryption in Fedora * Wed Jun 16 2021 Zdenek Dohnal - 2:8.2.3009-1 - patchlevel 3009 From ece46e8119ab5a129af4b4aa9dae45f0f942bf90 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 24 Jun 2021 10:28:40 +0200 Subject: [PATCH 028/324] require glibc-gconv-extra on F35 and later --- vim.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vim.spec b/vim.spec index 01d0e27f..ebc583b5 100644 --- a/vim.spec +++ b/vim.spec @@ -81,6 +81,14 @@ BuildRequires: make %if %{with libsodium_crypt} BuildRequires: libsodium %endif +# glibc in F35 bootstraped several conversion formats from +# iconv into a separate package. Vim needs those additional +# formats during compilation. +# remove the conditional once F34 is EOL and leave +# only BuildRequires here +%if 0%{?fedora} >= 35 +BuildRequires: glibc-gconv-extra +%endif BuildRequires: python3-devel ncurses-devel gettext perl-devel BuildRequires: perl-generators BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) @@ -858,6 +866,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags * Thu Jun 24 2021 Zdenek Dohnal - 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 - 2:8.2.3009-1 - patchlevel 3009 From dc4c46d622ade728bb57bfb230591b671a05215d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 24 Jun 2021 11:35:59 +0200 Subject: [PATCH 029/324] vim.spec: clean up dependencies and provide comments --- vim.spec | 113 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 78 insertions(+), 35 deletions(-) diff --git a/vim.spec b/vim.spec index ebc583b5..d07da8ea 100644 --- a/vim.spec +++ b/vim.spec @@ -30,6 +30,7 @@ URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} Release: 1%{?dist} +Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: virc @@ -73,14 +74,18 @@ Patch3017: vim-python3-tests.patch # fips warning Patch3018: vim-crypto-warning.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 -# uses make -BuildRequires: make - -%if %{with libsodium_crypt} -BuildRequires: libsodium -%endif +# for translations +BuildRequires: gettext # glibc in F35 bootstraped several conversion formats from # iconv into a separate package. Vim needs those additional # formats during compilation. @@ -89,25 +94,39 @@ BuildRequires: libsodium %if 0%{?fedora} >= 35 BuildRequires: glibc-gconv-extra %endif -BuildRequires: python3-devel ncurses-devel gettext perl-devel -BuildRequires: perl-generators -BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) -BuildRequires: libacl-devel gpm-devel autoconf file +# for mouse support in console +BuildRequires: gpm-devel +# for setting ACL on created files +BuildRequires: libacl-devel +# selinux support %if %{WITH_SELINUX} BuildRequires: libselinux-devel %endif -%if "%{withruby}" == "1" -BuildRequires: ruby-devel ruby +# for xchacha20 encryption +%if %{with libsodium_crypt} +BuildRequires: libsodium %endif +# for lua plugin %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} +# uses make +BuildRequires: make +# screen handling library +BuildRequires: ncurses-devel +# for perl plugin +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: perl(ExtUtils::Embed) +BuildRequires: perl(ExtUtils::ParseXS) +# for python plugin +BuildRequires: python3-devel +# for ruby plugin +%if "%{withruby}" == "1" +BuildRequires: ruby +BuildRequires: ruby-devel %endif -Epoch: 2 + %description VIM (VIsual editor iMproved) is an updated and improved version of the @@ -165,6 +184,7 @@ only available when the vim-common package is installed. %package enhanced Summary: A version of the VIM editor which includes recent enhancements +# remove Conflicts for wrappers after F34 is EOL Conflicts: vim-wrappers < 2:8.2.2488-1 # vim bundles libvterm, which is used during build - so we need to provide # bundled libvterm for catching possible libvterm CVEs @@ -172,17 +192,22 @@ Provides: bundled(libvterm) Provides: vim Provides: %{_bindir}/mergetool Provides: %{_bindir}/vim -Requires: vim-common = %{epoch}:%{version}-%{release} which +Requires: vim-common = %{epoch}:%{version}-%{release} +# required for vimtutor (#395371) +Requires: which # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim -Suggests: python3 python3-libs -Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-devel -%if "%{withruby}" == "1" -Suggests: ruby-libs ruby -%endif %if "%{withlua}" == "1" Suggests: lua-libs %endif +Suggests: perl-devel +Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Suggests: python3 +Suggests: python3-libs +%if "%{withruby}" == "1" +Suggests: ruby +Suggests: ruby-libs +%endif %description enhanced VIM (VIsual editor iMproved) is an updated and improved version of the @@ -207,32 +232,49 @@ packages that add vim files, p.e. additional syntax files or filetypes. %package X11 Summary: The VIM version of the vi editor for the X Window System - GVim -# needed in configure script to have correct macros enabled for GUI (#1603272) +# 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 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 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 BuildRequires: libappstream-glib # for sound support BuildRequires: libcanberra-devel -BuildRequires: libX11-devel -BuildRequires: libSM-devel -BuildRequires: libXt-devel -BuildRequires: libXpm-devel -BuildRequires: libICE-devel Provides: gvim Provides: %{_bindir}/mergetool Provides: %{_bindir}/gvim +# GVIM graphics are based on GTK3 +Requires: gtk3 +# needed for icons (#226526) Requires: hicolor-icon-theme -Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk3 +# 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} # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim -Suggests: python3 python3-libs -Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-devel -%if "%{withruby}" == "1" -Suggests: ruby-libs ruby -%endif %if "%{withlua}" == "1" Suggests: lua-libs %endif +Suggests: perl-devel +Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Suggests: python3 +Suggests: python3-libs +%if "%{withruby}" == "1" +Suggests: ruby +Suggests: ruby-libs +%endif %description X11 VIM (VIsual editor iMproved) is an updated and improved version of the @@ -253,6 +295,7 @@ Summary: Set vim as the default editor BuildArch: noarch Conflicts: system-default-editor # conflict with nano-default-editor which doesn't provide system-default-editor +# remove after F33 is EOL Conflicts: nano-default-editor < 5.3-3 Provides: system-default-editor Requires: vim-enhanced From af695dc4cee0bdc1d60602ba389460f901efb97f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 24 Jun 2021 12:34:37 +0200 Subject: [PATCH 030/324] vim.spec: libsodium-devel of course... --- vim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index d07da8ea..a49932c0 100644 --- a/vim.spec +++ b/vim.spec @@ -104,7 +104,7 @@ BuildRequires: libselinux-devel %endif # for xchacha20 encryption %if %{with libsodium_crypt} -BuildRequires: libsodium +BuildRequires: libsodium-devel %endif # for lua plugin %if "%{withlua}" == "1" From f8d0187a425e6ac580af367c3d92588dd039374c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 25 Jun 2021 08:52:34 +0200 Subject: [PATCH 031/324] - patchlevel 3046 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4b8abe5b..e0dd7f21 100644 --- a/.gitignore +++ b/.gitignore @@ -360,3 +360,4 @@ /vim-8.2-2956.tar.bz2 /vim-8.2-3009.tar.bz2 /vim-8.2-3043.tar.bz2 +/vim-8.2-3046.tar.bz2 diff --git a/sources b/sources index 498d354e..f729c36b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3043.tar.bz2) = 1e70fffe3eff913fc8b8829fbca29380e952f985b63666e083226124649d8eb64a5e322e998c33454cd155091a277ff5c0e26ef3174c981c030ad7fe81898c6b +SHA512 (vim-8.2-3046.tar.bz2) = 439d919483d372575564c0e8c8ff2e57713a25eb52eede705eaf482ab2506906bf2e44142d82626422af3e8fc445c3caee8b677bcef6e9710a82103aa8f8cdf9 diff --git a/vim.spec b/vim.spec index a49932c0..de4896dd 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3043 +%define patchlevel 3046 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Jun 25 2021 Zdenek Dohnal - 2:8.2.3046-1 +- patchlevel 3046 + * Thu Jun 24 2021 Zdenek Dohnal - 2:8.2.3043-1 - patchlevel 3043 - enable libsodium encryption in Fedora From bc9129dfc7c8176ffdb52a908486e5167c954f8d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 28 Jun 2021 11:41:19 +0200 Subject: [PATCH 032/324] - patchlevel 3070 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e0dd7f21..7a2ec92e 100644 --- a/.gitignore +++ b/.gitignore @@ -361,3 +361,4 @@ /vim-8.2-3009.tar.bz2 /vim-8.2-3043.tar.bz2 /vim-8.2-3046.tar.bz2 +/vim-8.2-3070.tar.bz2 diff --git a/sources b/sources index f729c36b..0aac7e41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3046.tar.bz2) = 439d919483d372575564c0e8c8ff2e57713a25eb52eede705eaf482ab2506906bf2e44142d82626422af3e8fc445c3caee8b677bcef6e9710a82103aa8f8cdf9 +SHA512 (vim-8.2-3070.tar.bz2) = f3a8b2667ddd77bb0bab46fc2f9e4081d99d1ec465ec002ce3720cda72b6d8a15e1c1f17efa4449b1589f4130c01eb21ea62bec2e4f2445c68858f8a1088649d diff --git a/vim.spec b/vim.spec index de4896dd..0aedf134 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3046 +%define patchlevel 3070 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Jun 28 2021 Zdenek Dohnal - 2:8.2.3070-1 +- patchlevel 3070 + * Fri Jun 25 2021 Zdenek Dohnal - 2:8.2.3046-1 - patchlevel 3046 From 97e5abef2dadb56e8d82267aeb4d8cf864907375 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 12 Jul 2021 10:22:28 +0200 Subject: [PATCH 033/324] - patchlevel 3154 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7a2ec92e..12d48a88 100644 --- a/.gitignore +++ b/.gitignore @@ -362,3 +362,4 @@ /vim-8.2-3043.tar.bz2 /vim-8.2-3046.tar.bz2 /vim-8.2-3070.tar.bz2 +/vim-8.2-3154.tar.bz2 diff --git a/sources b/sources index 0aac7e41..15c145d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3070.tar.bz2) = f3a8b2667ddd77bb0bab46fc2f9e4081d99d1ec465ec002ce3720cda72b6d8a15e1c1f17efa4449b1589f4130c01eb21ea62bec2e4f2445c68858f8a1088649d +SHA512 (vim-8.2-3154.tar.bz2) = 00cf6e0beb655eef3854d2eccc9da8371b4bad3496a776df959f11bcbb983ce78f6ed57a01a578a242daa41fd251bc322d15d63a010b8445ecde9a7a1869d00b diff --git a/vim.spec b/vim.spec index 0aedf134..beac0847 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3070 +%define patchlevel 3154 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Jul 12 2021 Zdenek Dohnal - 2:8.2.3154-1 +- patchlevel 3154 + * Mon Jun 28 2021 Zdenek Dohnal - 2:8.2.3070-1 - patchlevel 3070 From e5186e3daf7259d807d496cdb003394eebd42115 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 19 Jul 2021 10:07:35 +0200 Subject: [PATCH 034/324] - patchlevel 3182 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 12d48a88..aad5bb57 100644 --- a/.gitignore +++ b/.gitignore @@ -363,3 +363,4 @@ /vim-8.2-3046.tar.bz2 /vim-8.2-3070.tar.bz2 /vim-8.2-3154.tar.bz2 +/vim-8.2-3182.tar.bz2 diff --git a/sources b/sources index 15c145d5..fb579b23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3154.tar.bz2) = 00cf6e0beb655eef3854d2eccc9da8371b4bad3496a776df959f11bcbb983ce78f6ed57a01a578a242daa41fd251bc322d15d63a010b8445ecde9a7a1869d00b +SHA512 (vim-8.2-3182.tar.bz2) = 293bf06a24a0fda61e05a961c571f06c58bf6c1a2927e6bde1803ecf2b7f6ab4e09069895f1ca2b3835708a01e0ac71b455b42e5df4a2f6fda4307cc637d2e61 diff --git a/vim.spec b/vim.spec index beac0847..8bea1d8b 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3154 +%define patchlevel 3182 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Jul 19 2021 Zdenek Dohnal - 2:8.2.3182-1 +- patchlevel 3182 + * Mon Jul 12 2021 Zdenek Dohnal - 2:8.2.3154-1 - patchlevel 3154 From d9168aabf0a98568be6bb9fea4ee8a29871f197d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:27:32 +0000 Subject: [PATCH 035/324] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 8bea1d8b..9d422e3c 100644 --- a/vim.spec +++ b/vim.spec @@ -29,7 +29,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2:8.2.3182-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jul 19 2021 Zdenek Dohnal - 2:8.2.3182-1 - patchlevel 3182 From e6247da932c1d45076a9ec126f2f5e77e98a93d8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 26 Jul 2021 10:34:05 +0200 Subject: [PATCH 036/324] - patchlevel 3223 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index aad5bb57..8ce727a5 100644 --- a/.gitignore +++ b/.gitignore @@ -364,3 +364,4 @@ /vim-8.2-3070.tar.bz2 /vim-8.2-3154.tar.bz2 /vim-8.2-3182.tar.bz2 +/vim-8.2-3223.tar.bz2 diff --git a/sources b/sources index fb579b23..54b963ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3182.tar.bz2) = 293bf06a24a0fda61e05a961c571f06c58bf6c1a2927e6bde1803ecf2b7f6ab4e09069895f1ca2b3835708a01e0ac71b455b42e5df4a2f6fda4307cc637d2e61 +SHA512 (vim-8.2-3223.tar.bz2) = c442c99e41530b22d76693f0e6de6c9e504caa02d8a7843b4e9ce05e955946ef84852d418439d29baed6e3deb27f840ed2c2cc2a7f646aae2a530e5fd1a2c13b diff --git a/vim.spec b/vim.spec index 9d422e3c..731c04bd 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3182 +%define patchlevel 3223 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -29,7 +29,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Jul 26 2021 Zdenek Dohnal - 2:8.2.3223-1 +- patchlevel 3223 + * Fri Jul 23 2021 Fedora Release Engineering - 2:8.2.3182-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 5a86866977613a0098b78f444e1e53a33baab618 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 2 Aug 2021 10:07:37 +0200 Subject: [PATCH 037/324] - patchlevel 3273 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8ce727a5..1db2f422 100644 --- a/.gitignore +++ b/.gitignore @@ -365,3 +365,4 @@ /vim-8.2-3154.tar.bz2 /vim-8.2-3182.tar.bz2 /vim-8.2-3223.tar.bz2 +/vim-8.2-3273.tar.bz2 diff --git a/sources b/sources index 54b963ff..1172621f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3223.tar.bz2) = c442c99e41530b22d76693f0e6de6c9e504caa02d8a7843b4e9ce05e955946ef84852d418439d29baed6e3deb27f840ed2c2cc2a7f646aae2a530e5fd1a2c13b +SHA512 (vim-8.2-3273.tar.bz2) = 3b634e30c844f939ca04faab3179a1cf7c5e30dd8ae5b7dc2fa6a42b3a883071ef994a116265ac659f9eaefe77f9fd533c5a8d4d00371e89642a22aa342c2626 diff --git a/vim.spec b/vim.spec index 731c04bd..9a63c272 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3223 +%define patchlevel 3273 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Aug 02 2021 Zdenek Dohnal - 2:8.2.3273-1 +- patchlevel 3273 + * Mon Jul 26 2021 Zdenek Dohnal - 2:8.2.3223-1 - patchlevel 3223 From 5cf3406dff655a1ada8c08cad5629687a3fd7e72 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 5 Aug 2021 09:34:10 +0200 Subject: [PATCH 038/324] - patchlevel 3290 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1db2f422..e3027e02 100644 --- a/.gitignore +++ b/.gitignore @@ -366,3 +366,4 @@ /vim-8.2-3182.tar.bz2 /vim-8.2-3223.tar.bz2 /vim-8.2-3273.tar.bz2 +/vim-8.2-3290.tar.bz2 diff --git a/sources b/sources index 1172621f..d24c2877 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3273.tar.bz2) = 3b634e30c844f939ca04faab3179a1cf7c5e30dd8ae5b7dc2fa6a42b3a883071ef994a116265ac659f9eaefe77f9fd533c5a8d4d00371e89642a22aa342c2626 +SHA512 (vim-8.2-3290.tar.bz2) = 53a62ef4f9f7c2090436cbcfa49f449c2d5aa2e119d051a00e6206ba3cd8941437df5016f5fe4046eaa7c2d720a910a5080ecb21105280f019e3660ba9893972 diff --git a/vim.spec b/vim.spec index 9a63c272..cdb9a6aa 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3273 +%define patchlevel 3290 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Aug 05 2021 Zdenek Dohnal - 2:8.2.3290-1 +- patchlevel 3290 + * Mon Aug 02 2021 Zdenek Dohnal - 2:8.2.3273-1 - patchlevel 3273 From 6c0d1be6dcf7086a060da487cbdffc0c7a835c90 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 9 Aug 2021 10:03:55 +0200 Subject: [PATCH 039/324] - patchlevel 3318 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e3027e02..8c27448e 100644 --- a/.gitignore +++ b/.gitignore @@ -367,3 +367,4 @@ /vim-8.2-3223.tar.bz2 /vim-8.2-3273.tar.bz2 /vim-8.2-3290.tar.bz2 +/vim-8.2-3318.tar.bz2 diff --git a/sources b/sources index d24c2877..6e8fe328 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3290.tar.bz2) = 53a62ef4f9f7c2090436cbcfa49f449c2d5aa2e119d051a00e6206ba3cd8941437df5016f5fe4046eaa7c2d720a910a5080ecb21105280f019e3660ba9893972 +SHA512 (vim-8.2-3318.tar.bz2) = 050f11c8f0058630833b985a0c7c99a7b92d0747e3de59e3b7be4ccc47dca39fe675b033012d7affaf42f3e6655923a113225ba36ddc33b0b95edd01422df291 diff --git a/vim.spec b/vim.spec index cdb9a6aa..63a5fdcb 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3290 +%define patchlevel 3318 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Aug 09 2021 Zdenek Dohnal - 2:8.2.3318-1 +- patchlevel 3318 + * Thu Aug 05 2021 Zdenek Dohnal - 2:8.2.3290-1 - patchlevel 3290 From 24742bff3c9ce54d2809f0eff3d75d3af9bbf302 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 16 Aug 2021 14:52:29 +0200 Subject: [PATCH 040/324] vim-update.sh: add F35 --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index b86818f4..d67b31c2 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,10 +1,10 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f34" "f33" ) -releases=( "fc35" "fc34" "fc33" ) -regexps=( "fc35" "\|fc34" "\|fc33" ) -bodhi_enabled=( "0" "1" "1" ) +branches=( "rawhide" "f35" "f34" "f33" ) +releases=( "fc36" "fc35" "fc34" "fc33" ) +regexps=( "fc36" "\|fc35" "\|fc34" "\|fc33" ) +bodhi_enabled=( "0" "0" "1" "1" ) #releases_regexp=fc28\\\|fc27\\\|fc28 branches_index=0 From 7d682aee505ab85087238daf4e10e332038a198a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 16 Aug 2021 14:59:17 +0200 Subject: [PATCH 041/324] - patchlevel 3354 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8c27448e..3f68876e 100644 --- a/.gitignore +++ b/.gitignore @@ -368,3 +368,4 @@ /vim-8.2-3273.tar.bz2 /vim-8.2-3290.tar.bz2 /vim-8.2-3318.tar.bz2 +/vim-8.2-3354.tar.bz2 diff --git a/sources b/sources index 6e8fe328..87dec5ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3318.tar.bz2) = 050f11c8f0058630833b985a0c7c99a7b92d0747e3de59e3b7be4ccc47dca39fe675b033012d7affaf42f3e6655923a113225ba36ddc33b0b95edd01422df291 +SHA512 (vim-8.2-3354.tar.bz2) = 2276a8c8a4fd7a3a7e3726ec444623ff67ede12a5fd0e370d663c9f01602b8a89abf8a0af91596854663c6024751624970aaf8050df8795ce14a4fa028f2ea39 diff --git a/vim.spec b/vim.spec index 63a5fdcb..4cd95b33 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3318 +%define patchlevel 3354 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Aug 16 2021 Zdenek Dohnal - 2:8.2.3354-1 +- patchlevel 3354 + * Mon Aug 09 2021 Zdenek Dohnal - 2:8.2.3318-1 - patchlevel 3318 From 5b54ca2b80d9bf9f46feaca1dfa93e603f0648b6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 23 Aug 2021 15:23:26 +0200 Subject: [PATCH 042/324] - patchlevel 3367 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3f68876e..febfc5bf 100644 --- a/.gitignore +++ b/.gitignore @@ -369,3 +369,4 @@ /vim-8.2-3290.tar.bz2 /vim-8.2-3318.tar.bz2 /vim-8.2-3354.tar.bz2 +/vim-8.2-3367.tar.bz2 diff --git a/sources b/sources index 87dec5ca..9fc9f6d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3354.tar.bz2) = 2276a8c8a4fd7a3a7e3726ec444623ff67ede12a5fd0e370d663c9f01602b8a89abf8a0af91596854663c6024751624970aaf8050df8795ce14a4fa028f2ea39 +SHA512 (vim-8.2-3367.tar.bz2) = d553d15dd8ffa34470ee53d391fe69563719a05910332df37b4e2684d4f9f547d50568ff094665a56cda7581663dce9e8a50e46d8270c4e851a643caaa9f9d12 diff --git a/vim.spec b/vim.spec index 4cd95b33..2d64c0d0 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3354 +%define patchlevel 3367 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Aug 23 2021 Zdenek Dohnal - 2:8.2.3367-1 +- patchlevel 3367 + * Mon Aug 16 2021 Zdenek Dohnal - 2:8.2.3354-1 - patchlevel 3354 From b8f6c600dcd4cb5e0d9fc545aae154e8feee41a5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 31 Aug 2021 12:03:39 +0200 Subject: [PATCH 043/324] F35 bodhi enablement --- vim-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim-update.sh b/vim-update.sh index d67b31c2..d53b510b 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -4,7 +4,7 @@ debug="" branches=( "rawhide" "f35" "f34" "f33" ) releases=( "fc36" "fc35" "fc34" "fc33" ) regexps=( "fc36" "\|fc35" "\|fc34" "\|fc33" ) -bodhi_enabled=( "0" "0" "1" "1" ) +bodhi_enabled=( "0" "1" "1" "1" ) #releases_regexp=fc28\\\|fc27\\\|fc28 branches_index=0 From 6d0292e6f602e16ad1c66dccf4417da71bdc9d61 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 1 Sep 2021 11:45:45 +0200 Subject: [PATCH 044/324] - patchlevel 3391 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index febfc5bf..efab9774 100644 --- a/.gitignore +++ b/.gitignore @@ -370,3 +370,4 @@ /vim-8.2-3318.tar.bz2 /vim-8.2-3354.tar.bz2 /vim-8.2-3367.tar.bz2 +/vim-8.2-3391.tar.bz2 diff --git a/sources b/sources index 9fc9f6d8..e8dca886 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3367.tar.bz2) = d553d15dd8ffa34470ee53d391fe69563719a05910332df37b4e2684d4f9f547d50568ff094665a56cda7581663dce9e8a50e46d8270c4e851a643caaa9f9d12 +SHA512 (vim-8.2-3391.tar.bz2) = bd35ac03fe208e1c967854fe979e2b9d1f093f9872ebbce84e0917ecc73763a199ae82298e9fabbaae26a83b55b02853f43bc505310d485af01fee03339f1329 diff --git a/vim.spec b/vim.spec index 2d64c0d0..c371dd4c 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3367 +%define patchlevel 3391 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Sep 01 2021 Zdenek Dohnal - 2:8.2.3391-1 +- patchlevel 3391 + * Mon Aug 23 2021 Zdenek Dohnal - 2:8.2.3367-1 - patchlevel 3367 From bbe1b8589d749ef2df50bc718e59406594ed8405 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 6 Sep 2021 10:06:56 +0200 Subject: [PATCH 045/324] - patchlevel 3404 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index efab9774..ca6d56dc 100644 --- a/.gitignore +++ b/.gitignore @@ -371,3 +371,4 @@ /vim-8.2-3354.tar.bz2 /vim-8.2-3367.tar.bz2 /vim-8.2-3391.tar.bz2 +/vim-8.2-3404.tar.bz2 diff --git a/sources b/sources index e8dca886..53203933 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3391.tar.bz2) = bd35ac03fe208e1c967854fe979e2b9d1f093f9872ebbce84e0917ecc73763a199ae82298e9fabbaae26a83b55b02853f43bc505310d485af01fee03339f1329 +SHA512 (vim-8.2-3404.tar.bz2) = 0416fca36db49e7666c20b26bff6ccfe687f4d16ff83452cd28452b2b79c8236f1ea30593343ecac6c8bd250e54c2ec2d9e5d33aa501d0c59781835cf7c2e53e diff --git a/vim.spec b/vim.spec index c371dd4c..855221cd 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3391 +%define patchlevel 3404 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -906,6 +906,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Sep 06 2021 Zdenek Dohnal - 2:8.2.3404-1 +- patchlevel 3404 + * Wed Sep 01 2021 Zdenek Dohnal - 2:8.2.3391-1 - patchlevel 3391 From 3d7b0a4bb00c1035bc11470ebab86f23d2715344 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 17 Sep 2021 08:04:30 +0200 Subject: [PATCH 046/324] vim-7.4-syntax.patch: Sent upstream with test --- vim-7.4-syntax.patch | 40 ++++++++++++++++++++++++++++++++++++---- vim.spec | 1 + 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/vim-7.4-syntax.patch b/vim-7.4-syntax.patch index 5131c803..2cd370f7 100644 --- a/vim-7.4-syntax.patch +++ b/vim-7.4-syntax.patch @@ -1,11 +1,43 @@ ---- 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 @@ +From c669d497d34e4b57f40c19d58e3703401075a6d5 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Fri, 17 Sep 2021 07:54:56 +0200 +Subject: [PATCH] runtime/filetype.vim: Register more httpd files as apache + filetype + +Several files under /etc/httpd wasn't recognized as 'apache' filetype - +add them to filetype.vim and add tests for checking if recognizition +works. +--- + runtime/filetype.vim | 2 +- + src/testdir/test_filetype.vim | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/runtime/filetype.vim b/runtime/filetype.vim +index d0d40539d..39a772740 100644 +--- a/runtime/filetype.vim ++++ b/runtime/filetype.vim +@@ -2138,7 +2138,7 @@ au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle') " 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') ++au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.*/*,*/etc/httpd/mods-*/*,*/etc/httpd/sites-*/*,*/etc/httpd/conf.d/*.conf* call s:StarSetf('apache') " Asterisk config file au BufNewFile,BufRead *asterisk/*.conf* call s:StarSetf('asterisk') +diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim +index cd6e71d1b..f1404808f 100644 +--- a/src/testdir/test_filetype.vim ++++ b/src/testdir/test_filetype.vim +@@ -59,7 +59,7 @@ let s:filename_checks = { + \ 'aml': ['file.aml'], + \ 'ampl': ['file.run'], + \ 'ant': ['build.xml'], +- \ 'apache': ['.htaccess', '/etc/httpd/file.conf', '/etc/apache2/sites-2/file.com', '/etc/apache2/some.config', '/etc/apache2/conf.file/conf', '/etc/apache2/mods-some/file', '/etc/apache2/sites-some/file', '/etc/httpd/conf.d/file.config', '/etc/apache2/conf.file/file', '/etc/apache2/file.conf', '/etc/apache2/file.conf-file', '/etc/apache2/mods-file/file', '/etc/apache2/sites-file/file', '/etc/apache2/sites-file/file.com', '/etc/httpd/conf.d/file.conf', '/etc/httpd/conf.d/file.conf-file', 'access.conf', 'access.conf-file', 'any/etc/apache2/conf.file/file', 'any/etc/apache2/file.conf', 'any/etc/apache2/file.conf-file', 'any/etc/apache2/mods-file/file', 'any/etc/apache2/sites-file/file', 'any/etc/apache2/sites-file/file.com', 'any/etc/httpd/conf.d/file.conf', 'any/etc/httpd/conf.d/file.conf-file', 'any/etc/httpd/file.conf', 'apache.conf', 'apache.conf-file', 'apache2.conf', 'apache2.conf-file', 'httpd.conf', 'httpd.conf-file', 'srm.conf', 'srm.conf-file'], ++ \ 'apache': ['.htaccess', '/etc/httpd/file.conf', '/etc/apache2/sites-2/file.com', '/etc/apache2/some.config', '/etc/apache2/conf.file/conf', '/etc/apache2/mods-some/file', '/etc/apache2/sites-some/file', '/etc/httpd/conf.d/file.config', '/etc/apache2/conf.file/file', '/etc/apache2/file.conf', '/etc/apache2/file.conf-file', '/etc/apache2/mods-file/file', '/etc/apache2/sites-file/file', '/etc/apache2/sites-file/file.com', '/etc/httpd/conf.d/file.conf', '/etc/httpd/conf.d/file.conf-file', 'access.conf', 'access.conf-file', 'any/etc/apache2/conf.file/file', 'any/etc/apache2/file.conf', 'any/etc/apache2/file.conf-file', 'any/etc/apache2/mods-file/file', 'any/etc/apache2/sites-file/file', 'any/etc/apache2/sites-file/file.com', 'any/etc/httpd/conf.d/file.conf', 'any/etc/httpd/conf.d/file.conf-file', 'any/etc/httpd/file.conf', 'apache.conf', 'apache.conf-file', 'apache2.conf', 'apache2.conf-file', 'httpd.conf', 'httpd.conf-file', 'srm.conf', 'srm.conf-file', '/etc/httpd/mods-some/file', '/etc/httpd/sites-some/file', '/etc/httpd/conf.file/conf'], + \ 'apachestyle': ['/etc/proftpd/file.config,/etc/proftpd/conf.file/file', '/etc/proftpd/conf.file/file', '/etc/proftpd/file.conf', '/etc/proftpd/file.conf-file', 'any/etc/proftpd/conf.file/file', 'any/etc/proftpd/file.conf', 'any/etc/proftpd/file.conf-file', 'proftpd.conf', 'proftpd.conf-file'], + \ 'applescript': ['file.scpt'], + \ 'aptconf': ['apt.conf', '/.aptitude/config', 'any/.aptitude/config'], +-- +2.31.1 + diff --git a/vim.spec b/vim.spec index 855221cd..bb2cddc3 100644 --- a/vim.spec +++ b/vim.spec @@ -59,6 +59,7 @@ Patch2011: vim-7.0-hunspell.patch BuildRequires: hunspell-devel %endif +# reported upstream as https://github.com/vim/vim/pull/8882 Patch3000: vim-7.4-syntax.patch Patch3002: vim-7.4-nowarnings.patch Patch3004: vim-7.0-rclocation.patch From 405468dc2e544dab9e2bac783065c512c68d5f1e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 17 Sep 2021 09:44:07 +0200 Subject: [PATCH 047/324] vim-7.0-rclocation.patch: Remove downstream patch Removal of downstream patch - new /usr/share/vim/{vimrc,virc} symlinks are created for loading /etc/{vimrc,virc}. New symlinks point to original files in /etc. The overhead is needed for getting rid of the patch and for test suite, because setting VIMRCLOC and VIMRUNTIMEDIR during build doesn't work - vim then always looks into VIMRUNTIMEDIR for vimrc, and upstream doesn't want to change this (see https://github.com/vim/vim/issues/8878) --- vim-7.0-rclocation.patch | 15 --------------- vim.spec | 31 ++++++++++++++++--------------- 2 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 vim-7.0-rclocation.patch diff --git a/vim-7.0-rclocation.patch b/vim-7.0-rclocation.patch deleted file mode 100644 index 840f53e8..00000000 --- a/vim-7.0-rclocation.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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.spec b/vim.spec index bb2cddc3..c80c1905 100644 --- a/vim.spec +++ b/vim.spec @@ -62,7 +62,6 @@ BuildRequires: hunspell-devel # reported upstream as https://github.com/vim/vim/pull/8882 Patch3000: vim-7.4-syntax.patch Patch3002: vim-7.4-nowarnings.patch -Patch3004: vim-7.0-rclocation.patch Patch3007: vim-7.4-fstabsyntax.patch Patch3008: vim-7.4-syncolor.patch Patch3010: vim-7.3-manpage-typo-668894-675480.patch @@ -328,7 +327,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3000 -p1 %patch3002 -p1 -b .nowarnings -%patch3004 -p1 %patch3007 -p1 -b .fstabsyntax %patch3008 -p1 -b .syncolor %patch3010 -p1 @@ -343,14 +341,10 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk cd src autoconf -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 @@ -365,7 +359,8 @@ cp -f ex_cmds.c ex_cmds.c.save # --disable-gpm - disabling support for General Purpose Mouse - Linux mouse daemon perl -pi -e "s/vimrc/virc/" os_unix.h -%configure --prefix=%{_prefix} --with-features=small --with-x=no \ +%configure \ + --prefix=%{_prefix} --with-features=small --with-x=no \ --enable-multibyte \ --disable-netbeans \ %if %{WITH_SELINUX} @@ -382,19 +377,19 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --disable-canberra \ --disable-libsodium -%make_build VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} +%make_build cp vim minimal-vim make clean mv -f os_unix.h.save os_unix.h -mv -f ex_cmds.c.save ex_cmds.c # 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 \ +%configure \ + --with-features=huge \ --enable-python3interp=dynamic \ --enable-perlinterp=dynamic \ --disable-tclinterp --with-x=yes \ @@ -432,11 +427,12 @@ mv -f ex_cmds.c.save ex_cmds.c --enable-fail-if-missing \ --enable-canberra -%make_build VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} +%make_build cp vim gvim make clean -%configure --prefix=%{_prefix} --with-features=huge \ +%configure \ + --prefix=%{_prefix} --with-features=huge \ --enable-python3interp=dynamic \ --enable-perlinterp=dynamic \ --disable-tclinterp \ @@ -474,7 +470,7 @@ make clean --enable-fail-if-missing \ --disable-canberra -%make_build VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} +%make_build cp vim enhanced-vim %install @@ -491,11 +487,11 @@ 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} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} STRIP=/bin/true +%make_install BINDIR=%{_bindir} STRIP=/bin/true # make install creates vim binary and view symlink, they will be wrappers # so remove them here %{_bindir}/rm -f %{buildroot}%{_bindir}/{vim,view} -make installgtutorbin DESTDIR=%{buildroot} BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} +make installgtutorbin DESTDIR=%{buildroot} BINDIR=%{_bindir} mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps mkdir -p %{buildroot}%{_libexecdir} install -m755 minimal-vim %{buildroot}%{_libexecdir}/vi @@ -634,6 +630,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ install -p -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/virc install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/vimrc +ln -sf %{_sysconfdir}/virc %{buildroot}/%{_datadir}/%{name}/virc +ln -sf %{_sysconfdir}/vimrc %{buildroot}/%{_datadir}/%{name}/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 @@ -689,6 +688,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %doc runtime/docs %dir %{_datadir}/%{name} %{_datadir}/%{name}/vimfiles/template.spec +%{_datadir}/%{name}/vimrc %dir %{_datadir}/%{name}/%{vimdir} %{_datadir}/%{name}/%{vimdir}/rgb.txt %{_datadir}/%{name}/%{vimdir}/autoload @@ -837,6 +837,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_bindir}/vi %{_bindir}/view %{_datadir}/%{name}/%{vimdir}/defaults.vim +%{_datadir}/%{name}/virc %{_libexecdir}/vi %{_mandir}/man1/vi.* %{_mandir}/man1/ex.* From 5135ccc327b00bb628d2d66fa0e26708e30eaab9 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 20 Sep 2021 10:40:19 +0200 Subject: [PATCH 048/324] vim-7.4-nowarnings.patch: Remove downstream patch The patch breaks upstream test suite and I wasn't able to track why it was added. --- vim-7.4-nowarnings.patch | 11 ----------- vim.spec | 2 -- 2 files changed, 13 deletions(-) delete mode 100644 vim-7.4-nowarnings.patch diff --git a/vim-7.4-nowarnings.patch b/vim-7.4-nowarnings.patch deleted file mode 100644 index fc4315a7..00000000 --- a/vim-7.4-nowarnings.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up vim82/src/ex_docmd.c.nowarnings vim82/src/ex_docmd.c ---- vim82/src/ex_docmd.c.nowarnings 2020-07-28 11:42:07.437603829 +0200 -+++ vim82/src/ex_docmd.c 2020-07-28 11:44:25.432201129 +0200 -@@ -4020,6 +4020,7 @@ get_flags(exarg_T *eap) - void - ex_ni(exarg_T *eap) - { -+ return; - if (!eap->skip) - eap->errmsg = - _("E319: Sorry, the command is not available in this version"); diff --git a/vim.spec b/vim.spec index c80c1905..c993dbce 100644 --- a/vim.spec +++ b/vim.spec @@ -61,7 +61,6 @@ BuildRequires: hunspell-devel # reported upstream as https://github.com/vim/vim/pull/8882 Patch3000: vim-7.4-syntax.patch -Patch3002: vim-7.4-nowarnings.patch Patch3007: vim-7.4-fstabsyntax.patch Patch3008: vim-7.4-syncolor.patch Patch3010: vim-7.3-manpage-typo-668894-675480.patch @@ -326,7 +325,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %endif %patch3000 -p1 -%patch3002 -p1 -b .nowarnings %patch3007 -p1 -b .fstabsyntax %patch3008 -p1 -b .syncolor %patch3010 -p1 From c39933690f4f165c44ac960b85151b8c32a7e0e3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 21 Sep 2021 08:56:29 +0200 Subject: [PATCH 049/324] vim-7.4-syncolor.patch: remove downstream patch Remove a downstream patch which changed colors in 'vim -d' and 'vimdiff' - it breaks upstream test suite and the diff is readable without it, so IMO it is sufficient for its removal. --- vim-7.4-syncolor.patch | 26 -------------------------- vim.spec | 2 -- 2 files changed, 28 deletions(-) delete mode 100644 vim-7.4-syncolor.patch diff --git a/vim-7.4-syncolor.patch b/vim-7.4-syncolor.patch deleted file mode 100644 index b41f2fe3..00000000 --- a/vim-7.4-syncolor.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/highlight.c b/src/highlight.c -index 9322f96..f7147a0 100644 ---- a/src/highlight.c -+++ b/src/highlight.c -@@ -211,8 +211,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", -@@ -304,8 +304,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.spec b/vim.spec index c993dbce..97eb297d 100644 --- a/vim.spec +++ b/vim.spec @@ -62,7 +62,6 @@ BuildRequires: hunspell-devel # reported upstream as https://github.com/vim/vim/pull/8882 Patch3000: vim-7.4-syntax.patch Patch3007: vim-7.4-fstabsyntax.patch -Patch3008: vim-7.4-syncolor.patch Patch3010: vim-7.3-manpage-typo-668894-675480.patch Patch3011: vim-manpagefixes-948566.patch Patch3013: vim-7.4-globalsyntax.patch @@ -326,7 +325,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3000 -p1 %patch3007 -p1 -b .fstabsyntax -%patch3008 -p1 -b .syncolor %patch3010 -p1 %patch3011 -p1 %patch3013 -p1 From d987486be7145ff30ee135c97f8073d41d50902e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 22 Sep 2021 08:20:28 +0200 Subject: [PATCH 050/324] Revert "vim-7.4-syncolor.patch: remove downstream patch" This reverts commit c39933690f4f165c44ac960b85151b8c32a7e0e3. --- vim-7.4-syncolor.patch | 26 ++++++++++++++++++++++++++ vim.spec | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 vim-7.4-syncolor.patch diff --git a/vim-7.4-syncolor.patch b/vim-7.4-syncolor.patch new file mode 100644 index 00000000..b41f2fe3 --- /dev/null +++ b/vim-7.4-syncolor.patch @@ -0,0 +1,26 @@ +diff --git a/src/highlight.c b/src/highlight.c +index 9322f96..f7147a0 100644 +--- a/src/highlight.c ++++ b/src/highlight.c +@@ -211,8 +211,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", +@@ -304,8 +304,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.spec b/vim.spec index 97eb297d..c993dbce 100644 --- a/vim.spec +++ b/vim.spec @@ -62,6 +62,7 @@ BuildRequires: hunspell-devel # reported upstream as https://github.com/vim/vim/pull/8882 Patch3000: vim-7.4-syntax.patch Patch3007: vim-7.4-fstabsyntax.patch +Patch3008: vim-7.4-syncolor.patch Patch3010: vim-7.3-manpage-typo-668894-675480.patch Patch3011: vim-manpagefixes-948566.patch Patch3013: vim-7.4-globalsyntax.patch @@ -325,6 +326,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3000 -p1 %patch3007 -p1 -b .fstabsyntax +%patch3008 -p1 -b .syncolor %patch3010 -p1 %patch3011 -p1 %patch3013 -p1 From 2731506cd4734b857ba81e4ffb24b2076f342be7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 23 Sep 2021 14:27:03 +0200 Subject: [PATCH 051/324] vim.spec: Fix absolute links during build --- vim.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/vim.spec b/vim.spec index c993dbce..5adc1783 100644 --- a/vim.spec +++ b/vim.spec @@ -549,12 +549,16 @@ SentUpstream: 2014-05-22 EOF +mkdir -p %{buildroot}%{_sysconfdir} +install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/virc +install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vimrc + ( cd %{buildroot} - ln -sf %{_libexecdir}/vi .%{_bindir}/rvi - ln -sf %{_libexecdir}/vi .%{_bindir}/rview - ln -sf %{_libexecdir}/vi .%{_bindir}/ex - ln -sf %{_bindir}/vim .%{_bindir}/rvim - ln -sf %{_bindir}/vim .%{_bindir}/vimdiff + ln -sf .%{_libexecdir}/vi .%{_bindir}/rvi + ln -sf .%{_libexecdir}/vi .%{_bindir}/rview + ln -sf .%{_libexecdir}/vi .%{_bindir}/ex + ln -sf .%{_bindir}/vim .%{_bindir}/rvim + ln -sf .%{_bindir}/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 @@ -568,6 +572,10 @@ EOF ln -sf gvim ./%{_bindir}/evim ln -sf gvim ./%{_bindir}/gvimdiff ln -sf gvim ./%{_bindir}/vimx + + ln -sf .%{_sysconfdir}/virc .%{_datadir}/%{name}/virc + ln -sf .%{_sysconfdir}/vimrc .%{_datadir}/%{name}/vimrc + %if "%{desktop_file}" == "1" desktop-file-install \ --dir %{buildroot}/%{_datadir}/applications \ @@ -614,8 +622,6 @@ chmod 644 %{buildroot}/%{_datadir}/%{name}/%{vimdir}/doc/vim2html.pl \ %{buildroot}/%{_datadir}/%{name}/%{vimdir}/tools/vim132 chmod 644 ../runtime/doc/vim2html.pl -mkdir -p %{buildroot}/%{_sysconfdir} - %if %{with default_editor} mkdir -p %{buildroot}/%{_sysconfdir}/profile.d install -p -m644 %{SOURCE9} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.sh @@ -625,12 +631,6 @@ install -p -m644 %{SOURCE11} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-def mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %endif -install -p -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/virc -install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/vimrc - -ln -sf %{_sysconfdir}/virc %{buildroot}/%{_datadir}/%{name}/virc -ln -sf %{_sysconfdir}/vimrc %{buildroot}/%{_datadir}/%{name}/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 From 17a8502ba1d84edaa5f94fba35fcf035cc842794 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 23 Sep 2021 14:28:38 +0200 Subject: [PATCH 052/324] vim-7.4-syncolor.patch: Really remove the downstream patch Other test suite errors were caused by another downstream patch, so remove this one again. --- vim-7.4-syncolor.patch | 26 -------------------------- vim.spec | 2 -- 2 files changed, 28 deletions(-) delete mode 100644 vim-7.4-syncolor.patch diff --git a/vim-7.4-syncolor.patch b/vim-7.4-syncolor.patch deleted file mode 100644 index b41f2fe3..00000000 --- a/vim-7.4-syncolor.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/highlight.c b/src/highlight.c -index 9322f96..f7147a0 100644 ---- a/src/highlight.c -+++ b/src/highlight.c -@@ -211,8 +211,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", -@@ -304,8 +304,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.spec b/vim.spec index 5adc1783..06582a6b 100644 --- a/vim.spec +++ b/vim.spec @@ -62,7 +62,6 @@ BuildRequires: hunspell-devel # reported upstream as https://github.com/vim/vim/pull/8882 Patch3000: vim-7.4-syntax.patch Patch3007: vim-7.4-fstabsyntax.patch -Patch3008: vim-7.4-syncolor.patch Patch3010: vim-7.3-manpage-typo-668894-675480.patch Patch3011: vim-manpagefixes-948566.patch Patch3013: vim-7.4-globalsyntax.patch @@ -326,7 +325,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3000 -p1 %patch3007 -p1 -b .fstabsyntax -%patch3008 -p1 -b .syncolor %patch3010 -p1 %patch3011 -p1 %patch3013 -p1 From 1ec0e33929ddc4dbfdd0adaab722dc26d7edd829 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 23 Sep 2021 14:35:23 +0200 Subject: [PATCH 053/324] remove downstream patch vim-8.0-copypaste.patch The patch used to remove 'new' (since 2017) mouse behavior in Vim, which is applied only if user vimrc (~/.vimrc) doesn't exist. The patch removal puts the behavior new behavior back. Block copying with new mouse behavior is done by Shift+(mark the text with mouse). For pasting in Vim enter insert mode and press Shift+Insert, or for pasting in other terminal click on middle mouse button. The new behavior can be bypassed by creating user .vimrc or setting skip_defaults_vim, see ':help defaults.vim' in Vim. --- vim-8.0-copy-paste.patch | 22 ---------------------- vim.spec | 7 ++++--- 2 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 vim-8.0-copy-paste.patch diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch deleted file mode 100644 index 203cbb7c..00000000 --- a/vim-8.0-copy-paste.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up vim82/runtime/defaults.vim.copypaste vim82/runtime/defaults.vim ---- vim82/runtime/defaults.vim.copypaste 2020-10-06 17:03:19.276066889 +0200 -+++ vim82/runtime/defaults.vim 2020-10-06 17:04:30.437448603 +0200 -@@ -73,18 +73,6 @@ map Q gq - " Revert with ":iunmap ". - inoremap 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 --endif -- - " Only do this part when Vim was compiled with the +eval feature. - if 1 - diff --git a/vim.spec b/vim.spec index 06582a6b..16396385 100644 --- a/vim.spec +++ b/vim.spec @@ -29,7 +29,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -66,7 +66,6 @@ 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 # fips warning @@ -329,7 +328,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3011 -p1 %patch3013 -p1 %patch3014 -p1 -%patch3016 -p1 -b .copypaste %patch3017 -p1 -b .python-tests %patch3018 -p1 -b .fips-warning @@ -904,6 +902,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Sep 23 2021 Zdenek Dohnal - 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 - 2:8.2.3404-1 - patchlevel 3404 From 158097f739dd02d7a8ebfd2d10e91dc32ee09c73 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 23 Sep 2021 14:44:19 +0200 Subject: [PATCH 054/324] vim-7.4-syntax.patch: remove downstream patch, got merged upstream --- vim-7.4-syntax.patch | 43 ------------------------------------------- vim.spec | 3 --- 2 files changed, 46 deletions(-) delete mode 100644 vim-7.4-syntax.patch diff --git a/vim-7.4-syntax.patch b/vim-7.4-syntax.patch deleted file mode 100644 index 2cd370f7..00000000 --- a/vim-7.4-syntax.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c669d497d34e4b57f40c19d58e3703401075a6d5 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Fri, 17 Sep 2021 07:54:56 +0200 -Subject: [PATCH] runtime/filetype.vim: Register more httpd files as apache - filetype - -Several files under /etc/httpd wasn't recognized as 'apache' filetype - -add them to filetype.vim and add tests for checking if recognizition -works. ---- - runtime/filetype.vim | 2 +- - src/testdir/test_filetype.vim | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/runtime/filetype.vim b/runtime/filetype.vim -index d0d40539d..39a772740 100644 ---- a/runtime/filetype.vim -+++ b/runtime/filetype.vim -@@ -2138,7 +2138,7 @@ au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle') - - " 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/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.*/*,*/etc/httpd/mods-*/*,*/etc/httpd/sites-*/*,*/etc/httpd/conf.d/*.conf* call s:StarSetf('apache') - - " Asterisk config file - au BufNewFile,BufRead *asterisk/*.conf* call s:StarSetf('asterisk') -diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim -index cd6e71d1b..f1404808f 100644 ---- a/src/testdir/test_filetype.vim -+++ b/src/testdir/test_filetype.vim -@@ -59,7 +59,7 @@ let s:filename_checks = { - \ 'aml': ['file.aml'], - \ 'ampl': ['file.run'], - \ 'ant': ['build.xml'], -- \ 'apache': ['.htaccess', '/etc/httpd/file.conf', '/etc/apache2/sites-2/file.com', '/etc/apache2/some.config', '/etc/apache2/conf.file/conf', '/etc/apache2/mods-some/file', '/etc/apache2/sites-some/file', '/etc/httpd/conf.d/file.config', '/etc/apache2/conf.file/file', '/etc/apache2/file.conf', '/etc/apache2/file.conf-file', '/etc/apache2/mods-file/file', '/etc/apache2/sites-file/file', '/etc/apache2/sites-file/file.com', '/etc/httpd/conf.d/file.conf', '/etc/httpd/conf.d/file.conf-file', 'access.conf', 'access.conf-file', 'any/etc/apache2/conf.file/file', 'any/etc/apache2/file.conf', 'any/etc/apache2/file.conf-file', 'any/etc/apache2/mods-file/file', 'any/etc/apache2/sites-file/file', 'any/etc/apache2/sites-file/file.com', 'any/etc/httpd/conf.d/file.conf', 'any/etc/httpd/conf.d/file.conf-file', 'any/etc/httpd/file.conf', 'apache.conf', 'apache.conf-file', 'apache2.conf', 'apache2.conf-file', 'httpd.conf', 'httpd.conf-file', 'srm.conf', 'srm.conf-file'], -+ \ 'apache': ['.htaccess', '/etc/httpd/file.conf', '/etc/apache2/sites-2/file.com', '/etc/apache2/some.config', '/etc/apache2/conf.file/conf', '/etc/apache2/mods-some/file', '/etc/apache2/sites-some/file', '/etc/httpd/conf.d/file.config', '/etc/apache2/conf.file/file', '/etc/apache2/file.conf', '/etc/apache2/file.conf-file', '/etc/apache2/mods-file/file', '/etc/apache2/sites-file/file', '/etc/apache2/sites-file/file.com', '/etc/httpd/conf.d/file.conf', '/etc/httpd/conf.d/file.conf-file', 'access.conf', 'access.conf-file', 'any/etc/apache2/conf.file/file', 'any/etc/apache2/file.conf', 'any/etc/apache2/file.conf-file', 'any/etc/apache2/mods-file/file', 'any/etc/apache2/sites-file/file', 'any/etc/apache2/sites-file/file.com', 'any/etc/httpd/conf.d/file.conf', 'any/etc/httpd/conf.d/file.conf-file', 'any/etc/httpd/file.conf', 'apache.conf', 'apache.conf-file', 'apache2.conf', 'apache2.conf-file', 'httpd.conf', 'httpd.conf-file', 'srm.conf', 'srm.conf-file', '/etc/httpd/mods-some/file', '/etc/httpd/sites-some/file', '/etc/httpd/conf.file/conf'], - \ 'apachestyle': ['/etc/proftpd/file.config,/etc/proftpd/conf.file/file', '/etc/proftpd/conf.file/file', '/etc/proftpd/file.conf', '/etc/proftpd/file.conf-file', 'any/etc/proftpd/conf.file/file', 'any/etc/proftpd/file.conf', 'any/etc/proftpd/file.conf-file', 'proftpd.conf', 'proftpd.conf-file'], - \ 'applescript': ['file.scpt'], - \ 'aptconf': ['apt.conf', '/.aptitude/config', 'any/.aptitude/config'], --- -2.31.1 - diff --git a/vim.spec b/vim.spec index 16396385..2b457ade 100644 --- a/vim.spec +++ b/vim.spec @@ -59,8 +59,6 @@ Patch2011: vim-7.0-hunspell.patch BuildRequires: hunspell-devel %endif -# reported upstream as https://github.com/vim/vim/pull/8882 -Patch3000: vim-7.4-syntax.patch Patch3007: vim-7.4-fstabsyntax.patch Patch3010: vim-7.3-manpage-typo-668894-675480.patch Patch3011: vim-manpagefixes-948566.patch @@ -322,7 +320,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %{__tar} xjf %{SOURCE100} %endif -%patch3000 -p1 %patch3007 -p1 -b .fstabsyntax %patch3010 -p1 %patch3011 -p1 From 884135eaa5d738f4abfed31db3b408f9d38d51be Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 23 Sep 2021 14:47:03 +0200 Subject: [PATCH 055/324] vim.spec: fix patch numbering --- vim.spec | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/vim.spec b/vim.spec index 2b457ade..b6bfeacc 100644 --- a/vim.spec +++ b/vim.spec @@ -52,22 +52,22 @@ Source100: vim-spell-files.tar.bz2 %endif -Patch2002: vim-7.0-fixkeys.patch -Patch2003: vim-7.4-specsyntax.patch +Patch2000: vim-7.0-fixkeys.patch +Patch2001: vim-7.4-specsyntax.patch %if %{withhunspell} -Patch2011: vim-7.0-hunspell.patch +Patch2002: vim-7.0-hunspell.patch BuildRequires: hunspell-devel %endif -Patch3007: vim-7.4-fstabsyntax.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 +Patch3000: vim-7.4-fstabsyntax.patch +Patch3001: vim-7.3-manpage-typo-668894-675480.patch +Patch3002: vim-manpagefixes-948566.patch +Patch3003: vim-7.4-globalsyntax.patch +Patch3004: vim-7.4-releasestring-1318991.patch # migrate shebangs in script to /usr/bin/python3 and use python2 when necessary -Patch3017: vim-python3-tests.patch +Patch3005: vim-python3-tests.patch # fips warning -Patch3018: vim-crypto-warning.patch +Patch3006: vim-crypto-warning.patch # uses autoconf in spec file @@ -308,10 +308,10 @@ sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3017} # fix rogue dependencies from sample code chmod -x runtime/tools/mve.awk -%patch2002 -p1 -b .fixkeys -%patch2003 -p1 +%patch2000 -p1 -b .fixkeys +%patch2001 -p1 %if %{withhunspell} -%patch2011 -p1 +%patch2002 -p1 %endif perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk @@ -320,13 +320,13 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %{__tar} xjf %{SOURCE100} %endif -%patch3007 -p1 -b .fstabsyntax -%patch3010 -p1 -%patch3011 -p1 -%patch3013 -p1 -%patch3014 -p1 -%patch3017 -p1 -b .python-tests -%patch3018 -p1 -b .fips-warning +%patch3000 -p1 -b .fstabsyntax +%patch3001 -p1 +%patch3002 -p1 +%patch3003 -p1 +%patch3004 -p1 +%patch3005 -p1 -b .python-tests +%patch3006 -p1 -b .fips-warning %build cd src From 4f081c049e46f9a55eb786365edc0942a6148dd7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 24 Sep 2021 07:29:25 +0200 Subject: [PATCH 056/324] vim.spec: Fix patch number in %%prep --- vim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index b6bfeacc..8c387bb7 100644 --- a/vim.spec +++ b/vim.spec @@ -304,7 +304,7 @@ This subpackage contains files needed to set Vim as the default editor. %setup -q -b 0 -n %{vimdir} # use %%{__python3} macro for defining shebangs in python3 tests -sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3017} +sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3005} # fix rogue dependencies from sample code chmod -x runtime/tools/mve.awk From 1b2faea35de32eb2dd23481bf81216cd7f036934 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 7 Oct 2021 11:08:44 +0200 Subject: [PATCH 057/324] Put the old copy and paste behavior back and update the test suite --- vim-8.0-copy-paste.patch | 79 ++++++++++++++++++++++++++++++++++++++++ vim.spec | 5 ++- 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 vim-8.0-copy-paste.patch diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch new file mode 100644 index 00000000..73870cd5 --- /dev/null +++ b/vim-8.0-copy-paste.patch @@ -0,0 +1,79 @@ +diff --git a/runtime/defaults.vim b/runtime/defaults.vim +index f3c639b..20637e2 100644 +--- a/runtime/defaults.vim ++++ b/runtime/defaults.vim +@@ -73,18 +73,6 @@ map Q gq + " Revert with ":iunmap ". + inoremap 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 +-endif +- + " Only do this part when Vim was compiled with the +eval feature. + if 1 + +diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim +index 319e546..8fcf63c 100644 +--- a/src/testdir/test_balloon.vim ++++ b/src/testdir/test_balloon.vim +@@ -9,6 +9,7 @@ source screendump.vim + CheckScreendump + + 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() balloondelay=100 + func MyBalloonExpr() +diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim +index f13252b..ec755a4 100644 +--- a/src/testdir/test_popupwin.vim ++++ b/src/testdir/test_popupwin.vim +@@ -553,6 +553,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 +@@ -599,6 +600,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 }}}") +@@ -652,6 +654,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', +@@ -1479,6 +1482,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 +@@ -2170,6 +2174,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', diff --git a/vim.spec b/vim.spec index 8c387bb7..bb692abc 100644 --- a/vim.spec +++ b/vim.spec @@ -66,8 +66,10 @@ Patch3003: vim-7.4-globalsyntax.patch Patch3004: vim-7.4-releasestring-1318991.patch # migrate shebangs in script to /usr/bin/python3 and use python2 when necessary Patch3005: vim-python3-tests.patch -# fips warning +# fips warning (Fedora downstream patch) Patch3006: vim-crypto-warning.patch +# don't ever set mouse (Fedora downstream patch) +Patch3007: vim-8.0-copy-paste.patch # uses autoconf in spec file @@ -327,6 +329,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3004 -p1 %patch3005 -p1 -b .python-tests %patch3006 -p1 -b .fips-warning +%patch3007 -p1 -b .copypaste %build cd src From 227a8704640f62d4c9b21e62723a565fc9010093 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 11 Oct 2021 15:58:34 +0200 Subject: [PATCH 058/324] set system vimrc via compiler macros --- vim.spec | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/vim.spec b/vim.spec index bb692abc..ee24dc38 100644 --- a/vim.spec +++ b/vim.spec @@ -353,7 +353,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 \ +%configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/virc\"'" \ --prefix=%{_prefix} --with-features=small --with-x=no \ --enable-multibyte \ --disable-netbeans \ @@ -382,7 +382,7 @@ mv -f os_unix.h.save os_unix.h # it is for multibyte languages in Vim with X # --enable-termtruecolor - use terminal with true colors -%configure \ +%configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ --with-features=huge \ --enable-python3interp=dynamic \ --enable-perlinterp=dynamic \ @@ -425,7 +425,7 @@ mv -f os_unix.h.save os_unix.h cp vim gvim make clean -%configure \ +%configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ --prefix=%{_prefix} --with-features=huge \ --enable-python3interp=dynamic \ --enable-perlinterp=dynamic \ @@ -545,10 +545,6 @@ SentUpstream: 2014-05-22 EOF -mkdir -p %{buildroot}%{_sysconfdir} -install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/virc -install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vimrc - ( cd %{buildroot} ln -sf .%{_libexecdir}/vi .%{_bindir}/rvi ln -sf .%{_libexecdir}/vi .%{_bindir}/rview @@ -569,9 +565,6 @@ install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vimrc ln -sf gvim ./%{_bindir}/gvimdiff ln -sf gvim ./%{_bindir}/vimx - ln -sf .%{_sysconfdir}/virc .%{_datadir}/%{name}/virc - ln -sf .%{_sysconfdir}/vimrc .%{_datadir}/%{name}/vimrc - %if "%{desktop_file}" == "1" desktop-file-install \ --dir %{buildroot}/%{_datadir}/applications \ @@ -618,6 +611,16 @@ chmod 644 %{buildroot}/%{_datadir}/%{name}/%{vimdir}/doc/vim2html.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 + +# 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 @@ -627,12 +630,6 @@ install -p -m644 %{SOURCE11} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-def mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %endif -# 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 - mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/ install -p -m644 %{SOURCE8} %{buildroot}%{_rpmconfigdir}/macros.d/ @@ -682,7 +679,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %doc runtime/docs %dir %{_datadir}/%{name} %{_datadir}/%{name}/vimfiles/template.spec -%{_datadir}/%{name}/vimrc %dir %{_datadir}/%{name}/%{vimdir} %{_datadir}/%{name}/%{vimdir}/rgb.txt %{_datadir}/%{name}/%{vimdir}/autoload @@ -831,7 +827,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_bindir}/vi %{_bindir}/view %{_datadir}/%{name}/%{vimdir}/defaults.vim -%{_datadir}/%{name}/virc %{_libexecdir}/vi %{_mandir}/man1/vi.* %{_mandir}/man1/ex.* @@ -902,6 +897,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Oct 11 2021 Zdenek Dohnal - 2:8.2.3404-2 +- set system vimrc via compiler macros + * Thu Sep 23 2021 Zdenek Dohnal - 2:8.2.3404-2 - remove downstream patch vim-8.0-copypaste.patch - put mouse settings into defaults.vim again From 9250c2cc996c2c00e53c5590a6b957757a3ce3d0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 13 Oct 2021 08:40:26 +0200 Subject: [PATCH 059/324] vim.spec: Use absolute links for vi We cannot use relative links for vi, because the true Vi now lives in /usr/libexec. --- vim.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vim.spec b/vim.spec index ee24dc38..608fda42 100644 --- a/vim.spec +++ b/vim.spec @@ -546,11 +546,11 @@ SentUpstream: 2014-05-22 EOF ( cd %{buildroot} - ln -sf .%{_libexecdir}/vi .%{_bindir}/rvi - ln -sf .%{_libexecdir}/vi .%{_bindir}/rview - ln -sf .%{_libexecdir}/vi .%{_bindir}/ex - ln -sf .%{_bindir}/vim .%{_bindir}/rvim - ln -sf .%{_bindir}/vim .%{_bindir}/vimdiff + 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 rm -f .%{_mandir}/man1/rvim.1 cp -p .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vi.1 From 36cadcf4bf451f59b0d06e6cb9aa2b2e3ca7ef54 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 14 Oct 2021 10:52:52 +0200 Subject: [PATCH 060/324] virc: remove filetype plugin - it doesn't work with vi filetype plugin is written in vimscript, which needs EVAL feature, which is not within the small set of features which Vi is compiled with. --- virc | 3 --- 1 file changed, 3 deletions(-) diff --git a/virc b/virc index 808e7d61..6d779826 100644 --- a/virc +++ b/virc @@ -27,9 +27,6 @@ if has("autocmd") augroup END endif - -filetype plugin on - if &term=="xterm" set t_Co=8 set t_Sb=[4%dm From 823efb9c969f8cc742c71d11c2093c9bd62df4f8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 14 Oct 2021 10:52:52 +0200 Subject: [PATCH 061/324] virc: remove filetype plugin - it doesn't work with vi filetype plugin is written in vimscript, which needs EVAL feature, which is not within the small set of features which Vi is compiled with. --- vim.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vim.spec b/vim.spec index 608fda42..e760bdac 100644 --- a/vim.spec +++ b/vim.spec @@ -897,6 +897,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Oct 14 2021 Zdenek Dohnal - 2:8.2.3404-2 +- remove filetype plugin from virc - it doesn't work with vi + * Mon Oct 11 2021 Zdenek Dohnal - 2:8.2.3404-2 - set system vimrc via compiler macros From 2cb80dd52cb8e9d0f46e0fcad8438900f88dc83d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 15 Oct 2021 06:38:39 +0200 Subject: [PATCH 062/324] vim-python310-new-errmsg.patch: adjust test suite to Python 3.10 New Python 3.10 changes its error messages, which breaks matching in the test suite... --- vim-python310-new-errmsg.patch | 13 +++++++++++++ vim.spec | 9 +++++++++ 2 files changed, 22 insertions(+) create mode 100644 vim-python310-new-errmsg.patch diff --git a/vim-python310-new-errmsg.patch b/vim-python310-new-errmsg.patch new file mode 100644 index 00000000..68c77b30 --- /dev/null +++ b/vim-python310-new-errmsg.patch @@ -0,0 +1,13 @@ +diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim +index 66d5db5..a7b3570 100644 +--- a/src/testdir/test_python3.vim ++++ b/src/testdir/test_python3.vim +@@ -3094,7 +3094,7 @@ func Test_python3_errors() + <<< Finished + > VimForeachRTP + vim.foreach_rtp(None):(, TypeError("'NoneType' object is not callable",)) +- vim.foreach_rtp(NoArgsCall()):(, TypeError('__call__() takes exactly 1 positional argument (2 given)',)) ++ vim.foreach_rtp(NoArgsCall()):(, TypeError('__call__() takes 1 positional argument but 2 were given',)) + vim.foreach_rtp(FailingCall()):(, NotImplementedError('call',)) + vim.foreach_rtp(int, 2):(, TypeError('foreach_rtp() takes exactly one argument (2 given)',)) + > import diff --git a/vim.spec b/vim.spec index e760bdac..81f360c9 100644 --- a/vim.spec +++ b/vim.spec @@ -70,6 +70,8 @@ Patch3005: vim-python3-tests.patch Patch3006: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3007: vim-8.0-copy-paste.patch +# F35+: Python changed the error message which test suite expects +Patch3008: vim-python310-new-errmsg.patch # uses autoconf in spec file @@ -331,6 +333,10 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3006 -p1 -b .fips-warning %patch3007 -p1 -b .copypaste +%if 0%{?fedora} >= 35 +%patch3008 -p1 -b .python310-new-errmsg +%endif + %build cd src autoconf @@ -897,6 +903,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Oct 14 2021 Zdenek Dohnal - 2:8.2.3404-2 +- adjust test suite to Python 3.10 + * Thu Oct 14 2021 Zdenek Dohnal - 2:8.2.3404-2 - remove filetype plugin from virc - it doesn't work with vi From 9118c67b0919edce0503fe92c570e07f346ca8e8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 15 Oct 2021 06:39:48 +0200 Subject: [PATCH 063/324] - patchlevel 3512 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ca6d56dc..7ac9513f 100644 --- a/.gitignore +++ b/.gitignore @@ -372,3 +372,4 @@ /vim-8.2-3367.tar.bz2 /vim-8.2-3391.tar.bz2 /vim-8.2-3404.tar.bz2 +/vim-8.2-3512.tar.bz2 diff --git a/sources b/sources index 53203933..59046239 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3404.tar.bz2) = 0416fca36db49e7666c20b26bff6ccfe687f4d16ff83452cd28452b2b79c8236f1ea30593343ecac6c8bd250e54c2ec2d9e5d33aa501d0c59781835cf7c2e53e +SHA512 (vim-8.2-3512.tar.bz2) = cb3c947c5d6792f5b8c9ba4f31215db596b2881c9bffa6c713569a108a6b59ad92e8710f835e90b23ee696e72de4f4749993ee67e5a04e9e61069026eb379387 diff --git a/vim.spec b/vim.spec index 81f360c9..7ececbb5 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3404 +%define patchlevel 3512 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -29,7 +29,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -903,6 +903,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Oct 15 2021 Zdenek Dohnal - 2:8.2.3512-1 +- patchlevel 3512 + * Thu Oct 14 2021 Zdenek Dohnal - 2:8.2.3404-2 - adjust test suite to Python 3.10 From cb487d0f9185e0f87d0135d4c168f43cdd928849 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 1 Nov 2021 12:04:25 +0100 Subject: [PATCH 064/324] vim.spec: Remove rgb.txt The newest patchlevel doesn't use rgb.txt when getting available colorschemes. Now they're available via v:colorschemes variable and loaded from %{_datadir}/vim/vim82/colors/lists. --- vim.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vim.spec b/vim.spec index 7ececbb5..95a7c172 100644 --- a/vim.spec +++ b/vim.spec @@ -686,7 +686,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %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 From 7b6b7df8ae5d2a0894502f43abe7d9808ee78c8d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 1 Nov 2021 12:20:49 +0100 Subject: [PATCH 065/324] - patchlevel 3568 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7ac9513f..9ce0309a 100644 --- a/.gitignore +++ b/.gitignore @@ -373,3 +373,4 @@ /vim-8.2-3391.tar.bz2 /vim-8.2-3404.tar.bz2 /vim-8.2-3512.tar.bz2 +/vim-8.2-3568.tar.bz2 diff --git a/sources b/sources index 59046239..07e8931a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3512.tar.bz2) = cb3c947c5d6792f5b8c9ba4f31215db596b2881c9bffa6c713569a108a6b59ad92e8710f835e90b23ee696e72de4f4749993ee67e5a04e9e61069026eb379387 +SHA512 (vim-8.2-3568.tar.bz2) = 1e2a1e931c03aa3c9e9380a66dfa3b88556aaec02298e37230fa42720808643b93b927cb8144ca538c565cc6a9ca7b22df709962ce66b5c17c9856ebc0119592 diff --git a/vim.spec b/vim.spec index 95a7c172..fdb9196f 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3512 +%define patchlevel 3568 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -902,6 +902,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Nov 01 2021 Zdenek Dohnal - 2:8.2.3568-1 +- patchlevel 3568 + * Fri Oct 15 2021 Zdenek Dohnal - 2:8.2.3512-1 - patchlevel 3512 From a65558134ae7d1a89a52ae4a027bbb10ac4dd32d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 8 Nov 2021 11:00:53 +0100 Subject: [PATCH 066/324] - patchlevel 3582 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9ce0309a..8aaadc7e 100644 --- a/.gitignore +++ b/.gitignore @@ -374,3 +374,4 @@ /vim-8.2-3404.tar.bz2 /vim-8.2-3512.tar.bz2 /vim-8.2-3568.tar.bz2 +/vim-8.2-3582.tar.bz2 diff --git a/sources b/sources index 07e8931a..7fe392a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3568.tar.bz2) = 1e2a1e931c03aa3c9e9380a66dfa3b88556aaec02298e37230fa42720808643b93b927cb8144ca538c565cc6a9ca7b22df709962ce66b5c17c9856ebc0119592 +SHA512 (vim-8.2-3582.tar.bz2) = b08460bc7c9b6b60bdee842222cc208c972d2bef5b8f8a36bf55123dd88ae839c77847a021a3b1d53e7b440defeb250f977588835c1b2dcf3908916cbd78e947 diff --git a/vim.spec b/vim.spec index fdb9196f..6691b537 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3568 +%define patchlevel 3582 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -902,6 +902,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Nov 08 2021 Zdenek Dohnal - 2:8.2.3582-1 +- patchlevel 3582 + * Mon Nov 01 2021 Zdenek Dohnal - 2:8.2.3568-1 - patchlevel 3568 From ff78c17c30f1275ca53307ace8f0dea7688a4073 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 22 Nov 2021 13:42:17 +0100 Subject: [PATCH 067/324] vim-update.sh: F33 is EOL soon --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index d53b510b..c9d4f79c 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,10 +1,10 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f35" "f34" "f33" ) -releases=( "fc36" "fc35" "fc34" "fc33" ) -regexps=( "fc36" "\|fc35" "\|fc34" "\|fc33" ) -bodhi_enabled=( "0" "1" "1" "1" ) +branches=( "rawhide" "f35" "f34" ) +releases=( "fc36" "fc35" "fc34" ) +regexps=( "fc36" "\|fc35" "\|fc34" ) +bodhi_enabled=( "0" "1" "1" ) #releases_regexp=fc28\\\|fc27\\\|fc28 branches_index=0 From 51104b3f8257805d47e8f2e97e9564e77d2dd2fe Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 22 Nov 2021 13:43:12 +0100 Subject: [PATCH 068/324] - patchlevel 3642 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8aaadc7e..df5394e2 100644 --- a/.gitignore +++ b/.gitignore @@ -375,3 +375,4 @@ /vim-8.2-3512.tar.bz2 /vim-8.2-3568.tar.bz2 /vim-8.2-3582.tar.bz2 +/vim-8.2-3642.tar.bz2 diff --git a/sources b/sources index 7fe392a5..9080d807 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3582.tar.bz2) = b08460bc7c9b6b60bdee842222cc208c972d2bef5b8f8a36bf55123dd88ae839c77847a021a3b1d53e7b440defeb250f977588835c1b2dcf3908916cbd78e947 +SHA512 (vim-8.2-3642.tar.bz2) = 1a703af370e5fdd6d65d3d8b187e93be4601139d83293a1b10b3c0521ad53650504cd4870e1b2bacf6956bd30b18c7b056e130082c215800910bd6f23e104f25 diff --git a/vim.spec b/vim.spec index 6691b537..3955dc50 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3582 +%define patchlevel 3642 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -902,6 +902,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Nov 22 2021 Zdenek Dohnal - 2:8.2.3642-1 +- patchlevel 3642 + * Mon Nov 08 2021 Zdenek Dohnal - 2:8.2.3582-1 - patchlevel 3582 From 38f1b86de2a51165fc29a69536ccc037cc42c793 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 23 Nov 2021 07:23:52 +0100 Subject: [PATCH 069/324] Remove python310 specific patch - no longer needed --- vim-python310-new-errmsg.patch | 13 ------------- vim.spec | 6 ------ 2 files changed, 19 deletions(-) delete mode 100644 vim-python310-new-errmsg.patch diff --git a/vim-python310-new-errmsg.patch b/vim-python310-new-errmsg.patch deleted file mode 100644 index 68c77b30..00000000 --- a/vim-python310-new-errmsg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim -index 66d5db5..a7b3570 100644 ---- a/src/testdir/test_python3.vim -+++ b/src/testdir/test_python3.vim -@@ -3094,7 +3094,7 @@ func Test_python3_errors() - <<< Finished - > VimForeachRTP - vim.foreach_rtp(None):(, TypeError("'NoneType' object is not callable",)) -- vim.foreach_rtp(NoArgsCall()):(, TypeError('__call__() takes exactly 1 positional argument (2 given)',)) -+ vim.foreach_rtp(NoArgsCall()):(, TypeError('__call__() takes 1 positional argument but 2 were given',)) - vim.foreach_rtp(FailingCall()):(, NotImplementedError('call',)) - vim.foreach_rtp(int, 2):(, TypeError('foreach_rtp() takes exactly one argument (2 given)',)) - > import diff --git a/vim.spec b/vim.spec index 3955dc50..7c0e9fdb 100644 --- a/vim.spec +++ b/vim.spec @@ -70,8 +70,6 @@ Patch3005: vim-python3-tests.patch Patch3006: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3007: vim-8.0-copy-paste.patch -# F35+: Python changed the error message which test suite expects -Patch3008: vim-python310-new-errmsg.patch # uses autoconf in spec file @@ -333,10 +331,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3006 -p1 -b .fips-warning %patch3007 -p1 -b .copypaste -%if 0%{?fedora} >= 35 -%patch3008 -p1 -b .python310-new-errmsg -%endif - %build cd src autoconf From 4529002e19642706a2d3849e365b6f05585f42b2 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 26 Nov 2021 11:00:27 +0100 Subject: [PATCH 070/324] 2026651 - defaults.vim changes create conflicts between vim-minimal and vim-common --- vim.spec | 49 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/vim.spec b/vim.spec index 7c0e9fdb..a650e5e0 100644 --- a/vim.spec +++ b/vim.spec @@ -29,7 +29,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -134,9 +134,11 @@ 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 #1969936) -# remove after RHEL 8+2 is released -Conflicts: %{name}-minimal < %{epoch}:8.2.2956-2 +# conflicts because of defaults.vim (bug #2026651) +# remove after F36 EOL +Conflicts: %{name}-minimal < %{epoch}:8.2.3642-2 +# shared files between common and minimal +Requires: %{name}-data = %{epoch}:%{version}-%{release} Requires: %{name}-filesystem %description common @@ -161,14 +163,16 @@ 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 #1969936) -# remove after RHEL 8+2 is released -Conflicts: %{name}-common < %{epoch}:8.2.2956-2 +# conflicts because of defaults.vim (bug #2026651) +# remove after F36 EOL +Conflicts: %{name}-common < %{epoch}:8.2.3642-2 # remove Conflicts+Obsoletes for wrappers after F34 is EOL Conflicts: vim-wrappers < 2:8.2.2488-1 Obsoletes: vim-wrappers < 2:8.2.2488-1 Provides: vi Provides: %{_bindir}/vi +# shared files between common and minimal +Requires: %{name}-data = %{epoch}:%{version}-%{release} %description minimal VIM (VIsual editor iMproved) is an updated and improved version of the @@ -286,6 +290,19 @@ 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. +%package data +Summary: Shared data for Vi and Vim +BuildArch: noarch +# moved files from filesystem, common and minimal to data +# remove after F36 EOL +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 +shared between vim-minimal and vim-common packages. + %if %{with default_editor} %package default-editor Summary: Set vim as the default editor @@ -674,18 +691,15 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %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}/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}/indent %{_datadir}/%{name}/%{vimdir}/keymap @@ -825,7 +839,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_bindir}/rview %{_bindir}/vi %{_bindir}/view -%{_datadir}/%{name}/%{vimdir}/defaults.vim %{_libexecdir}/vi %{_mandir}/man1/vi.* %{_mandir}/man1/ex.* @@ -842,7 +855,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %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 @@ -887,6 +899,14 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %dir %{_datadir}/icons/locolor/*/apps %{_datadir}/icons/locolor/*/apps/* +%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 @@ -896,6 +916,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Nov 25 2021 Zdenek Dohnal - 2:8.2.3642-2 +- 2026651 - defaults.vim changes create conflicts between vim-minimal and vim-common + * Mon Nov 22 2021 Zdenek Dohnal - 2:8.2.3642-1 - patchlevel 3642 From 726ba97986580269df03bee294b70c2bd9ca1b02 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 2 Dec 2021 09:26:51 +0100 Subject: [PATCH 071/324] - patchlevel 3717 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index df5394e2..170f4ebf 100644 --- a/.gitignore +++ b/.gitignore @@ -376,3 +376,4 @@ /vim-8.2-3568.tar.bz2 /vim-8.2-3582.tar.bz2 /vim-8.2-3642.tar.bz2 +/vim-8.2-3717.tar.bz2 diff --git a/sources b/sources index 9080d807..468598de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3642.tar.bz2) = 1a703af370e5fdd6d65d3d8b187e93be4601139d83293a1b10b3c0521ad53650504cd4870e1b2bacf6956bd30b18c7b056e130082c215800910bd6f23e104f25 +SHA512 (vim-8.2-3717.tar.bz2) = 43f3f1bb92a4205363d42d6cf8bf415393b767ff1ad74d27d0ca76f2bbf14b81c7ac2f1d84cd090f3181604f775d2b20cc1f76eacd0597d7fbe9ca74f439fe8f diff --git a/vim.spec b/vim.spec index a650e5e0..6f21ae8e 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3642 +%define patchlevel 3717 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -29,7 +29,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -916,6 +916,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Dec 02 2021 Zdenek Dohnal - 2:8.2.3717-1 +- patchlevel 3717 + * Thu Nov 25 2021 Zdenek Dohnal - 2:8.2.3642-2 - 2026651 - defaults.vim changes create conflicts between vim-minimal and vim-common From c132fed0322770822a7f0e5481eb84d4dc8dca39 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 7 Dec 2021 12:44:08 +0100 Subject: [PATCH 072/324] - patchlevel 3755 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 170f4ebf..0cfb521f 100644 --- a/.gitignore +++ b/.gitignore @@ -377,3 +377,4 @@ /vim-8.2-3582.tar.bz2 /vim-8.2-3642.tar.bz2 /vim-8.2-3717.tar.bz2 +/vim-8.2-3755.tar.bz2 diff --git a/sources b/sources index 468598de..e244c9ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3717.tar.bz2) = 43f3f1bb92a4205363d42d6cf8bf415393b767ff1ad74d27d0ca76f2bbf14b81c7ac2f1d84cd090f3181604f775d2b20cc1f76eacd0597d7fbe9ca74f439fe8f +SHA512 (vim-8.2-3755.tar.bz2) = 792e425e657d3c99c857fa9a94df21aae75ef7493a27b77a46df11fb2a70e5b688758a8c8950009d96f734f46baa8f79d4f5a165fddc85a7b93c61dab83c0642 diff --git a/vim.spec b/vim.spec index 6f21ae8e..1a66f6e6 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3717 +%define patchlevel 3755 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -916,6 +916,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Dec 07 2021 Zdenek Dohnal - 2:8.2.3755-1 +- patchlevel 3755 + * Thu Dec 02 2021 Zdenek Dohnal - 2:8.2.3717-1 - patchlevel 3717 From 0495a373338741416026d4133861116e8236a2f4 Mon Sep 17 00:00:00 2001 From: Frantisek Hrdina Date: Tue, 7 Dec 2021 13:30:57 +0100 Subject: [PATCH 073/324] Adding fmf plan --- .fmf/version | 1 + plans/all.fmf | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/all.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/all.fmf b/plans/all.fmf new file mode 100644 index 00000000..880a0d4c --- /dev/null +++ b/plans/all.fmf @@ -0,0 +1,6 @@ +summary: Test plan with all Fedora tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/vim.git +execute: + how: tmt From 9a11c35e7743ca87a46bd3ea917604a3ad2519f4 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 9 Dec 2021 14:11:30 +0100 Subject: [PATCH 074/324] vim.spec: dont own a standard dir --- vim.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vim.spec b/vim.spec index 1a66f6e6..4e8d05b2 100644 --- a/vim.spec +++ b/vim.spec @@ -911,7 +911,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %files default-editor %dir %{_datadir}/fish/vendor_conf.d %{_datadir}/fish/vendor_conf.d/vim-default-editor.fish -%dir %{_sysconfdir}/profile.d %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %endif From 527c91f8b6918120fbe4a4d81874af1536754bb9 Mon Sep 17 00:00:00 2001 From: Frantisek Hrdina Date: Thu, 9 Dec 2021 15:12:56 +0100 Subject: [PATCH 075/324] Adding gating.yaml --- gating.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 00000000..195c6fe6 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,16 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_testing] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + +#gating rawhide +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_stable] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} \ No newline at end of file From 2d44d5dc8cfbe16dda5179fc0f0a553967727e06 Mon Sep 17 00:00:00 2001 From: Frantisek Hrdina Date: Tue, 14 Dec 2021 13:25:35 +0100 Subject: [PATCH 076/324] Adding gating rules for rhel --- gating.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 195c6fe6..57d0f4ec 100644 --- a/gating.yaml +++ b/gating.yaml @@ -13,4 +13,14 @@ product_versions: decision_contexts: [bodhi_update_push_stable] subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} \ No newline at end of file + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + +#gating rhel +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional} \ No newline at end of file From 34c6d404eba9c508eaee1d54d9afb79dd1ed5cc5 Mon Sep 17 00:00:00 2001 From: zdohnal Date: Tue, 14 Dec 2021 15:25:57 +0100 Subject: [PATCH 077/324] vim-update.sh: Update to work with gating --- vim-update.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/vim-update.sh b/vim-update.sh index c9d4f79c..31514d7b 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -5,6 +5,7 @@ branches=( "rawhide" "f35" "f34" ) releases=( "fc36" "fc35" "fc34" ) regexps=( "fc36" "\|fc35" "\|fc34" ) bodhi_enabled=( "0" "1" "1" ) +needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 branches_index=0 @@ -168,7 +169,7 @@ if [ $CHANGES -ne 0 ]; then if [ $? -eq 0 ]; then # if branch isn't rawhide or branch is enabled in bodhi, create update if [ $branch != "rawhide" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then - $debug bodhi updates new --user zdohnal --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} + needs_update+=("bodhi updates new --user $(rpmdev-packager) --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}") fi else echo "Error when building package for $branch" @@ -201,4 +202,16 @@ $debug fedpkg switch-branch rawhide # prevents #1931099 $debug rm -rf vim-upstream +if [ ${#needs_update[@]} -eq 0 ] +then + exit 0 +fi + +echo "Issue the following commands once its gating tests pass:" + +for update in "${needs_update[@]}" +do + echo $update +done + exit 0 From 2682f88df8f9cfcbd6d32fad9369d38f8926f323 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 15 Dec 2021 11:55:45 +0100 Subject: [PATCH 078/324] - patchlevel 3811 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0cfb521f..bb399226 100644 --- a/.gitignore +++ b/.gitignore @@ -378,3 +378,4 @@ /vim-8.2-3642.tar.bz2 /vim-8.2-3717.tar.bz2 /vim-8.2-3755.tar.bz2 +/vim-8.2-3811.tar.bz2 diff --git a/sources b/sources index e244c9ec..2f271e31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3755.tar.bz2) = 792e425e657d3c99c857fa9a94df21aae75ef7493a27b77a46df11fb2a70e5b688758a8c8950009d96f734f46baa8f79d4f5a165fddc85a7b93c61dab83c0642 +SHA512 (vim-8.2-3811.tar.bz2) = 18a108da6a835284d230aa59361438ce683c9ecb4e7451f74bfe5d55e26095c41bf5901449309e4d5bec63907f3eddc20e08c114e63dfdf6c3b26cfb5a845922 diff --git a/vim.spec b/vim.spec index 4e8d05b2..8d418922 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3755 +%define patchlevel 3811 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -915,6 +915,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Dec 15 2021 Zdenek Dohnal - 2:8.2.3811-1 +- patchlevel 3811 + * Tue Dec 07 2021 Zdenek Dohnal - 2:8.2.3755-1 - patchlevel 3755 From 7e14bc098bc898f9978e5f3335ea58a852d0a665 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 15 Dec 2021 13:12:22 +0100 Subject: [PATCH 079/324] vim-update.sh: check only for bodhi enabled testing rpms --- vim-update.sh | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 31514d7b..45e82f1f 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -13,7 +13,7 @@ release_index=0 regexp_index=0 bodhi_enabled_index=0 done_build=0 -releases_regexp="${regexps[@]: regexp_index: 1}" +releases_regexp="" let "regexp_index+=1" cd `dirname $0` @@ -104,23 +104,12 @@ if [ $CHANGES -ne 0 ]; then exit 1 fi - # 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 + $debug fedpkg build + if [ $? -eq 0 ]; then + done_build=1 else - echo "There are pending/testing updates, do not build package." + echo "Error when building package in $branch" + exit 1 fi let "release_index+=1" @@ -152,10 +141,13 @@ if [ $CHANGES -ne 0 ]; then exit 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}" + # 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 # Check if release has pending or testing update - if not, build package # and submit update for testing @@ -167,7 +159,7 @@ if [ $CHANGES -ne 0 ]; then 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 update + # if branch isn't rawhide or branch is enabled in bodhi, suggest creating update in the end if [ $branch != "rawhide" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then needs_update+=("bodhi updates new --user $(rpmdev-packager) --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}") fi From a63663e4b1d98b15f169777e1ab9e37fac645aac Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 3 Jan 2022 04:52:22 +0000 Subject: [PATCH 080/324] Fix flatpak build When building a flatpak, vim is built in /app but binutils is still in /usr. --- vim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 8d418922..6d3e4260 100644 --- a/vim.spec +++ b/vim.spec @@ -501,7 +501,7 @@ cd src %make_install BINDIR=%{_bindir} STRIP=/bin/true # make install creates vim binary and view symlink, they will be wrappers # so remove them here -%{_bindir}/rm -f %{buildroot}%{_bindir}/{vim,view} +rm -f %{buildroot}%{_bindir}/{vim,view} make installgtutorbin DESTDIR=%{buildroot} BINDIR=%{_bindir} mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps mkdir -p %{buildroot}%{_libexecdir} From 33c92f40efe794a6c83fb0c579787bc32f8c1395 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 5 Jan 2022 13:29:44 +0100 Subject: [PATCH 081/324] vim-update.sh: Create updates for bodhi enabled branches Gating is applied in bodhi, so the update has to be created either way. --- vim-update.sh | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 45e82f1f..43852b65 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -149,19 +149,19 @@ if [ $CHANGES -ne 0 ]; then releases_regexp="$releases_regexp${regexps[@]: regexp_index: 1}" fi - # Check if release has pending or testing update - if not, build package + # Check if release has an update in testing - if not, build package # and submit update for testing - # | grep $releases_regexp` - # done_build is checking, if previous branch did build - lower branch can do + # done_build is a check, 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, suggest creating update in the end + # 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 - needs_update+=("bodhi updates new --user $(rpmdev-packager) --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}") + $debug bodhi updates new --user $(rpmdev-packager) --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} fi else echo "Error when building package for $branch" @@ -194,16 +194,4 @@ $debug fedpkg switch-branch rawhide # prevents #1931099 $debug rm -rf vim-upstream -if [ ${#needs_update[@]} -eq 0 ] -then - exit 0 -fi - -echo "Issue the following commands once its gating tests pass:" - -for update in "${needs_update[@]}" -do - echo $update -done - exit 0 From 2306ab48d9447e8ef957c67ff7fb779d1ce5a412 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 5 Jan 2022 13:31:41 +0100 Subject: [PATCH 082/324] - patchlevel 4006 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bb399226..9d3beb65 100644 --- a/.gitignore +++ b/.gitignore @@ -379,3 +379,4 @@ /vim-8.2-3717.tar.bz2 /vim-8.2-3755.tar.bz2 /vim-8.2-3811.tar.bz2 +/vim-8.2-4006.tar.bz2 diff --git a/sources b/sources index 2f271e31..57825ea1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-3811.tar.bz2) = 18a108da6a835284d230aa59361438ce683c9ecb4e7451f74bfe5d55e26095c41bf5901449309e4d5bec63907f3eddc20e08c114e63dfdf6c3b26cfb5a845922 +SHA512 (vim-8.2-4006.tar.bz2) = 92ae7e072a21841b074911f36f915de1f8f161f125716456dcc17dbcf940c66082376eddb96e0d80e49875d0788a996aaada33f44a8a92eacfa70155388e35a7 diff --git a/vim.spec b/vim.spec index 6d3e4260..4e9fcb89 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 3811 +%define patchlevel 4006 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -915,6 +915,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Jan 05 2022 Zdenek Dohnal - 2:8.2.4006-1 +- patchlevel 4006 + * Wed Dec 15 2021 Zdenek Dohnal - 2:8.2.3811-1 - patchlevel 3811 From bde766b5c9afc75810d40b0b0c8272f840e847ba Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 5 Jan 2022 14:16:28 +0100 Subject: [PATCH 083/324] vim-update.sh: fix the regexp strings --- vim-update.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vim-update.sh b/vim-update.sh index 43852b65..48ebe85f 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -3,7 +3,9 @@ debug="" #debug="echo " branches=( "rawhide" "f35" "f34" ) releases=( "fc36" "fc35" "fc34" ) -regexps=( "fc36" "\|fc35" "\|fc34" ) +# the first bodhi enabled release is the last without \| - all +# others need to have \| +regexps=( "fc36" "fc35" "\|fc34" ) bodhi_enabled=( "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From dbb3fed82400fd6c1e1c89436760c09a59711f36 Mon Sep 17 00:00:00 2001 From: Malcolm Inglis Date: Fri, 7 Jan 2022 02:54:21 +0100 Subject: [PATCH 084/324] add 'gui' build condition for vim-X11 --- vim.spec | 145 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 101 insertions(+), 44 deletions(-) diff --git a/vim.spec b/vim.spec index 4e9fcb89..76b6e303 100644 --- a/vim.spec +++ b/vim.spec @@ -1,11 +1,4 @@ -%define patchlevel 4006 -%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} -%define WITH_SELINUX 1 -%endif -%define desktop_file 1 -%if %{desktop_file} -%define desktop_file_utils_version 0.2.93 -%endif +%bcond_without gui %if 0%{?fedora} %bcond_without default_editor @@ -15,6 +8,22 @@ %bcond_with libsodium_crypt %endif +%define patchlevel 4006 + +%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 + %define withnetbeans 1 %define withvimspell 0 @@ -29,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -54,6 +63,7 @@ Source100: vim-spell-files.tar.bz2 Patch2000: vim-7.0-fixkeys.patch Patch2001: vim-7.4-specsyntax.patch + %if %{withhunspell} Patch2002: vim-7.0-hunspell.patch BuildRequires: hunspell-devel @@ -74,15 +84,18 @@ Patch3007: vim-8.0-copy-paste.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 BuildRequires: gettext + # glibc in F35 bootstraped several conversion formats from # iconv into a separate package. Vim needs those additional # formats during compilation. @@ -91,22 +104,27 @@ BuildRequires: gettext %if 0%{?fedora} >= 35 BuildRequires: glibc-gconv-extra %endif + # for mouse support in console BuildRequires: gpm-devel # for setting ACL on created files BuildRequires: libacl-devel + # selinux support %if %{WITH_SELINUX} BuildRequires: libselinux-devel %endif + # for xchacha20 encryption %if %{with libsodium_crypt} BuildRequires: libsodium-devel %endif + # for lua plugin %if "%{withlua}" == "1" BuildRequires: lua-devel %endif + # uses make BuildRequires: make # screen handling library @@ -118,6 +136,7 @@ BuildRequires: perl(ExtUtils::Embed) BuildRequires: perl(ExtUtils::ParseXS) # for python plugin BuildRequires: python3-devel + # for ruby plugin %if "%{withruby}" == "1" BuildRequires: ruby @@ -201,10 +220,12 @@ Requires: which %if "%{withlua}" == "1" Suggests: lua-libs %endif + Suggests: perl-devel Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Suggests: python3 Suggests: python3-libs + %if "%{withruby}" == "1" Suggests: ruby Suggests: ruby-libs @@ -231,6 +252,7 @@ BuildArch: noarch This package provides some directories which are required by other packages that add vim files, p.e. additional syntax files or filetypes. +%if %{with gui} %package X11 Summary: The VIM version of the vi editor for the X Window System - GVim # devel of libICE, gtk3, libSM, libX11, libXpm and libXt are needed in buildroot @@ -265,17 +287,19 @@ Requires: libattr >= 2.4 Requires: vim-common = %{epoch}:%{version}-%{release} # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim -%if "%{withlua}" == "1" + %if "%{withlua}" == "1" Suggests: lua-libs -%endif + %endif + Suggests: perl-devel Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Suggests: python3 Suggests: python3-libs -%if "%{withruby}" == "1" + + %if "%{withruby}" == "1" Suggests: ruby Suggests: ruby-libs -%endif + %endif %description X11 VIM (VIsual editor iMproved) is an updated and improved version of the @@ -289,6 +313,7 @@ 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 %package data Summary: Shared data for Vi and Vim @@ -329,9 +354,11 @@ sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3005} chmod -x runtime/tools/mve.awk %patch2000 -p1 -b .fixkeys %patch2001 -p1 + %if %{withhunspell} %patch2002 -p1 %endif + perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk # install spell files @@ -394,6 +421,7 @@ 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 @@ -410,37 +438,38 @@ mv -f os_unix.h.save os_unix.h --enable-fips-warning \ --with-compiledby="" --enable-cscope \ --with-modified-by="" \ -%if "%{withnetbeans}" == "1" + %if "%{withnetbeans}" == "1" --enable-netbeans \ -%else + %else --disable-netbeans \ -%endif -%if %{WITH_SELINUX} + %endif + %if %{WITH_SELINUX} --enable-selinux \ -%else + %else --disable-selinux \ -%endif -%if "%{withruby}" == "1" + %endif + %if "%{withruby}" == "1" --enable-rubyinterp=dynamic \ -%else + %else --disable-rubyinterp \ -%endif -%if "%{withlua}" == "1" + %endif + %if "%{withlua}" == "1" --enable-luainterp=dynamic \ -%else + %else --disable-luainterp \ -%endif -%if %{with libsodium_crypt} + %endif + %if %{with libsodium_crypt} --enable-libsodium \ -%else + %else --disable-libsodium \ -%endif + %endif --enable-fail-if-missing \ --enable-canberra %make_build cp vim gvim make clean +%endif %configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ --prefix=%{_prefix} --with-features=huge \ @@ -502,14 +531,16 @@ cd src # make install creates vim binary and view symlink, they will be wrappers # so remove them here rm -f %{buildroot}%{_bindir}/{vim,view} -make installgtutorbin DESTDIR=%{buildroot} BINDIR=%{_bindir} mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps mkdir -p %{buildroot}%{_libexecdir} install -m755 minimal-vim %{buildroot}%{_libexecdir}/vi install -m755 enhanced-vim %{buildroot}%{_bindir}/vim -install -m755 gvim %{buildroot}%{_bindir}/gvim 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} \ %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/gvim.png install -p -m644 %{SOURCE4} \ @@ -562,6 +593,20 @@ SentUpstream: 2014-05-22 EOF +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml + +for i in 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 +%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 @@ -576,6 +621,8 @@ EOF 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}/gview ln -sf gvim ./%{_bindir}/gex ln -sf gvim ./%{_bindir}/evim @@ -591,13 +638,14 @@ EOF mkdir -p ./%{_sysconfdir}/X11/applnk/Applications cp %{buildroot}/%{_datadir}/applications/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 @@ -669,11 +717,9 @@ 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 -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 +# 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 @@ -711,9 +757,11 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_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 @@ -756,16 +804,20 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %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}/man1/vimx.* %{_mandir}/man1/xxd.* %{_mandir}/man5/vimrc.* + +%if %{with gui} +%{_mandir}/man1/gex.* +%{_mandir}/man1/gview.* +%{_mandir}/man1/gvim* +%{_mandir}/man1/vimx.* +%endif + %lang(fr) %{_mandir}/fr/man1/* %lang(da) %{_mandir}/da/man1/* %lang(de) %{_mandir}/de/man1/* @@ -873,14 +925,15 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %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 @@ -898,6 +951,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %dir %{_datadir}/icons/locolor/* %dir %{_datadir}/icons/locolor/*/apps %{_datadir}/icons/locolor/*/apps/* +%endif %files data %license LICENSE @@ -915,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Jan 07 2022 Malcolm Inglis - 2:8.2.4006-2 +- add 'gui' build condition for vim-X11 + * Wed Jan 05 2022 Zdenek Dohnal - 2:8.2.4006-1 - patchlevel 4006 From 4cd05b311562a08f48dc726c221aa9675c157e8a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 10 Jan 2022 14:21:55 +0100 Subject: [PATCH 085/324] Update the patch for newer Vim patchlevel --- vim-crypto-warning.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vim-crypto-warning.patch b/vim-crypto-warning.patch index ba1a35ea..99f3be13 100644 --- a/vim-crypto-warning.patch +++ b/vim-crypto-warning.patch @@ -1,7 +1,7 @@ diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in ---- vim82/src/config.h.in.fips-warning 2021-06-23 11:46:55.000000000 +0200 -+++ vim82/src/config.h.in 2021-06-23 11:55:03.165480970 +0200 -@@ -501,3 +501,12 @@ +--- vim82/src/config.h.in.fips-warning 2022-01-10 14:14:44.000000000 +0100 ++++ vim82/src/config.h.in 2022-01-10 14:18:55.997105654 +0100 +@@ -507,3 +507,12 @@ /* Define if _SC_SIGSTKSZ is available via sysconf() */ #undef HAVE_SYSCONF_SIGSTKSZ @@ -15,10 +15,10 @@ diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in +/* Link to fips_enabled file */ +#undef FIPS_ENABLED_FILE_LINK diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac ---- vim82/src/configure.ac.fips-warning 2021-06-23 11:55:03.163480985 +0200 -+++ vim82/src/configure.ac 2021-06-23 11:55:03.166480962 +0200 -@@ -541,6 +541,38 @@ else - AC_MSG_RESULT(yes) +--- vim82/src/configure.ac.fips-warning 2022-01-10 14:18:55.998105657 +0100 ++++ vim82/src/configure.ac 2022-01-10 14:20:11.030342249 +0100 +@@ -577,6 +577,38 @@ else + AC_SUBST(XDIFF_OBJS_USED) fi +dnl Checking if we want FIPS warning @@ -57,8 +57,8 @@ diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac AC_MSG_CHECKING(--enable-luainterp argument) AC_ARG_ENABLE(luainterp, diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c ---- vim82/src/crypt.c.fips-warning 2021-06-23 11:55:03.166480962 +0200 -+++ vim82/src/crypt.c 2021-06-23 12:36:22.295488425 +0200 +--- vim82/src/crypt.c.fips-warning 2022-01-10 14:14:44.000000000 +0100 ++++ vim82/src/crypt.c 2022-01-10 14:18:55.999105660 +0100 @@ -603,6 +603,21 @@ crypt_check_method(int method) msg_scroll = TRUE; msg(_("Warning: Using a weak encryption method; see :help 'cm'")); From 13abf62e597c02a4de8b504ee42e77844db092b5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 10 Jan 2022 14:22:24 +0100 Subject: [PATCH 086/324] - patchlevel 4051 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9d3beb65..3bdf3159 100644 --- a/.gitignore +++ b/.gitignore @@ -380,3 +380,4 @@ /vim-8.2-3755.tar.bz2 /vim-8.2-3811.tar.bz2 /vim-8.2-4006.tar.bz2 +/vim-8.2-4051.tar.bz2 diff --git a/sources b/sources index 57825ea1..e6268da0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4006.tar.bz2) = 92ae7e072a21841b074911f36f915de1f8f161f125716456dcc17dbcf940c66082376eddb96e0d80e49875d0788a996aaada33f44a8a92eacfa70155388e35a7 +SHA512 (vim-8.2-4051.tar.bz2) = a6396d3630b50dfb5068ae7d890860cd9e6015b070d05a506a4a2037e0925af9bc7207ad99ed9a4d315e6499807c5f09dd5214b10cfd3540691b27222c5fbf27 diff --git a/vim.spec b/vim.spec index 76b6e303..957d2335 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4006 +%define patchlevel 4051 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Jan 10 2022 Zdenek Dohnal - 2:8.2.4051-1 +- patchlevel 4051 + * Fri Jan 07 2022 Malcolm Inglis - 2:8.2.4006-2 - add 'gui' build condition for vim-X11 From 2d63ce9331f9a1f840f4510e7da56785823a7942 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 12 Jan 2022 16:01:23 +0100 Subject: [PATCH 087/324] - patchlevel 4068 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3bdf3159..58f41dc6 100644 --- a/.gitignore +++ b/.gitignore @@ -381,3 +381,4 @@ /vim-8.2-3811.tar.bz2 /vim-8.2-4006.tar.bz2 /vim-8.2-4051.tar.bz2 +/vim-8.2-4068.tar.bz2 diff --git a/sources b/sources index e6268da0..8a861c6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4051.tar.bz2) = a6396d3630b50dfb5068ae7d890860cd9e6015b070d05a506a4a2037e0925af9bc7207ad99ed9a4d315e6499807c5f09dd5214b10cfd3540691b27222c5fbf27 +SHA512 (vim-8.2-4068.tar.bz2) = b2e95ca4efbf69bfc61ce1f02ad7972d4c8df3ea972ffe8802c4e5dccbec075dd5be8e2bfa8c2277388d363a271d248dd25e3078aa6a1c76c848cf19720c54bd diff --git a/vim.spec b/vim.spec index 957d2335..baa0741f 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4051 +%define patchlevel 4068 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Jan 12 2022 Zdenek Dohnal - 2:8.2.4068-1 +- patchlevel 4068 + * Mon Jan 10 2022 Zdenek Dohnal - 2:8.2.4051-1 - patchlevel 4051 From 9c76347c0fed8e8135a89b84c023b4d24a2e895b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:57:45 +0000 Subject: [PATCH 088/324] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index baa0741f..62a012cc 100644 --- a/vim.spec +++ b/vim.spec @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2:8.2.4068-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jan 12 2022 Zdenek Dohnal - 2:8.2.4068-1 - patchlevel 4068 From 380067b1dade192d2cfb1c0019433be2111aa312 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 24 Jan 2022 12:20:40 +0100 Subject: [PATCH 089/324] vim-8.0-copy-paste.patch: update the patch for patchlevel 4198 --- vim-8.0-copy-paste.patch | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch index 73870cd5..bfa9cc30 100644 --- a/vim-8.0-copy-paste.patch +++ b/vim-8.0-copy-paste.patch @@ -1,7 +1,6 @@ -diff --git a/runtime/defaults.vim b/runtime/defaults.vim -index f3c639b..20637e2 100644 ---- a/runtime/defaults.vim -+++ b/runtime/defaults.vim +diff -up vim82/runtime/defaults.vim.copypaste vim82/runtime/defaults.vim +--- vim82/runtime/defaults.vim.copypaste 2022-01-24 12:13:43.000000000 +0100 ++++ vim82/runtime/defaults.vim 2022-01-24 12:15:41.050120573 +0100 @@ -73,18 +73,6 @@ map Q gq " Revert with ":iunmap ". inoremap u @@ -21,22 +20,20 @@ index f3c639b..20637e2 100644 " Only do this part when Vim was compiled with the +eval feature. if 1 -diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim -index 319e546..8fcf63c 100644 ---- a/src/testdir/test_balloon.vim -+++ b/src/testdir/test_balloon.vim +diff -up vim82/src/testdir/test_balloon.vim.copypaste vim82/src/testdir/test_balloon.vim +--- vim82/src/testdir/test_balloon.vim.copypaste 2022-01-24 12:15:41.051120576 +0100 ++++ vim82/src/testdir/test_balloon.vim 2022-01-24 12:17:02.604372440 +0100 @@ -9,6 +9,7 @@ source screendump.vim CheckScreendump 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() balloondelay=100 - func MyBalloonExpr() -diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim -index f13252b..ec755a4 100644 ---- a/src/testdir/test_popupwin.vim -+++ b/src/testdir/test_popupwin.vim + set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100 + let s:trailing = '<' " check that script context is set +diff -up vim82/src/testdir/test_popupwin.vim.copypaste vim82/src/testdir/test_popupwin.vim +--- vim82/src/testdir/test_popupwin.vim.copypaste 2022-01-24 12:13:44.000000000 +0100 ++++ vim82/src/testdir/test_popupwin.vim 2022-01-24 12:18:24.382624989 +0100 @@ -553,6 +553,7 @@ func Test_popup_drag() " create a popup that covers the command line let lines =<< trim END @@ -45,15 +42,15 @@ index f13252b..ec755a4 100644 split vsplit $wincmd w -@@ -599,6 +600,7 @@ func Test_popup_drag_termwin() +@@ -625,6 +626,7 @@ func Test_popup_drag_termwin() let lines =<< trim END set foldmethod=marker call setline(1, range(100)) -+ set mouse=a ++ set mouse=a for nr in range(7) call setline(nr * 12 + 1, "fold {{{") call setline(nr * 12 + 11, "end }}}") -@@ -652,6 +654,7 @@ func Test_popup_close_with_mouse() +@@ -678,6 +680,7 @@ func Test_popup_close_with_mouse() let lines =<< trim END call setline(1, range(1, 20)) @@ -61,7 +58,7 @@ index f13252b..ec755a4 100644 " With border, can click on X let winid = popup_create('foobar', #{ \ close: 'button', -@@ -1479,6 +1482,7 @@ func Test_popup_beval() +@@ -1513,6 +1516,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') @@ -69,7 +66,7 @@ index f13252b..ec755a4 100644 set balloonevalterm set balloonexpr=BalloonExpr() set balloondelay=100 -@@ -2170,6 +2174,7 @@ func Test_popup_scrollbar() +@@ -2218,6 +2222,7 @@ func Test_popup_scrollbar() let lines =<< trim END call setline(1, range(1, 20)) From c81678a1eb0a005acec912fd4c24ecf6e6ee75c8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 24 Jan 2022 12:21:43 +0100 Subject: [PATCH 090/324] - patchlevel 4198 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 58f41dc6..9c3fb635 100644 --- a/.gitignore +++ b/.gitignore @@ -382,3 +382,4 @@ /vim-8.2-4006.tar.bz2 /vim-8.2-4051.tar.bz2 /vim-8.2-4068.tar.bz2 +/vim-8.2-4198.tar.bz2 diff --git a/sources b/sources index 8a861c6a..8f8854d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4068.tar.bz2) = b2e95ca4efbf69bfc61ce1f02ad7972d4c8df3ea972ffe8802c4e5dccbec075dd5be8e2bfa8c2277388d363a271d248dd25e3078aa6a1c76c848cf19720c54bd +SHA512 (vim-8.2-4198.tar.bz2) = fa1cfc0ec941b3357f0e0f464bacc285d3b4b2bfae490419cd7aaebf716fe5beb4ea8ede2d4e74efc2a70368ca9bd93efc48d7130d6e1771c928a0f2d073a142 diff --git a/vim.spec b/vim.spec index 62a012cc..875cbe40 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4068 +%define patchlevel 4198 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Jan 24 2022 Zdenek Dohnal - 2:8.2.4198-1 +- patchlevel 4198 + * Sat Jan 22 2022 Fedora Release Engineering - 2:8.2.4068-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From b7937e6d860b77229bebd7bbbdd2f0cfba830489 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 24 Jan 2022 13:52:11 +0100 Subject: [PATCH 091/324] vim-update.sh: use id for getting username --- vim-update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vim-update.sh b/vim-update.sh index 48ebe85f..8f858f40 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -163,7 +163,8 @@ if [ $CHANGES -ne 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 --user $(rpmdev-packager) --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} + # uses 'id' value for updates -> your username in OS must match with your username in Fedora accounts + $debug bodhi updates new --user $(id -un) --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} fi else echo "Error when building package for $branch" From 56e0e46d5dea50f928cf7a796eb0deab624394bc Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 27 Jan 2022 18:56:34 +0100 Subject: [PATCH 092/324] - patchlevel 4232 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9c3fb635..f0e65932 100644 --- a/.gitignore +++ b/.gitignore @@ -383,3 +383,4 @@ /vim-8.2-4051.tar.bz2 /vim-8.2-4068.tar.bz2 /vim-8.2-4198.tar.bz2 +/vim-8.2-4232.tar.bz2 diff --git a/sources b/sources index 8f8854d1..abecd56c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4198.tar.bz2) = fa1cfc0ec941b3357f0e0f464bacc285d3b4b2bfae490419cd7aaebf716fe5beb4ea8ede2d4e74efc2a70368ca9bd93efc48d7130d6e1771c928a0f2d073a142 +SHA512 (vim-8.2-4232.tar.bz2) = b31857a351abc14ab95a76e63ebdc21c953a0193091b6b94fc7e41ea8d1f97d585062271cee2e6ecc62a48d9f8ea59c61917eb3858f945e9baa03cfb01eb1b9c diff --git a/vim.spec b/vim.spec index 875cbe40..9e444eb3 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4198 +%define patchlevel 4232 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Jan 27 2022 Zdenek Dohnal - 2:8.2.4232-1 +- patchlevel 4232 + * Mon Jan 24 2022 Zdenek Dohnal - 2:8.2.4198-1 - patchlevel 4198 From 9198d0dd87940037fb23543443c493091b1f56fb Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 7 Feb 2022 09:20:31 +0100 Subject: [PATCH 093/324] - patchlevel 4314 --- .gitignore | 1 + sources | 2 +- vim-7.0-fixkeys.patch | 48 +++++++++++++++++++++---------------------- vim.spec | 5 ++++- 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index f0e65932..a5385746 100644 --- a/.gitignore +++ b/.gitignore @@ -384,3 +384,4 @@ /vim-8.2-4068.tar.bz2 /vim-8.2-4198.tar.bz2 /vim-8.2-4232.tar.bz2 +/vim-8.2-4314.tar.bz2 diff --git a/sources b/sources index abecd56c..e6df88b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4232.tar.bz2) = b31857a351abc14ab95a76e63ebdc21c953a0193091b6b94fc7e41ea8d1f97d585062271cee2e6ecc62a48d9f8ea59c61917eb3858f945e9baa03cfb01eb1b9c +SHA512 (vim-8.2-4314.tar.bz2) = c803a899ef66f30733262ce5cec0df89b08d172cafec7fed7fc048eb03ea71180804d005fb8081ff1d83e9860055e826eeb2d3b4c70ff841b13c6bb93817391c diff --git a/vim-7.0-fixkeys.patch b/vim-7.0-fixkeys.patch index 1d5bc4ab..c7476338 100644 --- a/vim-7.0-fixkeys.patch +++ b/vim-7.0-fixkeys.patch @@ -1,26 +1,26 @@ diff -up vim82/src/term.c.fixkeys vim82/src/term.c ---- vim82/src/term.c.fixkeys 2021-01-08 10:12:59.191309539 +0100 -+++ vim82/src/term.c 2021-01-08 10:18:05.410470981 +0100 -@@ -919,14 +919,14 @@ static struct builtin_term builtin_termc - {K_XRIGHT, IF_EB("\033[@;*C", ESC_STR "[@;*C")}, - {K_XLEFT, IF_EB("\033[@;*D", ESC_STR "[@;*D")}, +--- vim82/src/term.c.fixkeys 2022-02-07 09:23:09.195365881 +0100 ++++ vim82/src/term.c 2022-02-07 09:31:31.279695977 +0100 +@@ -921,14 +921,14 @@ static struct builtin_term builtin_termc + {K_XRIGHT, "\033[@;*C"}, + {K_XLEFT, "\033[@;*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;*~")}, +- {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;*~"}, diff --git a/vim.spec b/vim.spec index 9e444eb3..8c9f4af8 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4232 +%define patchlevel 4314 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Feb 07 2022 Zdenek Dohnal - 2:8.2.4314-1 +- patchlevel 4314 + * Thu Jan 27 2022 Zdenek Dohnal - 2:8.2.4232-1 - patchlevel 4232 From 51d1691c602f4c50569914cf3b467629c46012b2 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 9 Feb 2022 07:00:29 +0100 Subject: [PATCH 094/324] vim-update.sh: F36 was branched --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 8f858f40..69f169ce 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f35" "f34" ) -releases=( "fc36" "fc35" "fc34" ) +branches=( "rawhide" "f36" "f35" "f34" ) +releases=( "fc37" "fc36" "fc35" "fc34" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc36" "fc35" "\|fc34" ) -bodhi_enabled=( "0" "1" "1" ) +regexps=( "fc37" "fc36" "fc35" "\|fc34" ) +bodhi_enabled=( "0" "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From 142071043514d402676b124c3f140911414586e5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 15 Feb 2022 07:17:22 +0100 Subject: [PATCH 095/324] - patchlevel 4386 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a5385746..cc08f720 100644 --- a/.gitignore +++ b/.gitignore @@ -385,3 +385,4 @@ /vim-8.2-4198.tar.bz2 /vim-8.2-4232.tar.bz2 /vim-8.2-4314.tar.bz2 +/vim-8.2-4386.tar.bz2 diff --git a/sources b/sources index e6df88b9..f0319638 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4314.tar.bz2) = c803a899ef66f30733262ce5cec0df89b08d172cafec7fed7fc048eb03ea71180804d005fb8081ff1d83e9860055e826eeb2d3b4c70ff841b13c6bb93817391c +SHA512 (vim-8.2-4386.tar.bz2) = 6f7ebebb462e903cb2aa1f75f20a952bff467b62730830878be41bb5de0e27987284ef90b210388514b5b23813e57c3b64aecb1cdfcf45e19f01f80e7e1d792a diff --git a/vim.spec b/vim.spec index 8c9f4af8..e6a084b5 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4314 +%define patchlevel 4386 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Feb 15 2022 Zdenek Dohnal - 2:8.2.4386-1 +- patchlevel 4386 + * Mon Feb 07 2022 Zdenek Dohnal - 2:8.2.4314-1 - patchlevel 4314 From bea8236b360616fe67569ea9de27c887d36fb9f8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 21 Feb 2022 12:14:01 +0100 Subject: [PATCH 096/324] - patchlevel 4428 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cc08f720..6d3c8d2a 100644 --- a/.gitignore +++ b/.gitignore @@ -386,3 +386,4 @@ /vim-8.2-4232.tar.bz2 /vim-8.2-4314.tar.bz2 /vim-8.2-4386.tar.bz2 +/vim-8.2-4428.tar.bz2 diff --git a/sources b/sources index f0319638..b29eb7f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4386.tar.bz2) = 6f7ebebb462e903cb2aa1f75f20a952bff467b62730830878be41bb5de0e27987284ef90b210388514b5b23813e57c3b64aecb1cdfcf45e19f01f80e7e1d792a +SHA512 (vim-8.2-4428.tar.bz2) = fa62f96522bcca2e31f53063884258ecd833778a8ed2a5a4740933f574cbb6897cf86f9689988d8c9ae79157195b845b54a9f99c43e01d63a27f20e46a4d8d11 diff --git a/vim.spec b/vim.spec index e6a084b5..acb324d6 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4386 +%define patchlevel 4428 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Feb 21 2022 Zdenek Dohnal - 2:8.2.4428-1 +- patchlevel 4428 + * Tue Feb 15 2022 Zdenek Dohnal - 2:8.2.4386-1 - patchlevel 4386 From 6fcdf8a4bf536f5e11f91031d677069b88ce60f5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 24 Feb 2022 08:08:54 +0100 Subject: [PATCH 097/324] vim-update.sh: F36 is enabled in Bodhi now --- vim-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 69f169ce..efe29a40 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -5,8 +5,8 @@ branches=( "rawhide" "f36" "f35" "f34" ) releases=( "fc37" "fc36" "fc35" "fc34" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc37" "fc36" "fc35" "\|fc34" ) -bodhi_enabled=( "0" "0" "1" "1" ) +regexps=( "fc37" "fc36" "\|fc35" "\|fc34" ) +bodhi_enabled=( "0" "1" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From f76a7bbf3196b28890dfbb9ce61fcfdc3e7be1b7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 24 Feb 2022 08:17:26 +0100 Subject: [PATCH 098/324] vim-crypto-warning.patch: Update for patchlevel 4460 --- vim-crypto-warning.patch | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/vim-crypto-warning.patch b/vim-crypto-warning.patch index 99f3be13..3b664232 100644 --- a/vim-crypto-warning.patch +++ b/vim-crypto-warning.patch @@ -1,11 +1,10 @@ diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in ---- vim82/src/config.h.in.fips-warning 2022-01-10 14:14:44.000000000 +0100 -+++ vim82/src/config.h.in 2022-01-10 14:18:55.997105654 +0100 -@@ -507,3 +507,12 @@ - +--- vim82/src/config.h.in.fips-warning 2022-02-24 08:13:59.017280243 +0100 ++++ vim82/src/config.h.in 2022-02-24 08:14:33.085580298 +0100 +@@ -508,5 +508,14 @@ /* Define if _SC_SIGSTKSZ is available via sysconf() */ #undef HAVE_SYSCONF_SIGSTKSZ -+ + +/* Do we need FIPS warning? */ +#undef HAVE_FIPS_WARNING + @@ -14,10 +13,13 @@ diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in + +/* Link to fips_enabled file */ +#undef FIPS_ENABLED_FILE_LINK ++ + /* Define if you want to load libgpm dynamically */ + #undef DYNAMIC_GPM diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac ---- vim82/src/configure.ac.fips-warning 2022-01-10 14:18:55.998105657 +0100 -+++ vim82/src/configure.ac 2022-01-10 14:20:11.030342249 +0100 -@@ -577,6 +577,38 @@ else +--- vim82/src/configure.ac.fips-warning 2022-02-24 08:13:59.014280304 +0100 ++++ vim82/src/configure.ac 2022-02-24 08:13:59.018280222 +0100 +@@ -583,6 +583,38 @@ else AC_SUBST(XDIFF_OBJS_USED) fi @@ -57,9 +59,9 @@ diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac AC_MSG_CHECKING(--enable-luainterp argument) AC_ARG_ENABLE(luainterp, diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c ---- vim82/src/crypt.c.fips-warning 2022-01-10 14:14:44.000000000 +0100 -+++ vim82/src/crypt.c 2022-01-10 14:18:55.999105660 +0100 -@@ -603,6 +603,21 @@ crypt_check_method(int method) +--- vim82/src/crypt.c.fips-warning 2022-02-24 08:09:29.000000000 +0100 ++++ vim82/src/crypt.c 2022-02-24 08:13:59.018280222 +0100 +@@ -740,6 +740,21 @@ crypt_check_method(int method) msg_scroll = TRUE; msg(_("Warning: Using a weak encryption method; see :help 'cm'")); } From f5f83cb27fd426aeb3a22cdb69a4a7ec9c126559 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 24 Feb 2022 08:17:54 +0100 Subject: [PATCH 099/324] - patchlevel 4460 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6d3c8d2a..c5f38bfa 100644 --- a/.gitignore +++ b/.gitignore @@ -387,3 +387,4 @@ /vim-8.2-4314.tar.bz2 /vim-8.2-4386.tar.bz2 /vim-8.2-4428.tar.bz2 +/vim-8.2-4460.tar.bz2 diff --git a/sources b/sources index b29eb7f6..73da1cd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4428.tar.bz2) = fa62f96522bcca2e31f53063884258ecd833778a8ed2a5a4740933f574cbb6897cf86f9689988d8c9ae79157195b845b54a9f99c43e01d63a27f20e46a4d8d11 +SHA512 (vim-8.2-4460.tar.bz2) = 706a87ed6c201cb8f0d6254f0cfb3d972f6157d23536c534f72edcc59c23d639e7d8bf36bdd4461f34cd3ca94828f3f43b735e18ac6650c86a976d92f7f5674b diff --git a/vim.spec b/vim.spec index acb324d6..f88bc577 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4428 +%define patchlevel 4460 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Feb 24 2022 Zdenek Dohnal - 2:8.2.4460-1 +- patchlevel 4460 + * Mon Feb 21 2022 Zdenek Dohnal - 2:8.2.4428-1 - patchlevel 4428 From 0503c4f65f9b285ba7b680e6efac515f2660e12f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 1 Mar 2022 11:16:44 +0100 Subject: [PATCH 100/324] - patchlevel 4485 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c5f38bfa..d5c91b40 100644 --- a/.gitignore +++ b/.gitignore @@ -388,3 +388,4 @@ /vim-8.2-4386.tar.bz2 /vim-8.2-4428.tar.bz2 /vim-8.2-4460.tar.bz2 +/vim-8.2-4485.tar.bz2 diff --git a/sources b/sources index 73da1cd9..197452e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4460.tar.bz2) = 706a87ed6c201cb8f0d6254f0cfb3d972f6157d23536c534f72edcc59c23d639e7d8bf36bdd4461f34cd3ca94828f3f43b735e18ac6650c86a976d92f7f5674b +SHA512 (vim-8.2-4485.tar.bz2) = cf20b8da023cb9fa7605902f94effc186380de32b2e9a2e214499b211d5919e541cafeca8f463246644d70a114516e9e2d61078c2e2366c64e4cc8f43455d95b diff --git a/vim.spec b/vim.spec index f88bc577..d27b6025 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4460 +%define patchlevel 4485 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Mar 01 2022 Zdenek Dohnal - 2:8.2.4485-1 +- patchlevel 4485 + * Thu Feb 24 2022 Zdenek Dohnal - 2:8.2.4460-1 - patchlevel 4460 From b63bfa6b50d728b556e5126d4368ecd56a4b109d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 9 Mar 2022 06:34:58 +0100 Subject: [PATCH 101/324] - patchlevel 4529 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d5c91b40..85b6bb89 100644 --- a/.gitignore +++ b/.gitignore @@ -389,3 +389,4 @@ /vim-8.2-4428.tar.bz2 /vim-8.2-4460.tar.bz2 /vim-8.2-4485.tar.bz2 +/vim-8.2-4529.tar.bz2 diff --git a/sources b/sources index 197452e7..122c6119 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4485.tar.bz2) = cf20b8da023cb9fa7605902f94effc186380de32b2e9a2e214499b211d5919e541cafeca8f463246644d70a114516e9e2d61078c2e2366c64e4cc8f43455d95b +SHA512 (vim-8.2-4529.tar.bz2) = 7adaf0022f97fac800a3a99fb66d04825a481ab87de3a832d436336e8e471246744f33857e323ef51714baf33a38d34bdda0dce5c7923965ae11aef3b6d1853e diff --git a/vim.spec b/vim.spec index d27b6025..db8c19b9 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4485 +%define patchlevel 4529 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Mar 09 2022 Zdenek Dohnal - 2:8.2.4529-1 +- patchlevel 4529 + * Tue Mar 01 2022 Zdenek Dohnal - 2:8.2.4485-1 - patchlevel 4485 From 89c3d915a97d511c6b316b5fb20b335862851172 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 16 Mar 2022 14:42:24 +0100 Subject: [PATCH 102/324] - patchlevel 4579 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 85b6bb89..344e5b86 100644 --- a/.gitignore +++ b/.gitignore @@ -390,3 +390,4 @@ /vim-8.2-4460.tar.bz2 /vim-8.2-4485.tar.bz2 /vim-8.2-4529.tar.bz2 +/vim-8.2-4579.tar.bz2 diff --git a/sources b/sources index 122c6119..6d75288a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4529.tar.bz2) = 7adaf0022f97fac800a3a99fb66d04825a481ab87de3a832d436336e8e471246744f33857e323ef51714baf33a38d34bdda0dce5c7923965ae11aef3b6d1853e +SHA512 (vim-8.2-4579.tar.bz2) = aaff4b4d6873760c2c7dada9bbb0358ac199cc71367566e8bbc8c2ba5b0f971c4bd0bf9535aa4f14e858d48ab4b1002b581ab7cf901ea9b7fb009f6020a66c60 diff --git a/vim.spec b/vim.spec index db8c19b9..886d1c16 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4529 +%define patchlevel 4579 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Mar 16 2022 Zdenek Dohnal - 2:8.2.4579-1 +- patchlevel 4579 + * Wed Mar 09 2022 Zdenek Dohnal - 2:8.2.4529-1 - patchlevel 4529 From f5d747caff7334c8e100cb62435505fffa7c54b7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 25 Mar 2022 10:05:32 +0100 Subject: [PATCH 103/324] - patchlevel 4621 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 344e5b86..0874a680 100644 --- a/.gitignore +++ b/.gitignore @@ -391,3 +391,4 @@ /vim-8.2-4485.tar.bz2 /vim-8.2-4529.tar.bz2 /vim-8.2-4579.tar.bz2 +/vim-8.2-4621.tar.bz2 diff --git a/sources b/sources index 6d75288a..2fcaf39e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4579.tar.bz2) = aaff4b4d6873760c2c7dada9bbb0358ac199cc71367566e8bbc8c2ba5b0f971c4bd0bf9535aa4f14e858d48ab4b1002b581ab7cf901ea9b7fb009f6020a66c60 +SHA512 (vim-8.2-4621.tar.bz2) = 29e6f480e0e5fdf58969f934ade2035b147a08c0ca048405d211da76c9279e6df1ab13dd6cb1d6e0b2bc18615436911df8303162a60fb95cb3b877386bf8cfd9 diff --git a/vim.spec b/vim.spec index 886d1c16..032315d1 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4579 +%define patchlevel 4621 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Mar 25 2022 Zdenek Dohnal - 2:8.2.4621-1 +- patchlevel 4621 + * Wed Mar 16 2022 Zdenek Dohnal - 2:8.2.4579-1 - patchlevel 4579 From 07acd750fa8bfdde9678f37a49ee27810760c27d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 7 Apr 2022 10:45:51 +0200 Subject: [PATCH 104/324] - patchlevel 4701 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0874a680..7de0a000 100644 --- a/.gitignore +++ b/.gitignore @@ -392,3 +392,4 @@ /vim-8.2-4529.tar.bz2 /vim-8.2-4579.tar.bz2 /vim-8.2-4621.tar.bz2 +/vim-8.2-4701.tar.bz2 diff --git a/sources b/sources index 2fcaf39e..be2372a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4621.tar.bz2) = 29e6f480e0e5fdf58969f934ade2035b147a08c0ca048405d211da76c9279e6df1ab13dd6cb1d6e0b2bc18615436911df8303162a60fb95cb3b877386bf8cfd9 +SHA512 (vim-8.2-4701.tar.bz2) = 4442f201b147076aed1c55d58f87ada01dc908b064245008face84f8fdd7ec051cab2e46f6f9e6d6c4754ac85cbe2c81c4f546a22e7d86388c5c9a6c9ac109a9 diff --git a/vim.spec b/vim.spec index 032315d1..9c9bd275 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4621 +%define patchlevel 4701 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Apr 07 2022 Zdenek Dohnal - 2:8.2.4701-1 +- patchlevel 4701 + * Fri Mar 25 2022 Zdenek Dohnal - 2:8.2.4621-1 - patchlevel 4621 From b3e48604dd3be3756916700a95331e71e733d38f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 8 Apr 2022 14:21:04 +0200 Subject: [PATCH 105/324] fix the upstream testsuite failure due downstream patch --- vim-8.0-copy-paste.patch | 39 +++++++++++++++++++++++++-------------- vim.spec | 5 ++++- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch index bfa9cc30..bd5bbd44 100644 --- a/vim-8.0-copy-paste.patch +++ b/vim-8.0-copy-paste.patch @@ -1,7 +1,8 @@ -diff -up vim82/runtime/defaults.vim.copypaste vim82/runtime/defaults.vim ---- vim82/runtime/defaults.vim.copypaste 2022-01-24 12:13:43.000000000 +0100 -+++ vim82/runtime/defaults.vim 2022-01-24 12:15:41.050120573 +0100 -@@ -73,18 +73,6 @@ map Q gq +diff --git a/runtime/defaults.vim b/runtime/defaults.vim +index f1d5cd1..b08de8e 100644 +--- a/runtime/defaults.vim ++++ b/runtime/defaults.vim +@@ -74,18 +74,6 @@ sunmap Q " Revert with ":iunmap ". inoremap u @@ -20,9 +21,10 @@ diff -up vim82/runtime/defaults.vim.copypaste vim82/runtime/defaults.vim " Only do this part when Vim was compiled with the +eval feature. if 1 -diff -up vim82/src/testdir/test_balloon.vim.copypaste vim82/src/testdir/test_balloon.vim ---- vim82/src/testdir/test_balloon.vim.copypaste 2022-01-24 12:15:41.051120576 +0100 -+++ vim82/src/testdir/test_balloon.vim 2022-01-24 12:17:02.604372440 +0100 +diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim +index ed0c6c1..90c8c40 100644 +--- a/src/testdir/test_balloon.vim ++++ b/src/testdir/test_balloon.vim @@ -9,6 +9,7 @@ source screendump.vim CheckScreendump @@ -31,9 +33,10 @@ diff -up vim82/src/testdir/test_balloon.vim.copypaste vim82/src/testdir/test_bal 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 vim82/src/testdir/test_popupwin.vim.copypaste vim82/src/testdir/test_popupwin.vim ---- vim82/src/testdir/test_popupwin.vim.copypaste 2022-01-24 12:13:44.000000000 +0100 -+++ vim82/src/testdir/test_popupwin.vim 2022-01-24 12:18:24.382624989 +0100 +diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim +index b91689e..c6b70d1 100644 +--- a/src/testdir/test_popupwin.vim ++++ b/src/testdir/test_popupwin.vim @@ -553,6 +553,7 @@ func Test_popup_drag() " create a popup that covers the command line let lines =<< trim END @@ -42,7 +45,15 @@ diff -up vim82/src/testdir/test_popupwin.vim.copypaste vim82/src/testdir/test_po split vsplit $wincmd w -@@ -625,6 +626,7 @@ func Test_popup_drag_termwin() +@@ -621,6 +622,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({ +@@ -669,6 +671,7 @@ func Test_popup_drag_termwin() let lines =<< trim END set foldmethod=marker call setline(1, range(100)) @@ -50,7 +61,7 @@ diff -up vim82/src/testdir/test_popupwin.vim.copypaste vim82/src/testdir/test_po for nr in range(7) call setline(nr * 12 + 1, "fold {{{") call setline(nr * 12 + 11, "end }}}") -@@ -678,6 +680,7 @@ func Test_popup_close_with_mouse() +@@ -722,6 +725,7 @@ func Test_popup_close_with_mouse() let lines =<< trim END call setline(1, range(1, 20)) @@ -58,7 +69,7 @@ diff -up vim82/src/testdir/test_popupwin.vim.copypaste vim82/src/testdir/test_po " With border, can click on X let winid = popup_create('foobar', #{ \ close: 'button', -@@ -1513,6 +1516,7 @@ func Test_popup_beval() +@@ -1557,6 +1561,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') @@ -66,7 +77,7 @@ diff -up vim82/src/testdir/test_popupwin.vim.copypaste vim82/src/testdir/test_po set balloonevalterm set balloonexpr=BalloonExpr() set balloondelay=100 -@@ -2218,6 +2222,7 @@ func Test_popup_scrollbar() +@@ -2262,6 +2267,7 @@ func Test_popup_scrollbar() let lines =<< trim END call setline(1, range(1, 20)) diff --git a/vim.spec b/vim.spec index 9c9bd275..97a74411 100644 --- a/vim.spec +++ b/vim.spec @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Apr 08 2022 Zdenek Dohnal - 2:8.2.4701-2 +- fix the upstream testsuite failure due downstream patch + * Thu Apr 07 2022 Zdenek Dohnal - 2:8.2.4701-1 - patchlevel 4701 From b2d31d54d2c7a4e68f5ebbeba9ff3eb53e715033 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 22 Apr 2022 07:23:11 +0200 Subject: [PATCH 106/324] - patchlevel 4804 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7de0a000..8187ff37 100644 --- a/.gitignore +++ b/.gitignore @@ -393,3 +393,4 @@ /vim-8.2-4579.tar.bz2 /vim-8.2-4621.tar.bz2 /vim-8.2-4701.tar.bz2 +/vim-8.2-4804.tar.bz2 diff --git a/sources b/sources index be2372a2..d48ab262 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4701.tar.bz2) = 4442f201b147076aed1c55d58f87ada01dc908b064245008face84f8fdd7ec051cab2e46f6f9e6d6c4754ac85cbe2c81c4f546a22e7d86388c5c9a6c9ac109a9 +SHA512 (vim-8.2-4804.tar.bz2) = f7b38803ddb07da1d0c529d2b694a169f8acd08a5623f6cd56b692b8e02d941ea24f2692121b325ef011cf36b3db312168ef9f2d788c500002c48cbc07345c84 diff --git a/vim.spec b/vim.spec index 97a74411..9f45788e 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4701 +%define patchlevel 4804 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Apr 22 2022 Zdenek Dohnal - 2:8.2.4804-1 +- patchlevel 4804 + * Fri Apr 08 2022 Zdenek Dohnal - 2:8.2.4701-2 - fix the upstream testsuite failure due downstream patch From dc0ad61031640c3bdc57be00decfaca9362dd7a7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 29 Apr 2022 14:05:50 +0200 Subject: [PATCH 107/324] - patchlevel 4845 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8187ff37..bf258f8a 100644 --- a/.gitignore +++ b/.gitignore @@ -394,3 +394,4 @@ /vim-8.2-4621.tar.bz2 /vim-8.2-4701.tar.bz2 /vim-8.2-4804.tar.bz2 +/vim-8.2-4845.tar.bz2 diff --git a/sources b/sources index d48ab262..d63c88c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4804.tar.bz2) = f7b38803ddb07da1d0c529d2b694a169f8acd08a5623f6cd56b692b8e02d941ea24f2692121b325ef011cf36b3db312168ef9f2d788c500002c48cbc07345c84 +SHA512 (vim-8.2-4845.tar.bz2) = 5b9378a2c721ebef7bca0f7282ff5d420f654208ef1f31c7caea710ffbcefe8912439d572a1c3015ba7c6446f2acb90407ce312962d6f7e92ad6e5ab9b773efc diff --git a/vim.spec b/vim.spec index 9f45788e..57e92fef 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4804 +%define patchlevel 4845 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Apr 29 2022 Zdenek Dohnal - 2:8.2.4845-1 +- patchlevel 4845 + * Fri Apr 22 2022 Zdenek Dohnal - 2:8.2.4804-1 - patchlevel 4804 From de8dcbfba8c51719317ae4825c0db5301aab3629 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 2 May 2022 12:18:09 +0200 Subject: [PATCH 108/324] - patchlevel 4857 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bf258f8a..5c66fe5f 100644 --- a/.gitignore +++ b/.gitignore @@ -395,3 +395,4 @@ /vim-8.2-4701.tar.bz2 /vim-8.2-4804.tar.bz2 /vim-8.2-4845.tar.bz2 +/vim-8.2-4857.tar.bz2 diff --git a/sources b/sources index d63c88c8..43d4df31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4845.tar.bz2) = 5b9378a2c721ebef7bca0f7282ff5d420f654208ef1f31c7caea710ffbcefe8912439d572a1c3015ba7c6446f2acb90407ce312962d6f7e92ad6e5ab9b773efc +SHA512 (vim-8.2-4857.tar.bz2) = 6e48bed9ad047ee11985a799ea033ccfd6207c3e01702cc7e8aa9f0a6f7148b69d8c344640b5fc099d315bfbfc879b4edd5fe776bf4110b07ed02c5fce53f236 diff --git a/vim.spec b/vim.spec index 57e92fef..ea34c8db 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4845 +%define patchlevel 4857 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon May 02 2022 Zdenek Dohnal - 2:8.2.4857-1 +- patchlevel 4857 + * Fri Apr 29 2022 Zdenek Dohnal - 2:8.2.4845-1 - patchlevel 4845 From 727d98ee1ec19d99f2fb1df1053ec97542005030 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 6 May 2022 10:38:04 +0200 Subject: [PATCH 109/324] - patchlevel 4877 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5c66fe5f..da5770ef 100644 --- a/.gitignore +++ b/.gitignore @@ -396,3 +396,4 @@ /vim-8.2-4804.tar.bz2 /vim-8.2-4845.tar.bz2 /vim-8.2-4857.tar.bz2 +/vim-8.2-4877.tar.bz2 diff --git a/sources b/sources index 43d4df31..b6efa4af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4857.tar.bz2) = 6e48bed9ad047ee11985a799ea033ccfd6207c3e01702cc7e8aa9f0a6f7148b69d8c344640b5fc099d315bfbfc879b4edd5fe776bf4110b07ed02c5fce53f236 +SHA512 (vim-8.2-4877.tar.bz2) = 32cc1808e1ae166e7ed7ec8f55594a91ee206bf70b9e25b19fe36a7d76930b541f5fb36deb0c29cfdac5df8e671140da4c1ebcb9e6fc48b9800807b4f266a44d diff --git a/vim.spec b/vim.spec index ea34c8db..0d22ed1a 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4857 +%define patchlevel 4877 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -969,6 +969,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri May 06 2022 Zdenek Dohnal - 2:8.2.4877-1 +- patchlevel 4877 + * Mon May 02 2022 Zdenek Dohnal - 2:8.2.4857-1 - patchlevel 4857 From 727eda08bcf3affe5f1ba200dc86656c05372646 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 9 May 2022 18:02:35 +0200 Subject: [PATCH 110/324] add new file vimhelp.vim --- vim.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 0d22ed1a..05eacd5d 100644 --- a/vim.spec +++ b/vim.spec @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -747,6 +747,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/%{name}/%{vimdir}/*.vim %exclude %{_datadir}/%{name}/%{vimdir}/defaults.vim %{_datadir}/%{name}/%{vimdir}/ftplugin +%{_datadir}/%{name}/%{vimdir}/import/dist/vimhelp.vim %{_datadir}/%{name}/%{vimdir}/indent %{_datadir}/%{name}/%{vimdir}/keymap %{_datadir}/%{name}/%{vimdir}/lang/*.vim @@ -916,6 +917,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %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 @@ -969,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon May 09 2022 Zdenek Dohnal - 2:8.2.4877-2 +- add new file vimhelp.vim + * Fri May 06 2022 Zdenek Dohnal - 2:8.2.4877-1 - patchlevel 4877 From 51f7b1bbeb512f04c74985d009649a9db77752c0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 9 May 2022 18:03:18 +0200 Subject: [PATCH 111/324] - patchlevel 4927 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index da5770ef..f7fe4a9e 100644 --- a/.gitignore +++ b/.gitignore @@ -397,3 +397,4 @@ /vim-8.2-4845.tar.bz2 /vim-8.2-4857.tar.bz2 /vim-8.2-4877.tar.bz2 +/vim-8.2-4927.tar.bz2 diff --git a/sources b/sources index b6efa4af..9fb00fd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4877.tar.bz2) = 32cc1808e1ae166e7ed7ec8f55594a91ee206bf70b9e25b19fe36a7d76930b541f5fb36deb0c29cfdac5df8e671140da4c1ebcb9e6fc48b9800807b4f266a44d +SHA512 (vim-8.2-4927.tar.bz2) = 5990a5e04649816eb706686dab3a8ab43cdb94f77d85a92aab6bb6a8c53fae4957dfc59d8ea9df691b6eec85b25881d75f3ffb71acb033f9e61010bc49dfdbaa diff --git a/vim.spec b/vim.spec index 05eacd5d..95d1eded 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4877 +%define patchlevel 4927 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -972,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon May 09 2022 Zdenek Dohnal - 2:8.2.4927-1 +- patchlevel 4927 + * Mon May 09 2022 Zdenek Dohnal - 2:8.2.4877-2 - add new file vimhelp.vim From c6de778762f32044f4f430cdf4ab05f3e9a6883e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 17 May 2022 13:23:55 +0200 Subject: [PATCH 112/324] - patchlevel 4969 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f7fe4a9e..18471ab4 100644 --- a/.gitignore +++ b/.gitignore @@ -398,3 +398,4 @@ /vim-8.2-4857.tar.bz2 /vim-8.2-4877.tar.bz2 /vim-8.2-4927.tar.bz2 +/vim-8.2-4969.tar.bz2 diff --git a/sources b/sources index 9fb00fd7..a3b9fed1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4927.tar.bz2) = 5990a5e04649816eb706686dab3a8ab43cdb94f77d85a92aab6bb6a8c53fae4957dfc59d8ea9df691b6eec85b25881d75f3ffb71acb033f9e61010bc49dfdbaa +SHA512 (vim-8.2-4969.tar.bz2) = 2f30f3acf0df4a6e9777111753d0911fd054e02ea9f354f753b062c41e72f99d1c06ff6e4ca6b8efa62492c44c1fc993cec45bb400a2a5387a61f8b0a78f5eb3 diff --git a/vim.spec b/vim.spec index 95d1eded..c1fad620 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4927 +%define patchlevel 4969 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -972,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue May 17 2022 Zdenek Dohnal - 2:8.2.4969-1 +- patchlevel 4969 + * Mon May 09 2022 Zdenek Dohnal - 2:8.2.4927-1 - patchlevel 4927 From 26300dd934dc0634966dc4d4dcd06e5cd455d995 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 18 May 2022 08:58:38 +0200 Subject: [PATCH 113/324] - patchlevel 4975 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 18471ab4..8aebe486 100644 --- a/.gitignore +++ b/.gitignore @@ -399,3 +399,4 @@ /vim-8.2-4877.tar.bz2 /vim-8.2-4927.tar.bz2 /vim-8.2-4969.tar.bz2 +/vim-8.2-4975.tar.bz2 diff --git a/sources b/sources index a3b9fed1..d43b86a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4969.tar.bz2) = 2f30f3acf0df4a6e9777111753d0911fd054e02ea9f354f753b062c41e72f99d1c06ff6e4ca6b8efa62492c44c1fc993cec45bb400a2a5387a61f8b0a78f5eb3 +SHA512 (vim-8.2-4975.tar.bz2) = 30d7042a0182b475466a72edb7d9623cbd8f800d31671e3efb84deb3ae24a1d0bdc7b128eb7793c9bfd8a8876926522bf2d3997ac7470702952140d66d224586 diff --git a/vim.spec b/vim.spec index c1fad620..f2583c6e 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4969 +%define patchlevel 4975 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -972,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed May 18 2022 Zdenek Dohnal - 2:8.2.4975-1 +- patchlevel 4975 + * Tue May 17 2022 Zdenek Dohnal - 2:8.2.4969-1 - patchlevel 4969 From d920422825e4cc8850cd8e265fefea53b294e9e0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 31 May 2022 12:09:34 +0200 Subject: [PATCH 114/324] - patchlevel 5046 --- .gitignore | 1 + sources | 2 +- vim-7.4-releasestring-1318991.patch | 14 -------------- vim.spec | 19 ++++++++++--------- 4 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 vim-7.4-releasestring-1318991.patch diff --git a/.gitignore b/.gitignore index 8aebe486..fe987b49 100644 --- a/.gitignore +++ b/.gitignore @@ -400,3 +400,4 @@ /vim-8.2-4927.tar.bz2 /vim-8.2-4969.tar.bz2 /vim-8.2-4975.tar.bz2 +/vim-8.2-5046.tar.bz2 diff --git a/sources b/sources index d43b86a3..79f0a43e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-4975.tar.bz2) = 30d7042a0182b475466a72edb7d9623cbd8f800d31671e3efb84deb3ae24a1d0bdc7b128eb7793c9bfd8a8876926522bf2d3997ac7470702952140d66d224586 +SHA512 (vim-8.2-5046.tar.bz2) = b45567a29cc7ce42780d6a5f3cd9131d2b760fcc2eaef4aaeb8412a561ef2161309be7fcfea48c91d018345578eef33d018f84110ae32d2fefa109515220c2c1 diff --git a/vim-7.4-releasestring-1318991.patch b/vim-7.4-releasestring-1318991.patch deleted file mode 100644 index 291b957f..00000000 --- a/vim-7.4-releasestring-1318991.patch +++ /dev/null @@ -1,14 +0,0 @@ -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.spec b/vim.spec index f2583c6e..46866e8d 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 4975 +%define patchlevel 5046 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -73,13 +73,12 @@ Patch3000: vim-7.4-fstabsyntax.patch Patch3001: vim-7.3-manpage-typo-668894-675480.patch Patch3002: vim-manpagefixes-948566.patch Patch3003: vim-7.4-globalsyntax.patch -Patch3004: vim-7.4-releasestring-1318991.patch # migrate shebangs in script to /usr/bin/python3 and use python2 when necessary -Patch3005: vim-python3-tests.patch +Patch3004: vim-python3-tests.patch # fips warning (Fedora downstream patch) -Patch3006: vim-crypto-warning.patch +Patch3005: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) -Patch3007: vim-8.0-copy-paste.patch +Patch3006: vim-8.0-copy-paste.patch # uses autoconf in spec file @@ -370,10 +369,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3001 -p1 %patch3002 -p1 %patch3003 -p1 -%patch3004 -p1 -%patch3005 -p1 -b .python-tests -%patch3006 -p1 -b .fips-warning -%patch3007 -p1 -b .copypaste +%patch3004 -p1 -b .python-tests +%patch3005 -p1 -b .fips-warning +%patch3006 -p1 -b .copypaste %build cd src @@ -972,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue May 31 2022 Zdenek Dohnal - 2:8.2.5046-1 +- patchlevel 5046 + * Wed May 18 2022 Zdenek Dohnal - 2:8.2.4975-1 - patchlevel 4975 From 4743fed24ea6c345a0be9216642b30f2b541005d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 3 Jun 2022 10:00:29 +0200 Subject: [PATCH 115/324] F34 goes EOL next week --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index efe29a40..fc2776f5 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f36" "f35" "f34" ) -releases=( "fc37" "fc36" "fc35" "fc34" ) +branches=( "rawhide" "f36" "f35" ) +releases=( "fc37" "fc36" "fc35" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc37" "fc36" "\|fc35" "\|fc34" ) -bodhi_enabled=( "0" "1" "1" "1" ) +regexps=( "fc37" "fc36" "\|fc35" ) +bodhi_enabled=( "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From 1087d0a94cff30b690792d744ba3021d4408e1b5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 3 Jun 2022 10:02:06 +0200 Subject: [PATCH 116/324] - patchlevel 5052 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fe987b49..35ddecba 100644 --- a/.gitignore +++ b/.gitignore @@ -401,3 +401,4 @@ /vim-8.2-4969.tar.bz2 /vim-8.2-4975.tar.bz2 /vim-8.2-5046.tar.bz2 +/vim-8.2-5052.tar.bz2 diff --git a/sources b/sources index 79f0a43e..6c49acc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-5046.tar.bz2) = b45567a29cc7ce42780d6a5f3cd9131d2b760fcc2eaef4aaeb8412a561ef2161309be7fcfea48c91d018345578eef33d018f84110ae32d2fefa109515220c2c1 +SHA512 (vim-8.2-5052.tar.bz2) = a788db30c10ed5f40eefc58d52b4d7a80b29493e5260c9da7b51b211051cc2e5d824e8e6b63a54401a07ca7bcf048d7342e92c514a8245bf668bc53cf3f844ca diff --git a/vim.spec b/vim.spec index 46866e8d..ba57a126 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 5046 +%define patchlevel 5052 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Jun 03 2022 Zdenek Dohnal - 2:8.2.5052-1 +- patchlevel 5052 + * Tue May 31 2022 Zdenek Dohnal - 2:8.2.5046-1 - patchlevel 5046 From bafaf2dc8d79b5e1c42a4d19ef106cd25ad14ae9 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 14 Jun 2022 11:34:42 +0200 Subject: [PATCH 117/324] - patchlevel 5085 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 35ddecba..57709f5d 100644 --- a/.gitignore +++ b/.gitignore @@ -402,3 +402,4 @@ /vim-8.2-4975.tar.bz2 /vim-8.2-5046.tar.bz2 /vim-8.2-5052.tar.bz2 +/vim-8.2-5085.tar.bz2 diff --git a/sources b/sources index 6c49acc9..07a051eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-5052.tar.bz2) = a788db30c10ed5f40eefc58d52b4d7a80b29493e5260c9da7b51b211051cc2e5d824e8e6b63a54401a07ca7bcf048d7342e92c514a8245bf668bc53cf3f844ca +SHA512 (vim-8.2-5085.tar.bz2) = 6ec0a9a18ac7354f997538b634e6447c7bba193c0b641c35155ff79b6218c45439e984b2b68981d08ebb9103321a8cac80cc4b62a88b8762b3c49b32fdfb1d34 diff --git a/vim.spec b/vim.spec index ba57a126..ab1f5a10 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 5052 +%define patchlevel 5085 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Jun 14 2022 Zdenek Dohnal - 2:8.2.5085-1 +- patchlevel 5085 + * Fri Jun 03 2022 Zdenek Dohnal - 2:8.2.5052-1 - patchlevel 5052 From 96bd44923f9c1f1b77f906231cb1a0f2a9f9cef9 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 21 Jun 2022 15:26:32 +0200 Subject: [PATCH 118/324] - patchlevel 5141 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 57709f5d..d04e5f04 100644 --- a/.gitignore +++ b/.gitignore @@ -403,3 +403,4 @@ /vim-8.2-5046.tar.bz2 /vim-8.2-5052.tar.bz2 /vim-8.2-5085.tar.bz2 +/vim-8.2-5141.tar.bz2 diff --git a/sources b/sources index 07a051eb..5abb2f1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-5085.tar.bz2) = 6ec0a9a18ac7354f997538b634e6447c7bba193c0b641c35155ff79b6218c45439e984b2b68981d08ebb9103321a8cac80cc4b62a88b8762b3c49b32fdfb1d34 +SHA512 (vim-8.2-5141.tar.bz2) = effb7fb9663042f365d318557349d40bc4b162fde3f694e6018ffc49de505a4fe6b8123bcbcf44ce3da761b0548d581bf97341d197b6fd3c0b04110e5b775b1e diff --git a/vim.spec b/vim.spec index ab1f5a10..4ab0e375 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 5085 +%define patchlevel 5141 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Jun 21 2022 Zdenek Dohnal - 2:8.2.5141-1 +- patchlevel 5141 + * Tue Jun 14 2022 Zdenek Dohnal - 2:8.2.5085-1 - patchlevel 5085 From b6fb8ebdab29aaf8bf7c171676de515b700b12bc Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 28 Jun 2022 12:46:11 +0200 Subject: [PATCH 119/324] - patchlevel 5172 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d04e5f04..2d5c12d4 100644 --- a/.gitignore +++ b/.gitignore @@ -404,3 +404,4 @@ /vim-8.2-5052.tar.bz2 /vim-8.2-5085.tar.bz2 /vim-8.2-5141.tar.bz2 +/vim-8.2-5172.tar.bz2 diff --git a/sources b/sources index 5abb2f1f..2534df09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-5141.tar.bz2) = effb7fb9663042f365d318557349d40bc4b162fde3f694e6018ffc49de505a4fe6b8123bcbcf44ce3da761b0548d581bf97341d197b6fd3c0b04110e5b775b1e +SHA512 (vim-8.2-5172.tar.bz2) = 006d35123d350453e3c3f6fcba3ee228a7fb08bfde75e484201e59043e91281cc5a7e99ce296d287a6d103b37e3b3dcc39211653f192ffa5bc5df8d112c7db75 diff --git a/vim.spec b/vim.spec index 4ab0e375..191aef62 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 5141 +%define patchlevel 5172 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Jun 28 2022 Zdenek Dohnal - 2:8.2.5172-1 +- patchlevel 5172 + * Tue Jun 21 2022 Zdenek Dohnal - 2:8.2.5141-1 - patchlevel 5141 From 3e31826a83fa8628d4a8bbee903693f3cef85478 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 28 Jun 2022 14:28:14 +0200 Subject: [PATCH 120/324] vim-update.sh: F36+ bodhi-client doesnt have --user --- vim-update.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vim-update.sh b/vim-update.sh index fc2776f5..45c4e520 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -119,6 +119,11 @@ if [ $CHANGES -ne 0 ]; then for branch in "${branches[@]:(1)}"; do + if [ "x$branch" == "xf35" ] + then + BODHI_USER="--user $(id -un)" + fi + # switch to branch $debug fedpkg switch-branch $branch @@ -164,7 +169,7 @@ if [ $CHANGES -ne 0 ]; then # not have an update in testing if [ $branch != "rawhide" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then # uses 'id' value for updates -> your username in OS must match with your username in Fedora accounts - $debug bodhi updates new --user $(id -un) --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} + $debug bodhi updates new ${BODHI_USER} --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} fi else echo "Error when building package for $branch" From 5e82e77f8cd6d808115ffcfddef99f95f9a5d9a5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 11 Jul 2022 15:23:35 +0200 Subject: [PATCH 121/324] - patchlevel 49 --- .gitignore | 1 + sources | 2 +- vim.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2d5c12d4..4909165a 100644 --- a/.gitignore +++ b/.gitignore @@ -405,3 +405,4 @@ /vim-8.2-5085.tar.bz2 /vim-8.2-5141.tar.bz2 /vim-8.2-5172.tar.bz2 +/vim-9.0-049.tar.bz2 diff --git a/sources b/sources index 2534df09..3cfa129a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-5172.tar.bz2) = 006d35123d350453e3c3f6fcba3ee228a7fb08bfde75e484201e59043e91281cc5a7e99ce296d287a6d103b37e3b3dcc39211653f192ffa5bc5df8d112c7db75 +SHA512 (vim-9.0-049.tar.bz2) = 20272279e21de0843b6260e8a8ecd43c328d43cf8ce7df6d7e86793e219ae99da6dfbb49ca903840e817847f1ace4f78f12d6a2a0cbc81c0e2cac54e345257af diff --git a/vim.spec b/vim.spec index 191aef62..8fdef702 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 5172 +%define patchlevel 049 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -31,8 +31,8 @@ %define withruby 1 %define withlua 1 -%define baseversion 8.2 -%define vimdir vim82 +%define baseversion 9.0 +%define vimdir vim90 Summary: The VIM editor URL: http://www.vim.org/ @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Jul 11 2022 Zdenek Dohnal - 2:9.0.049-1 +- patchlevel 049 + * Tue Jun 28 2022 Zdenek Dohnal - 2:8.2.5172-1 - patchlevel 5172 From c1bb8dc5e668439d6f717286937fbf4d134b98f8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 11 Jul 2022 17:05:32 +0200 Subject: [PATCH 122/324] vim-update.sh: bodhi client version depends on machine where we run the script, not on branch in git --- vim-update.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 45c4e520..13904746 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -28,6 +28,11 @@ if [ "x$1" == "x--force" ]; then force=1 fi +if [ "x$(grep -o VERSION_ID=35 /etc/os-release)" == "xVERSION_ID=35" ] +then + BODHI_USER="--user $(id -un)" +fi + DATE=`date +"%a %b %d %Y"` $debug fedpkg switch-branch "${branches[@]: $branches_index: 1}" @@ -119,11 +124,6 @@ if [ $CHANGES -ne 0 ]; then for branch in "${branches[@]:(1)}"; do - if [ "x$branch" == "xf35" ] - then - BODHI_USER="--user $(id -un)" - fi - # switch to branch $debug fedpkg switch-branch $branch From 57248766e4b5af18c652743446e2f506ed95cf31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:52:10 +0000 Subject: [PATCH 123/324] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 8fdef702..106d4976 100644 --- a/vim.spec +++ b/vim.spec @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2:9.0.049-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jul 11 2022 Zdenek Dohnal - 2:9.0.049-1 - patchlevel 049 From e8204a5a6f5ae111215afc7b1f4a711fd4738b1f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 26 Jul 2022 14:54:25 +0200 Subject: [PATCH 124/324] - patchlevel 77 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4909165a..3ee31c16 100644 --- a/.gitignore +++ b/.gitignore @@ -406,3 +406,4 @@ /vim-8.2-5141.tar.bz2 /vim-8.2-5172.tar.bz2 /vim-9.0-049.tar.bz2 +/vim-9.0-077.tar.bz2 diff --git a/sources b/sources index 3cfa129a..8e150c1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-049.tar.bz2) = 20272279e21de0843b6260e8a8ecd43c328d43cf8ce7df6d7e86793e219ae99da6dfbb49ca903840e817847f1ace4f78f12d6a2a0cbc81c0e2cac54e345257af +SHA512 (vim-9.0-077.tar.bz2) = 9642d8cc137b0c56aa3f7973befbd74fca01ccc592530854fc66b8d6be5ae0949470a8113b05a156dcce4774fb33ece8e2886c10cf7ba61e52694ec900e32586 diff --git a/vim.spec b/vim.spec index 106d4976..7e1c9dc4 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 049 +%define patchlevel 077 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Jul 26 2022 Zdenek Dohnal - 2:9.0.077-1 +- patchlevel 077 + * Sat Jul 23 2022 Fedora Release Engineering - 2:9.0.049-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From cbdce42a3dbfaeb93cbc4696ba2b7c74a68d7783 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 4 Aug 2022 12:59:22 +0200 Subject: [PATCH 125/324] - patchlevel 137 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3ee31c16..2fd2de14 100644 --- a/.gitignore +++ b/.gitignore @@ -407,3 +407,4 @@ /vim-8.2-5172.tar.bz2 /vim-9.0-049.tar.bz2 /vim-9.0-077.tar.bz2 +/vim-9.0-137.tar.bz2 diff --git a/sources b/sources index 8e150c1a..55ba339b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-077.tar.bz2) = 9642d8cc137b0c56aa3f7973befbd74fca01ccc592530854fc66b8d6be5ae0949470a8113b05a156dcce4774fb33ece8e2886c10cf7ba61e52694ec900e32586 +SHA512 (vim-9.0-137.tar.bz2) = 55e3e9663b8bae92f8dc8e0084bdb35d72c5e4e9a82d44bd8e0aa1cde236b8bc2a417a95779fa123cb3c80c6ad9d8cc774dc34e0e5d865905f442e1592506259 diff --git a/vim.spec b/vim.spec index 7e1c9dc4..43cfb33b 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 077 +%define patchlevel 137 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Aug 04 2022 Zdenek Dohnal - 2:9.0.137-1 +- patchlevel 137 + * Tue Jul 26 2022 Zdenek Dohnal - 2:9.0.077-1 - patchlevel 077 From eb02b9333153d970967b020319bae9cda341a80e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 11 Aug 2022 11:47:40 +0200 Subject: [PATCH 126/324] vim-udpate.sh: Add F37 --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 13904746..0c63a773 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f36" "f35" ) -releases=( "fc37" "fc36" "fc35" ) +branches=( "rawhide" "f37" "f36" "f35" ) +releases=( "fc38" "fc37" "fc36" "fc35" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc37" "fc36" "\|fc35" ) -bodhi_enabled=( "0" "1" "1" ) +regexps=( "fc38" "fc37" "fc36" "\|fc35" ) +bodhi_enabled=( "0" "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From c09aabf5af0988e07d43ea16d1f22eacfa181844 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 11 Aug 2022 11:59:03 +0200 Subject: [PATCH 127/324] - patchlevel 189 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2fd2de14..a9fbcae1 100644 --- a/.gitignore +++ b/.gitignore @@ -408,3 +408,4 @@ /vim-9.0-049.tar.bz2 /vim-9.0-077.tar.bz2 /vim-9.0-137.tar.bz2 +/vim-9.0-189.tar.bz2 diff --git a/sources b/sources index 55ba339b..36a70b38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-137.tar.bz2) = 55e3e9663b8bae92f8dc8e0084bdb35d72c5e4e9a82d44bd8e0aa1cde236b8bc2a417a95779fa123cb3c80c6ad9d8cc774dc34e0e5d865905f442e1592506259 +SHA512 (vim-9.0-189.tar.bz2) = 9f130c71400c2b1295d5aabdc146b7b62eb1d35cf5c59f7bd9167a00ff9e2861e638b5e5feea1c4a5960b1e51518ceb3f018a8cca9705f2637855cae33d07357 diff --git a/vim.spec b/vim.spec index 43cfb33b..f2c890bd 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 137 +%define patchlevel 189 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Aug 11 2022 Zdenek Dohnal - 2:9.0.189-1 +- patchlevel 189 + * Thu Aug 04 2022 Zdenek Dohnal - 2:9.0.137-1 - patchlevel 137 From 74b6b5a9184dfabeb3e35db7dc919e5875c22518 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 15 Aug 2022 15:02:38 +0200 Subject: [PATCH 128/324] - patchlevel 213 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a9fbcae1..be5a652c 100644 --- a/.gitignore +++ b/.gitignore @@ -409,3 +409,4 @@ /vim-9.0-077.tar.bz2 /vim-9.0-137.tar.bz2 /vim-9.0-189.tar.bz2 +/vim-9.0-213.tar.bz2 diff --git a/sources b/sources index 36a70b38..5cdf817c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-189.tar.bz2) = 9f130c71400c2b1295d5aabdc146b7b62eb1d35cf5c59f7bd9167a00ff9e2861e638b5e5feea1c4a5960b1e51518ceb3f018a8cca9705f2637855cae33d07357 +SHA512 (vim-9.0-213.tar.bz2) = 5658f0431bde26b03472a337745a172426e9dd2a9a26a90e11766a3f6bc1fa568f93c6ffc43e5660dbedc1cbe7450055e0375a9a5659146e0031a8afca18c35f diff --git a/vim.spec b/vim.spec index f2c890bd..47d2a84c 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 189 +%define patchlevel 213 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Aug 15 2022 Zdenek Dohnal - 2:9.0.213-1 +- patchlevel 213 + * Thu Aug 11 2022 Zdenek Dohnal - 2:9.0.189-1 - patchlevel 189 From b8d3c07d36fbeac5a0ead29fc0eadbc70a4e3b53 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 23 Aug 2022 14:47:01 +0200 Subject: [PATCH 129/324] vim-update.sh: F37 bodhi enablement point --- vim-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 0c63a773..83ac1698 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -5,8 +5,8 @@ branches=( "rawhide" "f37" "f36" "f35" ) releases=( "fc38" "fc37" "fc36" "fc35" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc38" "fc37" "fc36" "\|fc35" ) -bodhi_enabled=( "0" "0" "1" "1" ) +regexps=( "fc38" "fc37" "\|fc36" "\|fc35" ) +bodhi_enabled=( "0" "1" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From 421aee0f07ca774711248c7cd2833cc446bf42ca Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 23 Aug 2022 14:57:35 +0200 Subject: [PATCH 130/324] - patchlevel 246 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index be5a652c..cfea81e0 100644 --- a/.gitignore +++ b/.gitignore @@ -410,3 +410,4 @@ /vim-9.0-137.tar.bz2 /vim-9.0-189.tar.bz2 /vim-9.0-213.tar.bz2 +/vim-9.0-246.tar.bz2 diff --git a/sources b/sources index 5cdf817c..266b9bd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-213.tar.bz2) = 5658f0431bde26b03472a337745a172426e9dd2a9a26a90e11766a3f6bc1fa568f93c6ffc43e5660dbedc1cbe7450055e0375a9a5659146e0031a8afca18c35f +SHA512 (vim-9.0-246.tar.bz2) = de138fc1302c3bd2d4f58d5839bf50b49e9f86a83b3906e012f95461a3c2a84e812e574cc8055b165cfd3b4937fc1cd92d8cf7cd052fb2a22d7c69bcba410851 diff --git a/vim.spec b/vim.spec index 47d2a84c..97ad5460 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 213 +%define patchlevel 246 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Aug 23 2022 Zdenek Dohnal - 2:9.0.246-1 +- patchlevel 246 + * Mon Aug 15 2022 Zdenek Dohnal - 2:9.0.213-1 - patchlevel 213 From fdb157c32495fab01689606ed9e1591cf89da9b4 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 30 Aug 2022 15:44:41 +0200 Subject: [PATCH 131/324] - patchlevel 327 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cfea81e0..a89f91b6 100644 --- a/.gitignore +++ b/.gitignore @@ -411,3 +411,4 @@ /vim-9.0-189.tar.bz2 /vim-9.0-213.tar.bz2 /vim-9.0-246.tar.bz2 +/vim-9.0-327.tar.bz2 diff --git a/sources b/sources index 266b9bd6..b4402b30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-246.tar.bz2) = de138fc1302c3bd2d4f58d5839bf50b49e9f86a83b3906e012f95461a3c2a84e812e574cc8055b165cfd3b4937fc1cd92d8cf7cd052fb2a22d7c69bcba410851 +SHA512 (vim-9.0-327.tar.bz2) = 3b036a81b10d52ab265e6033913840999ae034213f9b39e12beaeefde27d8f0b032e03035e5c0317d47c877f98d749e84f6c44aa42165958bcb23cfe8eaaf7d0 diff --git a/vim.spec b/vim.spec index 97ad5460..1b9bcd5b 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 246 +%define patchlevel 327 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Aug 30 2022 Zdenek Dohnal - 2:9.0.327-1 +- patchlevel 327 + * Tue Aug 23 2022 Zdenek Dohnal - 2:9.0.246-1 - patchlevel 246 From 756d97c8fe59ed16edec44d4fce46a128a0d5dad Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 1 Sep 2022 15:48:12 +0200 Subject: [PATCH 132/324] - patchlevel 348 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a89f91b6..ce0dc863 100644 --- a/.gitignore +++ b/.gitignore @@ -412,3 +412,4 @@ /vim-9.0-213.tar.bz2 /vim-9.0-246.tar.bz2 /vim-9.0-327.tar.bz2 +/vim-9.0-348.tar.bz2 diff --git a/sources b/sources index b4402b30..e426b82b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-327.tar.bz2) = 3b036a81b10d52ab265e6033913840999ae034213f9b39e12beaeefde27d8f0b032e03035e5c0317d47c877f98d749e84f6c44aa42165958bcb23cfe8eaaf7d0 +SHA512 (vim-9.0-348.tar.bz2) = 05defef5b7f0a856c2b891ac040a08c2de4a8541f87334156779f8ec74cdec5f41b0683aff7870b667316941bf8b6fcfc6648bd4f9f6450ea8b28ffc9ee754a8 diff --git a/vim.spec b/vim.spec index 1b9bcd5b..77dfefb3 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 327 +%define patchlevel 348 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Sep 01 2022 Zdenek Dohnal - 2:9.0.348-1 +- patchlevel 348 + * Tue Aug 30 2022 Zdenek Dohnal - 2:9.0.327-1 - patchlevel 327 From 405bfd2cf6d7e10139aef919997e8bda106ebdfd Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 8 Sep 2022 10:28:50 +0200 Subject: [PATCH 133/324] - patchlevel 412 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ce0dc863..a324b3f1 100644 --- a/.gitignore +++ b/.gitignore @@ -413,3 +413,4 @@ /vim-9.0-246.tar.bz2 /vim-9.0-327.tar.bz2 /vim-9.0-348.tar.bz2 +/vim-9.0-412.tar.bz2 diff --git a/sources b/sources index e426b82b..5c3e78d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-348.tar.bz2) = 05defef5b7f0a856c2b891ac040a08c2de4a8541f87334156779f8ec74cdec5f41b0683aff7870b667316941bf8b6fcfc6648bd4f9f6450ea8b28ffc9ee754a8 +SHA512 (vim-9.0-412.tar.bz2) = fae887557bc8b0e20e01fefea9b88d12f18c371f0c0fa8848a3a5bfe3120e47d5bcf402344cb2137226e1612ad766f3c6a5071018227e0c6639345a02543bcbd diff --git a/vim.spec b/vim.spec index 77dfefb3..1ebc8954 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 348 +%define patchlevel 412 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -970,6 +970,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Sep 08 2022 Zdenek Dohnal - 2:9.0.412-1 +- patchlevel 412 + * Thu Sep 01 2022 Zdenek Dohnal - 2:9.0.348-1 - patchlevel 348 From 7e4bad765b6975cb7001eb7ef303e957d490854d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 16 Sep 2022 09:56:02 +0200 Subject: [PATCH 134/324] provide 'vim(plugins-supported)' for plugins to require Vim/GVim --- vim.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 1ebc8954..a8b3cce7 100644 --- a/vim.spec +++ b/vim.spec @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -209,6 +209,7 @@ Conflicts: vim-wrappers < 2:8.2.2488-1 # bundled libvterm for catching possible libvterm CVEs Provides: bundled(libvterm) Provides: vim +Provides: vim(plugins-supported) Provides: %{_bindir}/mergetool Provides: %{_bindir}/vim Requires: vim-common = %{epoch}:%{version}-%{release} @@ -274,6 +275,7 @@ BuildRequires: libappstream-glib BuildRequires: libcanberra-devel Provides: gvim +Provides: vim(plugins-supported) Provides: %{_bindir}/mergetool Provides: %{_bindir}/gvim # GVIM graphics are based on GTK3 @@ -970,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Sep 16 2022 Zdenek Dohnal - 2:9.0.412-2 +- provide 'vim(plugins-supported)' for plugins to require Vim/GVim + * Thu Sep 08 2022 Zdenek Dohnal - 2:9.0.412-1 - patchlevel 412 From 8c779e784034966c5c17c58e7fe7258ff061019b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 16 Sep 2022 10:03:30 +0200 Subject: [PATCH 135/324] vim.spec: Conflicts cleanup --- vim.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/vim.spec b/vim.spec index a8b3cce7..a8a1186e 100644 --- a/vim.spec +++ b/vim.spec @@ -153,7 +153,7 @@ multiple windows, multi-level undo, block highlighting and more. 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 +# 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} @@ -182,11 +182,8 @@ many different languages. 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 +# remove after F36 EOL+after release CentOS Stream > 9 Conflicts: %{name}-common < %{epoch}:8.2.3642-2 -# remove Conflicts+Obsoletes for wrappers after F34 is EOL -Conflicts: vim-wrappers < 2:8.2.2488-1 -Obsoletes: vim-wrappers < 2:8.2.2488-1 Provides: vi Provides: %{_bindir}/vi # shared files between common and minimal @@ -203,8 +200,6 @@ only available when the vim-common package is installed. %package enhanced Summary: A version of the VIM editor which includes recent enhancements -# remove Conflicts for wrappers after F34 is EOL -Conflicts: vim-wrappers < 2:8.2.2488-1 # vim bundles libvterm, which is used during build - so we need to provide # bundled libvterm for catching possible libvterm CVEs Provides: bundled(libvterm) @@ -320,7 +315,7 @@ vim-common package. Summary: Shared data for Vi and Vim BuildArch: noarch # moved files from filesystem, common and minimal to data -# remove after F36 EOL +# 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 @@ -334,9 +329,6 @@ shared between vim-minimal and vim-common packages. Summary: Set vim as the default editor BuildArch: noarch Conflicts: system-default-editor -# conflict with nano-default-editor which doesn't provide system-default-editor -# remove after F33 is EOL -Conflicts: nano-default-editor < 5.3-3 Provides: system-default-editor Requires: vim-enhanced From 2fb216720eeed17338d274688b7bcb5bd8dadcd5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 16 Sep 2022 10:05:03 +0200 Subject: [PATCH 136/324] - patchlevel 475 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a324b3f1..0bd0548f 100644 --- a/.gitignore +++ b/.gitignore @@ -414,3 +414,4 @@ /vim-9.0-327.tar.bz2 /vim-9.0-348.tar.bz2 /vim-9.0-412.tar.bz2 +/vim-9.0-475.tar.bz2 diff --git a/sources b/sources index 5c3e78d6..13d8cf10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-412.tar.bz2) = fae887557bc8b0e20e01fefea9b88d12f18c371f0c0fa8848a3a5bfe3120e47d5bcf402344cb2137226e1612ad766f3c6a5071018227e0c6639345a02543bcbd +SHA512 (vim-9.0-475.tar.bz2) = e8cf29f02a3c76b55763b8513ee2b1d037996c6da4ea629e9ad8bf17731dd7e99544a621ba666e90cbe3c76f4a5bbdde96410eb3757f2290183855b09ae7b49a diff --git a/vim.spec b/vim.spec index a8a1186e..18ef79f6 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 412 +%define patchlevel 475 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -964,6 +964,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Sep 16 2022 Zdenek Dohnal - 2:9.0.475-1 +- patchlevel 475 + * Fri Sep 16 2022 Zdenek Dohnal - 2:9.0.412-2 - provide 'vim(plugins-supported)' for plugins to require Vim/GVim From fe7f282fed4ee73479678faff0503d0ba38a1de2 Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 28 Sep 2022 19:51:35 -0500 Subject: [PATCH 137/324] Obsolete vim-toml since the runtime files are now part of vim-common --- vim.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 18ef79f6..ce9e1100 100644 --- a/vim.spec +++ b/vim.spec @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -158,6 +158,14 @@ Conflicts: %{name}-minimal < %{epoch}:8.2.3642-2 # shared files between common and minimal Requires: %{name}-data = %{epoch}:%{version}-%{release} Requires: %{name}-filesystem +# 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 @@ -964,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Sep 28 2022 Carl George - 2:9.0.475-2 +- Obsolete vim-toml since the runtime files are now part of vim-common + * Fri Sep 16 2022 Zdenek Dohnal - 2:9.0.475-1 - patchlevel 475 From 1badbfe68870f3459395624ecac9d7f247a77a49 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 11 Oct 2022 15:21:56 +0200 Subject: [PATCH 138/324] - patchlevel 720 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0bd0548f..4ff73a76 100644 --- a/.gitignore +++ b/.gitignore @@ -415,3 +415,4 @@ /vim-9.0-348.tar.bz2 /vim-9.0-412.tar.bz2 /vim-9.0-475.tar.bz2 +/vim-9.0-720.tar.bz2 diff --git a/sources b/sources index 13d8cf10..6612b722 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-475.tar.bz2) = e8cf29f02a3c76b55763b8513ee2b1d037996c6da4ea629e9ad8bf17731dd7e99544a621ba666e90cbe3c76f4a5bbdde96410eb3757f2290183855b09ae7b49a +SHA512 (vim-9.0-720.tar.bz2) = c856f3f212f435d639d805f67f8de3b4bbeb9473bbeb739b5daf8d086b9eb591e6e1c0c24fd3a6287f92878c42f6b039bf601b1cf85dc72afdb10dbf376b5322 diff --git a/vim.spec b/vim.spec index ce9e1100..256cfe9d 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 475 +%define patchlevel 720 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -972,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Oct 11 2022 Zdenek Dohnal - 2:9.0.720-1 +- patchlevel 720 + * Wed Sep 28 2022 Carl George - 2:9.0.475-2 - Obsolete vim-toml since the runtime files are now part of vim-common From aefc2b24cae4788c3938ace6157e2477d9e6e47e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 12 Oct 2022 15:05:09 +0200 Subject: [PATCH 139/324] the current configure option for Vi is 'tiny' --- vim.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index 256cfe9d..d20b889b 100644 --- a/vim.spec +++ b/vim.spec @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -398,7 +398,7 @@ cp -f os_unix.h os_unix.h.save perl -pi -e "s/vimrc/virc/" os_unix.h %configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/virc\"'" \ - --prefix=%{_prefix} --with-features=small --with-x=no \ + --prefix=%{_prefix} --with-features=tiny --with-x=no \ --enable-multibyte \ --disable-netbeans \ %if %{WITH_SELINUX} @@ -972,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Oct 12 2022 Zdenek Dohnal - 2:9.0.720-2 +- the current configure option for Vi is 'tiny' + * Tue Oct 11 2022 Zdenek Dohnal - 2:9.0.720-1 - patchlevel 720 From be507449af8b82c044668df0791b283447f112e1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 17 Oct 2022 11:48:38 +0200 Subject: [PATCH 140/324] - patchlevel 777 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4ff73a76..57b919e9 100644 --- a/.gitignore +++ b/.gitignore @@ -416,3 +416,4 @@ /vim-9.0-412.tar.bz2 /vim-9.0-475.tar.bz2 /vim-9.0-720.tar.bz2 +/vim-9.0-777.tar.bz2 diff --git a/sources b/sources index 6612b722..bdd5b6f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-720.tar.bz2) = c856f3f212f435d639d805f67f8de3b4bbeb9473bbeb739b5daf8d086b9eb591e6e1c0c24fd3a6287f92878c42f6b039bf601b1cf85dc72afdb10dbf376b5322 +SHA512 (vim-9.0-777.tar.bz2) = fb8eb569ef7861b72222cadb177d77f18bae81781675a244e074bfe777baaf7482a921001983c9ec0d8eb4528e17b18565331f78cc27f5147ae32b092683acac diff --git a/vim.spec b/vim.spec index d20b889b..d92ef2b6 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 720 +%define patchlevel 777 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -38,7 +38,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -972,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Oct 17 2022 Zdenek Dohnal - 2:9.0.777-1 +- patchlevel 777 + * Wed Oct 12 2022 Zdenek Dohnal - 2:9.0.720-2 - the current configure option for Vi is 'tiny' From 6d2e87d692f9441e02aeba117de084cd95fd47f1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 20 Oct 2022 14:43:18 +0200 Subject: [PATCH 141/324] - patchlevel 803 --- .gitignore | 1 + sources | 2 +- vim-7.0-fixkeys.patch | 12 ++++++------ vim.spec | 5 ++++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 57b919e9..5bce66c3 100644 --- a/.gitignore +++ b/.gitignore @@ -417,3 +417,4 @@ /vim-9.0-475.tar.bz2 /vim-9.0-720.tar.bz2 /vim-9.0-777.tar.bz2 +/vim-9.0-803.tar.bz2 diff --git a/sources b/sources index bdd5b6f1..41c94a4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-777.tar.bz2) = fb8eb569ef7861b72222cadb177d77f18bae81781675a244e074bfe777baaf7482a921001983c9ec0d8eb4528e17b18565331f78cc27f5147ae32b092683acac +SHA512 (vim-9.0-803.tar.bz2) = 864d6ffd779f46c606300a4af5c2bb9f2fcec9277fe2301a841f2abdc23a45e05c110a54c427c7c8aa5c723320bf7a3f102c0cf11a70bf4e03e8eb454a6dcfe1 diff --git a/vim-7.0-fixkeys.patch b/vim-7.0-fixkeys.patch index c7476338..1b71d33e 100644 --- a/vim-7.0-fixkeys.patch +++ b/vim-7.0-fixkeys.patch @@ -1,9 +1,9 @@ -diff -up vim82/src/term.c.fixkeys vim82/src/term.c ---- vim82/src/term.c.fixkeys 2022-02-07 09:23:09.195365881 +0100 -+++ vim82/src/term.c 2022-02-07 09:31:31.279695977 +0100 -@@ -921,14 +921,14 @@ static struct builtin_term builtin_termc - {K_XRIGHT, "\033[@;*C"}, - {K_XLEFT, "\033[@;*D"}, +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"}, diff --git a/vim.spec b/vim.spec index d92ef2b6..3fbdfdd3 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 777 +%define patchlevel 803 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -972,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Oct 20 2022 Zdenek Dohnal - 2:9.0.803-1 +- patchlevel 803 + * Mon Oct 17 2022 Zdenek Dohnal - 2:9.0.777-1 - patchlevel 777 From 8c0c7e08a975a09f36d1cc1549ed563770bbd671 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 3 Nov 2022 11:37:51 +0100 Subject: [PATCH 142/324] - patchlevel 828 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5bce66c3..ccf278b4 100644 --- a/.gitignore +++ b/.gitignore @@ -418,3 +418,4 @@ /vim-9.0-720.tar.bz2 /vim-9.0-777.tar.bz2 /vim-9.0-803.tar.bz2 +/vim-9.0-828.tar.bz2 diff --git a/sources b/sources index 41c94a4b..511a1a80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-803.tar.bz2) = 864d6ffd779f46c606300a4af5c2bb9f2fcec9277fe2301a841f2abdc23a45e05c110a54c427c7c8aa5c723320bf7a3f102c0cf11a70bf4e03e8eb454a6dcfe1 +SHA512 (vim-9.0-828.tar.bz2) = 817b4ae2ca1bf615062eaba253a03be207dbd0e82bcc394cde5de3768843bc41656ef32c61be2863062b20ac8bdc535d3bd3520b38e82d332aab1dbda8b29d93 diff --git a/vim.spec b/vim.spec index 3fbdfdd3..42d4c819 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 803 +%define patchlevel 828 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -972,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Nov 03 2022 Zdenek Dohnal - 2:9.0.828-1 +- patchlevel 828 + * Thu Oct 20 2022 Zdenek Dohnal - 2:9.0.803-1 - patchlevel 803 From 09c5bd5eb03db6538e43797c6a151374b8ae412f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 21 Nov 2022 11:33:27 +0100 Subject: [PATCH 143/324] - patchlevel 915 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ccf278b4..194d0021 100644 --- a/.gitignore +++ b/.gitignore @@ -419,3 +419,4 @@ /vim-9.0-777.tar.bz2 /vim-9.0-803.tar.bz2 /vim-9.0-828.tar.bz2 +/vim-9.0-915.tar.bz2 diff --git a/sources b/sources index 511a1a80..cf6bfd38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-828.tar.bz2) = 817b4ae2ca1bf615062eaba253a03be207dbd0e82bcc394cde5de3768843bc41656ef32c61be2863062b20ac8bdc535d3bd3520b38e82d332aab1dbda8b29d93 +SHA512 (vim-9.0-915.tar.bz2) = ea46d36b9f48e42fafa49a56bd60d07189f0fd23c6a5581c8ee6b555d2f9796c6a6918b5bcb63fd07841e4cb43b387a81b7fd547528a62bea95bf9f3b2e6b39d diff --git a/vim.spec b/vim.spec index 42d4c819..8a09f188 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 828 +%define patchlevel 915 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -972,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Nov 21 2022 Zdenek Dohnal - 2:9.0.915-1 +- patchlevel 915 + * Thu Nov 03 2022 Zdenek Dohnal - 2:9.0.828-1 - patchlevel 828 From 9a3364860e76db2c2e2522459d00f0e062c38113 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 28 Nov 2022 15:13:09 +0100 Subject: [PATCH 144/324] - patchlevel 963 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 194d0021..c01d2ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -420,3 +420,4 @@ /vim-9.0-803.tar.bz2 /vim-9.0-828.tar.bz2 /vim-9.0-915.tar.bz2 +/vim-9.0-963.tar.bz2 diff --git a/sources b/sources index cf6bfd38..e4a353c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-915.tar.bz2) = ea46d36b9f48e42fafa49a56bd60d07189f0fd23c6a5581c8ee6b555d2f9796c6a6918b5bcb63fd07841e4cb43b387a81b7fd547528a62bea95bf9f3b2e6b39d +SHA512 (vim-9.0-963.tar.bz2) = ed62cab1dbce7e6e989492a632f1c7f6ddd6e40fd1740564cd8f20a3d239f59d41475e8d3a66a31a9b3724c72feb9a037708edad826b0066a5df9a73159d0cf4 diff --git a/vim.spec b/vim.spec index 8a09f188..0f43c60a 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 915 +%define patchlevel 963 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -972,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Nov 28 2022 Zdenek Dohnal - 2:9.0.963-1 +- patchlevel 963 + * Mon Nov 21 2022 Zdenek Dohnal - 2:9.0.915-1 - patchlevel 915 From 0e7aaa1f2f9b3a8001b8897bcc7abcbe412a3692 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 5 Dec 2022 08:09:02 +0100 Subject: [PATCH 145/324] vim-update.sh: F35 will be EOL in a week, stop automatic updates --- vim-update.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 83ac1698..7a482828 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f37" "f36" "f35" ) -releases=( "fc38" "fc37" "fc36" "fc35" ) +branches=( "rawhide" "f37" "f36" ) +releases=( "fc38" "fc37" "fc36" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc38" "fc37" "\|fc36" "\|fc35" ) -bodhi_enabled=( "0" "1" "1" "1" ) +regexps=( "fc38" "fc37" "\|fc36" ) +bodhi_enabled=( "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 @@ -28,11 +28,6 @@ if [ "x$1" == "x--force" ]; then force=1 fi -if [ "x$(grep -o VERSION_ID=35 /etc/os-release)" == "xVERSION_ID=35" ] -then - BODHI_USER="--user $(id -un)" -fi - DATE=`date +"%a %b %d %Y"` $debug fedpkg switch-branch "${branches[@]: $branches_index: 1}" @@ -168,8 +163,7 @@ if [ $CHANGES -ne 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 - # uses 'id' value for updates -> your username in OS must match with your username in Fedora accounts - $debug bodhi updates new ${BODHI_USER} --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} + $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} fi else echo "Error when building package for $branch" From c6f44dcb372ed0eede645c38eb508c1eddc637ab Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 5 Dec 2022 11:21:01 +0100 Subject: [PATCH 146/324] - patchlevel 1006 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c01d2ee3..8342ed9f 100644 --- a/.gitignore +++ b/.gitignore @@ -421,3 +421,4 @@ /vim-9.0-828.tar.bz2 /vim-9.0-915.tar.bz2 /vim-9.0-963.tar.bz2 +/vim-9.0-1006.tar.bz2 diff --git a/sources b/sources index e4a353c4..2de5b973 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-963.tar.bz2) = ed62cab1dbce7e6e989492a632f1c7f6ddd6e40fd1740564cd8f20a3d239f59d41475e8d3a66a31a9b3724c72feb9a037708edad826b0066a5df9a73159d0cf4 +SHA512 (vim-9.0-1006.tar.bz2) = 590e175a6e5cc932401ffe22c613d7b1cd6897c60b511ce50d70afccb3943ed9ffcf2de3a8bc4b35cdea61a1e015961577ba2fb087f82c0a637f0c940aba0d9b diff --git a/vim.spec b/vim.spec index 0f43c60a..12ca7c6e 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 963 +%define patchlevel 1006 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -972,6 +972,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Dec 05 2022 Zdenek Dohnal - 2:9.0.1006-1 +- patchlevel 1006 + * Mon Nov 28 2022 Zdenek Dohnal - 2:9.0.963-1 - patchlevel 963 From 4a2d528a0c101a54b8bbf752a92fe1d8a1c883ae Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 14 Dec 2022 11:03:21 +0100 Subject: [PATCH 147/324] - patchlevel 1054 --- .gitignore | 1 + sources | 2 +- vim-7.4-fstabsyntax.patch | 21 +++++++++++---------- vim.spec | 5 ++++- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 8342ed9f..7d6ad019 100644 --- a/.gitignore +++ b/.gitignore @@ -422,3 +422,4 @@ /vim-9.0-915.tar.bz2 /vim-9.0-963.tar.bz2 /vim-9.0-1006.tar.bz2 +/vim-9.0-1054.tar.bz2 diff --git a/sources b/sources index 2de5b973..62b801a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1006.tar.bz2) = 590e175a6e5cc932401ffe22c613d7b1cd6897c60b511ce50d70afccb3943ed9ffcf2de3a8bc4b35cdea61a1e015961577ba2fb087f82c0a637f0c940aba0d9b +SHA512 (vim-9.0-1054.tar.bz2) = fbe6861e4fc7be6880350c4fc467961b8146ff954225ccdd31841145f49719928acf534b9cff9a7b6f2680c9fd01f7e54eb63141aad6978e56049db0b36bc81f diff --git a/vim-7.4-fstabsyntax.patch b/vim-7.4-fstabsyntax.patch index 81d39da9..f587deb5 100644 --- a/vim-7.4-fstabsyntax.patch +++ b/vim-7.4-fstabsyntax.patch @@ -1,21 +1,22 @@ -diff -up vim82/runtime/syntax/fstab.vim.fstabsyntax vim82/runtime/syntax/fstab.vim ---- vim82/runtime/syntax/fstab.vim.fstabsyntax 2020-08-10 12:08:01.000000000 +0200 -+++ vim82/runtime/syntax/fstab.vim 2020-08-10 12:17:22.540855735 +0200 -@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe +diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim +index 6a3c375..9d871a3 100644 +--- a/runtime/syntax/fstab.vim ++++ b/runtime/syntax/fstab.vim +@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword contained none swap " 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 +-syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 ceph cfs cgroup cifs coda coherent configfs cpuset cramfs debugfs devfs devpts devtmpfs dlmfs e2compr ecryptfs efivarfs efs erofs exfat ext2 ext2fs ext3 ext4 f2fs fdesc ffs filecore fuse fuseblk fusectl gfs2 hfs hfsplus hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfs4 nfsd nilfs2 none ntfs ntfs3 null nwfs ocfs2 omfs overlay ovlfs pipefs portal proc procfs pstore ptyfs pvfs2 qnx4 qnx6 reiserfs ramfs romfs securityfs shm smbfs spufs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs ubifs udf ufs umap umsdos union usbfs userfs v9fs vfat virtiofs vs3fs vxfs wrapfs wvfs xenfs xenix xfs zisofs zonefs ++syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 ceph cfs cgroup cifs coda coherent configfs cpuset cramfs debugfs devfs devpts devtmpfs dlmfs e2compr ecryptfs efivarfs efs erofs exfat ext2 ext2fs ext3 ext4 f2fs fdesc ffs filecore fuse fuseblk fusectl gfs2 hfs hfsplus hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfs4 nfsd nilfs2 none ntfs ntfs3 null nwfs ocfs2 omfs overlay ovlfs pipefs portal proc procfs pstore ptyfs pvfs2 qnx4 qnx6 reiserfs ramfs romfs rpc_pipefs securityfs shm smbfs spufs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs ubifs udf ufs umap umsdos union usbfs userfs v9fs vfat virtiofs vs3fs vxfs wrapfs wvfs xenfs xenix xfs zisofs zonefs " Options " ------- -@@ -68,7 +68,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-] - syn keyword fsOptionsYesNo yes no +@@ -72,7 +72,7 @@ syn keyword fsOptionsYN y n + syn keyword fsOptions01 0 1 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 nofail failok -+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 nofail ++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 nofail failok syn match fsOptionsGeneral /_netdev/ - " Options: adfs + syn match fsOptionsKeywords contained /\ - 2:9.0.1054-1 +- patchlevel 1054 + * Mon Dec 05 2022 Zdenek Dohnal - 2:9.0.1006-1 - patchlevel 1006 From 57c70f241c97c7dd2cb3df4a2a8e23c5839ee644 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 30 Dec 2022 01:30:12 -0500 Subject: [PATCH 148/324] Disable perl and ruby in flatpak builds Neither perl-libs nor ruby-libs are present in the Flatpak runtimes. --- vim.spec | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/vim.spec b/vim.spec index ba298edf..78fbc74d 100644 --- a/vim.spec +++ b/vim.spec @@ -28,8 +28,14 @@ %define withvimspell 0 %define withhunspell 0 -%define withruby 1 %define withlua 1 +%if 0%{?flatpak} +%define withperl 0 +%define withruby 0 +%else +%define withperl 1 +%define withruby 1 +%endif %define baseversion 9.0 %define vimdir vim90 @@ -129,10 +135,12 @@ BuildRequires: make # screen handling library BuildRequires: ncurses-devel # for perl plugin +%if "%{withperl}" == "1" BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: perl(ExtUtils::Embed) BuildRequires: perl(ExtUtils::ParseXS) +%endif # for python plugin BuildRequires: python3-devel @@ -224,8 +232,11 @@ Requires: which Suggests: lua-libs %endif +%if "%{withperl}" == "1" Suggests: perl-devel Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif + Suggests: python3 Suggests: python3-libs @@ -295,8 +306,11 @@ Requires: vim-common = %{epoch}:%{version}-%{release} Suggests: lua-libs %endif + %if "%{withperl}" == "1" Suggests: perl-devel Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + %endif + Suggests: python3 Suggests: python3-libs @@ -430,7 +444,6 @@ mv -f os_unix.h.save os_unix.h %configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ --with-features=huge \ --enable-python3interp=dynamic \ - --enable-perlinterp=dynamic \ --disable-tclinterp --with-x=yes \ --enable-xim --enable-multibyte \ --with-tlib=ncurses \ @@ -448,6 +461,11 @@ mv -f os_unix.h.save os_unix.h %else --disable-selinux \ %endif + %if "%{withperl}" == "1" + --enable-perlinterp=dynamic \ + %else + --disable-perlinterp \ + %endif %if "%{withruby}" == "1" --enable-rubyinterp=dynamic \ %else @@ -474,7 +492,6 @@ make clean %configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ --prefix=%{_prefix} --with-features=huge \ --enable-python3interp=dynamic \ - --enable-perlinterp=dynamic \ --disable-tclinterp \ --with-x=no \ --enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte \ @@ -492,6 +509,11 @@ make clean %else --disable-selinux \ %endif +%if "%{withperl}" == "1" + --enable-perlinterp=dynamic \ +%else + --disable-perlinterp \ +%endif %if "%{withruby}" == "1" --enable-rubyinterp=dynamic \ %else From 345e5097bb59f023c26ca43fcf8bbd4b3afa6db1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 5 Jan 2023 08:33:48 +0100 Subject: [PATCH 149/324] vim.spec: Set FORTIFY_SOURCE to 1 as Vim upstream expects --- vim.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/vim.spec b/vim.spec index 78fbc74d..2538c0ee 100644 --- a/vim.spec +++ b/vim.spec @@ -37,6 +37,12 @@ %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.0 %define vimdir vim90 @@ -429,6 +435,8 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --disable-canberra \ --disable-libsodium +echo $CFLAGS + %make_build cp vim minimal-vim make clean From 9fbfe84b65679606ab31d81606b15d9f17e4008b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 5 Jan 2023 08:48:05 +0100 Subject: [PATCH 150/324] vim.spec: Remove condition for glibc subpackage --- vim.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vim.spec b/vim.spec index 2538c0ee..a52ac2d1 100644 --- a/vim.spec +++ b/vim.spec @@ -110,11 +110,7 @@ BuildRequires: gettext # glibc in F35 bootstraped several conversion formats from # iconv into a separate package. Vim needs those additional # formats during compilation. -# remove the conditional once F34 is EOL and leave -# only BuildRequires here -%if 0%{?fedora} >= 35 BuildRequires: glibc-gconv-extra -%endif # for mouse support in console BuildRequires: gpm-devel From 6435ff19cadcce5a23202ac4e4f99cfd07177319 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 9 Jan 2023 11:41:49 +0100 Subject: [PATCH 151/324] FTBFS with new FORTIFY_SOURCE=3 - remove it since Vim wants level 1 --- vim-fortify-source.patch | 30 ++++++++++++++++++++++++++++++ vim.spec | 9 ++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 vim-fortify-source.patch diff --git a/vim-fortify-source.patch b/vim-fortify-source.patch new file mode 100644 index 00000000..8c7c4580 --- /dev/null +++ b/vim-fortify-source.patch @@ -0,0 +1,30 @@ +diff --git a/src/auto/configure b/src/auto/configure +index 7821451..6901da5 100755 +--- a/src/auto/configure ++++ b/src/auto/configure +@@ -15041,8 +15041,8 @@ $as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5 + $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } + if test "$gccmajor" -gt "3"; then +- CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` +- CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'` ++ CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-Wp,-U_FORTIFY_SOURCE//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` ++ CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-Wp,-U_FORTIFY_SOURCE//g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +diff --git a/src/configure.ac b/src/configure.ac +index 38ace2a..c05e30e 100644 +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -4618,8 +4618,8 @@ if test "$GCC" = yes; then + dnl And undefine it first to avoid a warning. + AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1) + if test "$gccmajor" -gt "3"; then +- CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` +- CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'` ++ CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-Wp,-U_FORTIFY_SOURCE//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` ++ CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-Wp,-U_FORTIFY_SOURCE//g' -e 's/ *-U_FORTIFY_SOURCE//g'` + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) diff --git a/vim.spec b/vim.spec index a52ac2d1..07307650 100644 --- a/vim.spec +++ b/vim.spec @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -91,6 +91,7 @@ Patch3004: vim-python3-tests.patch Patch3005: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3006: vim-8.0-copy-paste.patch +Patch3007: vim-fortify-source.patch # uses autoconf in spec file @@ -390,6 +391,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3004 -p1 -b .python-tests %patch3005 -p1 -b .fips-warning %patch3006 -p1 -b .copypaste +%patch3007 -p1 -b .fortify %build cd src @@ -431,8 +433,6 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --disable-canberra \ --disable-libsodium -echo $CFLAGS - %make_build cp vim minimal-vim make clean @@ -998,6 +998,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Jan 09 2023 Zdenek Dohnal - 2:9.0.1054-2 +- FTBFS with new FORTIFY_SOURCE=3 - remove it since Vim wants level 1 + * Wed Dec 14 2022 Zdenek Dohnal - 2:9.0.1054-1 - patchlevel 1054 From c196a24e017a3bd4d9b1ff678e19d3d6c3026122 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 9 Jan 2023 11:42:37 +0100 Subject: [PATCH 152/324] - patchlevel 1160 --- .gitignore | 1 + sources | 2 +- vim-7.4-fstabsyntax.patch | 22 ---------------------- vim.spec | 33 +++++++++++++++++---------------- 4 files changed, 19 insertions(+), 39 deletions(-) delete mode 100644 vim-7.4-fstabsyntax.patch diff --git a/.gitignore b/.gitignore index 7d6ad019..e61bef0e 100644 --- a/.gitignore +++ b/.gitignore @@ -423,3 +423,4 @@ /vim-9.0-963.tar.bz2 /vim-9.0-1006.tar.bz2 /vim-9.0-1054.tar.bz2 +/vim-9.0-1160.tar.bz2 diff --git a/sources b/sources index 62b801a6..27dac6fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1054.tar.bz2) = fbe6861e4fc7be6880350c4fc467961b8146ff954225ccdd31841145f49719928acf534b9cff9a7b6f2680c9fd01f7e54eb63141aad6978e56049db0b36bc81f +SHA512 (vim-9.0-1160.tar.bz2) = 3d053eef000fc981dc853fb06ac5daaa7519c84b8d401e5694f3ba9ce958c0c8086a48716d5c75cfbf5fff04059ac362c42e6215c9efc22cc235bbbc72cc3cc2 diff --git a/vim-7.4-fstabsyntax.patch b/vim-7.4-fstabsyntax.patch deleted file mode 100644 index f587deb5..00000000 --- a/vim-7.4-fstabsyntax.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim -index 6a3c375..9d871a3 100644 ---- a/runtime/syntax/fstab.vim -+++ b/runtime/syntax/fstab.vim -@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword contained none swap - " 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 ceph cfs cgroup cifs coda coherent configfs cpuset cramfs debugfs devfs devpts devtmpfs dlmfs e2compr ecryptfs efivarfs efs erofs exfat ext2 ext2fs ext3 ext4 f2fs fdesc ffs filecore fuse fuseblk fusectl gfs2 hfs hfsplus hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfs4 nfsd nilfs2 none ntfs ntfs3 null nwfs ocfs2 omfs overlay ovlfs pipefs portal proc procfs pstore ptyfs pvfs2 qnx4 qnx6 reiserfs ramfs romfs securityfs shm smbfs spufs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs ubifs udf ufs umap umsdos union usbfs userfs v9fs vfat virtiofs vs3fs vxfs wrapfs wvfs xenfs xenix xfs zisofs zonefs -+syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 ceph cfs cgroup cifs coda coherent configfs cpuset cramfs debugfs devfs devpts devtmpfs dlmfs e2compr ecryptfs efivarfs efs erofs exfat ext2 ext2fs ext3 ext4 f2fs fdesc ffs filecore fuse fuseblk fusectl gfs2 hfs hfsplus hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfs4 nfsd nilfs2 none ntfs ntfs3 null nwfs ocfs2 omfs overlay ovlfs pipefs portal proc procfs pstore ptyfs pvfs2 qnx4 qnx6 reiserfs ramfs romfs rpc_pipefs securityfs shm smbfs spufs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs ubifs udf ufs umap umsdos union usbfs userfs v9fs vfat virtiofs vs3fs vxfs wrapfs wvfs xenfs xenix xfs zisofs zonefs - - " Options - " ------- -@@ -72,7 +72,7 @@ syn keyword fsOptionsYN y n - syn keyword fsOptions01 0 1 - 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 nofail failok -+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 nofail failok - syn match fsOptionsGeneral /_netdev/ - - syn match fsOptionsKeywords contained /\ - 2:9.0.1160-1 +- patchlevel 1160 + * Mon Jan 09 2023 Zdenek Dohnal - 2:9.0.1054-2 - FTBFS with new FORTIFY_SOURCE=3 - remove it since Vim wants level 1 From b6b946b02f93c7cdbd38e77506f6c81e9d792c86 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 12 Jan 2023 12:34:29 +0100 Subject: [PATCH 153/324] The patch is merged upstream --- vim-fortify-source.patch | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 vim-fortify-source.patch diff --git a/vim-fortify-source.patch b/vim-fortify-source.patch deleted file mode 100644 index 8c7c4580..00000000 --- a/vim-fortify-source.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/auto/configure b/src/auto/configure -index 7821451..6901da5 100755 ---- a/src/auto/configure -+++ b/src/auto/configure -@@ -15041,8 +15041,8 @@ $as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5 - $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } - if test "$gccmajor" -gt "3"; then -- CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` -- CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'` -+ CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-Wp,-U_FORTIFY_SOURCE//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` -+ CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-Wp,-U_FORTIFY_SOURCE//g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -diff --git a/src/configure.ac b/src/configure.ac -index 38ace2a..c05e30e 100644 ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -4618,8 +4618,8 @@ if test "$GCC" = yes; then - dnl And undefine it first to avoid a warning. - AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1) - if test "$gccmajor" -gt "3"; then -- CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` -- CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'` -+ CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-Wp,-U_FORTIFY_SOURCE//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` -+ CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-Wp,-U_FORTIFY_SOURCE//g' -e 's/ *-U_FORTIFY_SOURCE//g'` - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) From a232b7acbbc7fd4549c154a8604afec388f69e03 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 12 Jan 2023 12:35:53 +0100 Subject: [PATCH 154/324] Remove the patch from spec --- vim.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/vim.spec b/vim.spec index e3694102..2bfbff85 100644 --- a/vim.spec +++ b/vim.spec @@ -90,7 +90,6 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch -Patch3006: vim-fortify-source.patch # uses autoconf in spec file @@ -389,7 +388,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3003 -p1 -b .python-tests %patch3004 -p1 -b .fips-warning %patch3005 -p1 -b .copypaste -%patch3006 -p1 -b .fortify %build cd src From 7e84f7a14a34c06b6643cfecb19f53672e4c4e6d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 12 Jan 2023 12:36:52 +0100 Subject: [PATCH 155/324] - patchlevel 1182 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e61bef0e..4d8a1028 100644 --- a/.gitignore +++ b/.gitignore @@ -424,3 +424,4 @@ /vim-9.0-1006.tar.bz2 /vim-9.0-1054.tar.bz2 /vim-9.0-1160.tar.bz2 +/vim-9.0-1182.tar.bz2 diff --git a/sources b/sources index 27dac6fd..e7d2cac4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1160.tar.bz2) = 3d053eef000fc981dc853fb06ac5daaa7519c84b8d401e5694f3ba9ce958c0c8086a48716d5c75cfbf5fff04059ac362c42e6215c9efc22cc235bbbc72cc3cc2 +SHA512 (vim-9.0-1182.tar.bz2) = 8e24b7c41ca988841a391ba91ab287cbb3c1641c8feab8f3699632d1f63a5f387c4bf077cbb55c94cdf4aa734958b6f3067ae2f7d50a45684cfac7c4fb2d03e6 diff --git a/vim.spec b/vim.spec index 2bfbff85..9f8021a9 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1160 +%define patchlevel 1182 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -994,6 +994,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Jan 12 2023 Zdenek Dohnal - 2:9.0.1182-1 +- patchlevel 1182 + * Mon Jan 09 2023 Zdenek Dohnal - 2:9.0.1160-1 - patchlevel 1160 From 0fbf1cf2b90f63ca954773964ab7e0fc6eac502b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 21:18:08 +0100 Subject: [PATCH 156/324] Remove perl(MODULE_COMPAT), it will be replaced by generators --- vim.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/vim.spec b/vim.spec index 9f8021a9..a7d150b8 100644 --- a/vim.spec +++ b/vim.spec @@ -235,7 +235,6 @@ Suggests: lua-libs %if "%{withperl}" == "1" Suggests: perl-devel -Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif Suggests: python3 @@ -309,7 +308,6 @@ Suggests: lua-libs %if "%{withperl}" == "1" Suggests: perl-devel -Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif Suggests: python3 From 808e42817fca8a2b216b781630ccaf9408fc7859 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 19 Jan 2023 12:10:28 +0100 Subject: [PATCH 157/324] - patchlevel 1221 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4d8a1028..9bb195d3 100644 --- a/.gitignore +++ b/.gitignore @@ -425,3 +425,4 @@ /vim-9.0-1054.tar.bz2 /vim-9.0-1160.tar.bz2 /vim-9.0-1182.tar.bz2 +/vim-9.0-1221.tar.bz2 diff --git a/sources b/sources index e7d2cac4..daeb593e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1182.tar.bz2) = 8e24b7c41ca988841a391ba91ab287cbb3c1641c8feab8f3699632d1f63a5f387c4bf077cbb55c94cdf4aa734958b6f3067ae2f7d50a45684cfac7c4fb2d03e6 +SHA512 (vim-9.0-1221.tar.bz2) = 4db5fbe56ea5291904e061c7e0fc3ba3cff0de1e4f60e45a83ba50b167495ebb0e7b262171384a0c412423ef51860eb4e1115d6dc2ec391f2f786b73a9bc6844 diff --git a/vim.spec b/vim.spec index a7d150b8..522fa331 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1182 +%define patchlevel 1221 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -992,6 +992,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Jan 19 2023 Zdenek Dohnal - 2:9.0.1221-1 +- patchlevel 1221 + * Thu Jan 12 2023 Zdenek Dohnal - 2:9.0.1182-1 - patchlevel 1182 From 9144ae430ef44a6c0317fc12c526d6817a222ac1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 30 Jan 2023 14:43:25 +0100 Subject: [PATCH 158/324] - patchlevel 1262 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9bb195d3..552d6426 100644 --- a/.gitignore +++ b/.gitignore @@ -426,3 +426,4 @@ /vim-9.0-1160.tar.bz2 /vim-9.0-1182.tar.bz2 /vim-9.0-1221.tar.bz2 +/vim-9.0-1262.tar.bz2 diff --git a/sources b/sources index daeb593e..b1b22c62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1221.tar.bz2) = 4db5fbe56ea5291904e061c7e0fc3ba3cff0de1e4f60e45a83ba50b167495ebb0e7b262171384a0c412423ef51860eb4e1115d6dc2ec391f2f786b73a9bc6844 +SHA512 (vim-9.0-1262.tar.bz2) = 09402ce9046920f65fa57770aa8d9e975a6b9adc86f180bb0db45d749b17a73dc2eecab7547017a143a9821371a93d2a3be924b4e68ebae74bc78fd906072239 diff --git a/vim.spec b/vim.spec index 522fa331..1f2186c7 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1221 +%define patchlevel 1262 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -992,6 +992,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Jan 30 2023 Zdenek Dohnal - 2:9.0.1262-1 +- patchlevel 1262 + * Thu Jan 19 2023 Zdenek Dohnal - 2:9.0.1221-1 - patchlevel 1221 From a9aac6a822b1783933598966cffd8e21b23e671a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 9 Feb 2023 07:09:11 +0100 Subject: [PATCH 159/324] vim-update.sh: F38 got branched --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 7a482828..dee4f846 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f37" "f36" ) -releases=( "fc38" "fc37" "fc36" ) +branches=( "rawhide" "f38" "f37" "f36" ) +releases=( "fc39" "fc38" "fc37" "fc36" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc38" "fc37" "\|fc36" ) -bodhi_enabled=( "0" "1" "1" ) +regexps=( "fc39" "fc38" "fc37" "\|fc36" ) +bodhi_enabled=( "0" "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From 5d58af6333fd6429e6b8f97b29bcc9a7a74a156a Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 31 Jan 2023 22:11:03 -0500 Subject: [PATCH 160/324] Improve AppStream metainfo --- vim.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/vim.spec b/vim.spec index 1f2186c7..b465589b 100644 --- a/vim.spec +++ b/vim.spec @@ -585,10 +585,12 @@ cat > $RPM_BUILD_ROOT%{_datadir}/metainfo/gvim.appdata.xml < SentUpstream: 2014-05-22 --> - - gvim.desktop + + org.vim.Vim + GVim CC0-1.0 Vim + The VIM version of the vi editor for the X Window System

Vim is an advanced text editor that seeks to provide the power of the @@ -604,13 +606,17 @@ SentUpstream: 2014-05-22 editing configuration files.

+ + + https://raw.githubusercontent.com/zdohnal/vim/zdohnal-screenshot/gvim16_9.png http://www.vim.org/ - + + EOF appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml From 2a948f8a6d7bcc1743b8b6a1f7eff8ac3a855f49 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 9 Feb 2023 07:45:11 +0100 Subject: [PATCH 161/324] vim.spec: Explain version number in appdata --- vim.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vim.spec b/vim.spec index b465589b..93dbee35 100644 --- a/vim.spec +++ b/vim.spec @@ -605,6 +605,11 @@ SentUpstream: 2014-05-22 Vim is perfect for all kinds of text editing, from composing email to editing configuration files.

+

+ We ship the current Vim stable release - %{baseversion} - with the upstream + patchlevel %{patchlevel} applied, which is combined into version %{version} + used during packaging. +

From 026537cfee0687bb3b11937e7c5cba0fd06cc6a6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 9 Feb 2023 14:02:46 +0100 Subject: [PATCH 162/324] - patchlevel 1293 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 552d6426..d6da6a9c 100644 --- a/.gitignore +++ b/.gitignore @@ -427,3 +427,4 @@ /vim-9.0-1182.tar.bz2 /vim-9.0-1221.tar.bz2 /vim-9.0-1262.tar.bz2 +/vim-9.0-1293.tar.bz2 diff --git a/sources b/sources index b1b22c62..441494dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1262.tar.bz2) = 09402ce9046920f65fa57770aa8d9e975a6b9adc86f180bb0db45d749b17a73dc2eecab7547017a143a9821371a93d2a3be924b4e68ebae74bc78fd906072239 +SHA512 (vim-9.0-1293.tar.bz2) = 1f5c7d0fae2d7f9cd585ca5f1de7e035733777dacf63cd1cafa91d2a4302576ac6823d5781375579d33e284ea7785fd47517559567f40d734d3a8a804d78ac0b diff --git a/vim.spec b/vim.spec index 93dbee35..a876dccc 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1262 +%define patchlevel 1293 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1003,6 +1003,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Feb 09 2023 Zdenek Dohnal - 2:9.0.1293-1 +- patchlevel 1293 + * Mon Jan 30 2023 Zdenek Dohnal - 2:9.0.1262-1 - patchlevel 1262 From 0849f86b228498c48885859f71083b6fb6d473c6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 14 Feb 2023 12:27:39 +0100 Subject: [PATCH 163/324] 2169641 - Syntax highlight for sh files broken --- vim-sh-syntax.patch | 13 +++++++++++++ vim.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 vim-sh-syntax.patch diff --git a/vim-sh-syntax.patch b/vim-sh-syntax.patch new file mode 100644 index 00000000..9cd33733 --- /dev/null +++ b/vim-sh-syntax.patch @@ -0,0 +1,13 @@ +diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim +index 13d74db..4f7fafb 100644 +--- a/runtime/syntax/sh.vim ++++ b/runtime/syntax/sh.vim +@@ -335,7 +335,7 @@ syn match shEscape contained '\%(^\)\@!\%(\\\\\)*\\.' nextgroup=shComment + " systems too, however, so the following syntax will flag $(..) as + " an Error under /bin/sh. By consensus of vimdev'ers! + if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix") +- syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]\|$" skip='\\\\\|\\.' end=")" contains=@shCommandSubList ++ syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]" skip='\\\\\|\\.' end=")" contains=@shCommandSubList + syn region shArithmetic matchgroup=shArithRegion start="\$((" skip='\\\\\|\\.' end="))" contains=@shArithList + syn region shArithmetic matchgroup=shArithRegion start="\$\[" skip='\\\\\|\\.' end="\]" contains=@shArithList + syn match shSkipInitWS contained "^\s\+" diff --git a/vim.spec b/vim.spec index a876dccc..8145605d 100644 --- a/vim.spec +++ b/vim.spec @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -90,6 +90,8 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch +# 2169641 - Syntax highlight for sh files broken +Patch3006: vim-sh-syntax.patch # uses autoconf in spec file @@ -386,6 +388,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3003 -p1 -b .python-tests %patch3004 -p1 -b .fips-warning %patch3005 -p1 -b .copypaste +%patch3006 -p1 -b .sh-syntax %build cd src @@ -1003,6 +1006,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Feb 14 2023 Zdenek Dohnal - 2:9.0.1293-2 +- 2169641 - Syntax highlight for sh files broken + * Thu Feb 09 2023 Zdenek Dohnal - 2:9.0.1293-1 - patchlevel 1293 From 7e5c908e8fd000e9ec602df03874ccd53639cc32 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 14 Feb 2023 12:32:12 +0100 Subject: [PATCH 164/324] - patchlevel 1307 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d6da6a9c..ed335f20 100644 --- a/.gitignore +++ b/.gitignore @@ -428,3 +428,4 @@ /vim-9.0-1221.tar.bz2 /vim-9.0-1262.tar.bz2 /vim-9.0-1293.tar.bz2 +/vim-9.0-1307.tar.bz2 diff --git a/sources b/sources index 441494dc..43ecf998 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1293.tar.bz2) = 1f5c7d0fae2d7f9cd585ca5f1de7e035733777dacf63cd1cafa91d2a4302576ac6823d5781375579d33e284ea7785fd47517559567f40d734d3a8a804d78ac0b +SHA512 (vim-9.0-1307.tar.bz2) = 0673fdecbb33ecdcf5aa0b0a6525c88f1b60c6a1ea5a28c904a641ba2685333801f94785cb7bab249a5204429d0cbf5d7739f112bc9e6fd2c40805647fa58892 diff --git a/vim.spec b/vim.spec index 8145605d..ebbf3b26 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1293 +%define patchlevel 1307 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -1006,6 +1006,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Feb 14 2023 Zdenek Dohnal - 2:9.0.1307-1 +- patchlevel 1307 + * Tue Feb 14 2023 Zdenek Dohnal - 2:9.0.1293-2 - 2169641 - Syntax highlight for sh files broken From 9af2480710ce23c6766747165dc2b4389bc950b3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 17 Feb 2023 13:33:46 +0100 Subject: [PATCH 165/324] - patchlevel 1314 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ed335f20..37ba3d43 100644 --- a/.gitignore +++ b/.gitignore @@ -429,3 +429,4 @@ /vim-9.0-1262.tar.bz2 /vim-9.0-1293.tar.bz2 /vim-9.0-1307.tar.bz2 +/vim-9.0-1314.tar.bz2 diff --git a/sources b/sources index 43ecf998..adddcdf3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1307.tar.bz2) = 0673fdecbb33ecdcf5aa0b0a6525c88f1b60c6a1ea5a28c904a641ba2685333801f94785cb7bab249a5204429d0cbf5d7739f112bc9e6fd2c40805647fa58892 +SHA512 (vim-9.0-1314.tar.bz2) = fe1d77b081111b589cd46894039646a098ab8dc5bafb518d276140d191911142ac868c9aa55cbfb67786687779a2a63c315cc6496bb407668725bb82dd562d25 diff --git a/vim.spec b/vim.spec index ebbf3b26..97f5aa89 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1307 +%define patchlevel 1314 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1006,6 +1006,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Fri Feb 17 2023 Zdenek Dohnal - 2:9.0.1314-1 +- patchlevel 1314 + * Tue Feb 14 2023 Zdenek Dohnal - 2:9.0.1307-1 - patchlevel 1307 From 6fdecefa49da5d2b6c903d3aff835b7937583c68 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 2 Mar 2023 07:40:07 +0100 Subject: [PATCH 166/324] vim-update.sh: F38 is bodhi enabled --- vim-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index dee4f846..bcf4c2b0 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -5,8 +5,8 @@ branches=( "rawhide" "f38" "f37" "f36" ) releases=( "fc39" "fc38" "fc37" "fc36" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc39" "fc38" "fc37" "\|fc36" ) -bodhi_enabled=( "0" "0" "1" "1" ) +regexps=( "fc39" "fc38" "\|fc37" "\|fc36" ) +bodhi_enabled=( "0" "1" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From f85584f35b39a58485a2576031decc81c8608054 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 2 Mar 2023 07:41:06 +0100 Subject: [PATCH 167/324] - patchlevel 1367 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 37ba3d43..5e51c6c2 100644 --- a/.gitignore +++ b/.gitignore @@ -430,3 +430,4 @@ /vim-9.0-1293.tar.bz2 /vim-9.0-1307.tar.bz2 /vim-9.0-1314.tar.bz2 +/vim-9.0-1367.tar.bz2 diff --git a/sources b/sources index adddcdf3..b22853f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1314.tar.bz2) = fe1d77b081111b589cd46894039646a098ab8dc5bafb518d276140d191911142ac868c9aa55cbfb67786687779a2a63c315cc6496bb407668725bb82dd562d25 +SHA512 (vim-9.0-1367.tar.bz2) = 334f93124f34e5b3f8378eb71c4ab8f27e3339dc8c6e85dfcd69f4bc4187ddde3547dc4820df36fc8360515458268299cfa6b09310f7b8e2ce58709aabde299b diff --git a/vim.spec b/vim.spec index 97f5aa89..717f8c0c 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1314 +%define patchlevel 1367 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1006,6 +1006,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Mar 02 2023 Zdenek Dohnal - 2:9.0.1367-1 +- patchlevel 1367 + * Fri Feb 17 2023 Zdenek Dohnal - 2:9.0.1314-1 - patchlevel 1314 From c922af3f1b1b725aea18208a3fe61207de4385d1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 2 Mar 2023 07:56:27 +0100 Subject: [PATCH 168/324] Remove sh syntax patch, it is already in upstream --- vim-sh-syntax.patch | 13 ------------- vim.spec | 3 --- 2 files changed, 16 deletions(-) delete mode 100644 vim-sh-syntax.patch diff --git a/vim-sh-syntax.patch b/vim-sh-syntax.patch deleted file mode 100644 index 9cd33733..00000000 --- a/vim-sh-syntax.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim -index 13d74db..4f7fafb 100644 ---- a/runtime/syntax/sh.vim -+++ b/runtime/syntax/sh.vim -@@ -335,7 +335,7 @@ syn match shEscape contained '\%(^\)\@!\%(\\\\\)*\\.' nextgroup=shComment - " systems too, however, so the following syntax will flag $(..) as - " an Error under /bin/sh. By consensus of vimdev'ers! - if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix") -- syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]\|$" skip='\\\\\|\\.' end=")" contains=@shCommandSubList -+ syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]" skip='\\\\\|\\.' end=")" contains=@shCommandSubList - syn region shArithmetic matchgroup=shArithRegion start="\$((" skip='\\\\\|\\.' end="))" contains=@shArithList - syn region shArithmetic matchgroup=shArithRegion start="\$\[" skip='\\\\\|\\.' end="\]" contains=@shArithList - syn match shSkipInitWS contained "^\s\+" diff --git a/vim.spec b/vim.spec index 717f8c0c..db7f261e 100644 --- a/vim.spec +++ b/vim.spec @@ -90,8 +90,6 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch -# 2169641 - Syntax highlight for sh files broken -Patch3006: vim-sh-syntax.patch # uses autoconf in spec file @@ -388,7 +386,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3003 -p1 -b .python-tests %patch3004 -p1 -b .fips-warning %patch3005 -p1 -b .copypaste -%patch3006 -p1 -b .sh-syntax %build cd src From d378cd2edfecd843f6523cbb71f778fd2f9e3ce3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 14 Mar 2023 15:39:55 +0100 Subject: [PATCH 169/324] - patchlevel 1403 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5e51c6c2..1eb173a3 100644 --- a/.gitignore +++ b/.gitignore @@ -431,3 +431,4 @@ /vim-9.0-1307.tar.bz2 /vim-9.0-1314.tar.bz2 /vim-9.0-1367.tar.bz2 +/vim-9.0-1403.tar.bz2 diff --git a/sources b/sources index b22853f3..606131e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1367.tar.bz2) = 334f93124f34e5b3f8378eb71c4ab8f27e3339dc8c6e85dfcd69f4bc4187ddde3547dc4820df36fc8360515458268299cfa6b09310f7b8e2ce58709aabde299b +SHA512 (vim-9.0-1403.tar.bz2) = 561d36b1db8c306f9fa69509b6904305c1147ab385e11c7a3b712dd009c93acc6eaf45c5e3a5faa6b9beaf49124b538c7120e1cc72bf22f288e3d73f113a2fb5 diff --git a/vim.spec b/vim.spec index db7f261e..a14d1cf1 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1367 +%define patchlevel 1403 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1003,6 +1003,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Tue Mar 14 2023 Zdenek Dohnal - 2:9.0.1403-1 +- patchlevel 1403 + * Thu Mar 02 2023 Zdenek Dohnal - 2:9.0.1367-1 - patchlevel 1367 From ea1439cf89c70349d6dbcc446f9514ccb05c7878 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 16 Mar 2023 17:13:49 +0100 Subject: [PATCH 170/324] - patchlevel 1407 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1eb173a3..1bffe207 100644 --- a/.gitignore +++ b/.gitignore @@ -432,3 +432,4 @@ /vim-9.0-1314.tar.bz2 /vim-9.0-1367.tar.bz2 /vim-9.0-1403.tar.bz2 +/vim-9.0-1407.tar.bz2 diff --git a/sources b/sources index 606131e6..9314f575 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1403.tar.bz2) = 561d36b1db8c306f9fa69509b6904305c1147ab385e11c7a3b712dd009c93acc6eaf45c5e3a5faa6b9beaf49124b538c7120e1cc72bf22f288e3d73f113a2fb5 +SHA512 (vim-9.0-1407.tar.bz2) = 9981739960c0ea42f290b348e45e114ec50ff2070eae2dcb5d57c5f8356f7f4382850da35ec055aa1b56393290c32c92e08d0314d0419d31b7946ca5188e050c diff --git a/vim.spec b/vim.spec index a14d1cf1..818628b5 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1403 +%define patchlevel 1407 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1003,6 +1003,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Thu Mar 16 2023 Zdenek Dohnal - 2:9.0.1407-1 +- patchlevel 1407 + * Tue Mar 14 2023 Zdenek Dohnal - 2:9.0.1403-1 - patchlevel 1403 From ef64a782895531dd46e6049d19ec829dee33d229 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 22 Mar 2023 11:35:18 +0100 Subject: [PATCH 171/324] - patchlevel 1423 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1bffe207..fb0db58f 100644 --- a/.gitignore +++ b/.gitignore @@ -433,3 +433,4 @@ /vim-9.0-1367.tar.bz2 /vim-9.0-1403.tar.bz2 /vim-9.0-1407.tar.bz2 +/vim-9.0-1423.tar.bz2 diff --git a/sources b/sources index 9314f575..8481436f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1407.tar.bz2) = 9981739960c0ea42f290b348e45e114ec50ff2070eae2dcb5d57c5f8356f7f4382850da35ec055aa1b56393290c32c92e08d0314d0419d31b7946ca5188e050c +SHA512 (vim-9.0-1423.tar.bz2) = 0460247023fc3666fd532c36e6c6c3ea2f53503f8b47cd2dee351876226800436525574f7d15a18282adfb035af3f0f89e80f6d8a64317df3ba3e82a346a7ab5 diff --git a/vim.spec b/vim.spec index 818628b5..bb83a014 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1407 +%define patchlevel 1423 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1003,6 +1003,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Mar 22 2023 Zdenek Dohnal - 2:9.0.1423-1 +- patchlevel 1423 + * Thu Mar 16 2023 Zdenek Dohnal - 2:9.0.1407-1 - patchlevel 1407 From 0fb647e9ce36842b4b29f0785aaafa5e1bdc2c1f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 27 Mar 2023 11:31:15 +0200 Subject: [PATCH 172/324] - patchlevel 1429 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fb0db58f..0847485b 100644 --- a/.gitignore +++ b/.gitignore @@ -434,3 +434,4 @@ /vim-9.0-1403.tar.bz2 /vim-9.0-1407.tar.bz2 /vim-9.0-1423.tar.bz2 +/vim-9.0-1429.tar.bz2 diff --git a/sources b/sources index 8481436f..f9615bd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1423.tar.bz2) = 0460247023fc3666fd532c36e6c6c3ea2f53503f8b47cd2dee351876226800436525574f7d15a18282adfb035af3f0f89e80f6d8a64317df3ba3e82a346a7ab5 +SHA512 (vim-9.0-1429.tar.bz2) = dd585cd82834eb36ad80c1090caac62d12af5551eeb5bc3e0d68b7d26e56801a554a4a0a3e6547eb640eb93d1591f07b20acb74f8cd0a7b1eba6b7d668750cca diff --git a/vim.spec b/vim.spec index bb83a014..2b490d4b 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1423 +%define patchlevel 1429 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1003,6 +1003,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Mar 27 2023 Zdenek Dohnal - 2:9.0.1429-1 +- patchlevel 1429 + * Wed Mar 22 2023 Zdenek Dohnal - 2:9.0.1423-1 - patchlevel 1423 From a49d3ac3e636c23bbced95bbe52a68df5a04843b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= Date: Tue, 4 Apr 2023 13:01:50 +0200 Subject: [PATCH 173/324] Updating fmf plans ang gating for CentOS Stream --- ci.fmf | 1 + gating.yaml | 16 +++++++++------- plans/{all.fmf => public.fmf} | 0 plans/tier1-internal.fmf | 12 ++++++++++++ 4 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 ci.fmf rename plans/{all.fmf => public.fmf} (100%) create mode 100644 plans/tier1-internal.fmf diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 00000000..c5aa0e08 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml index 57d0f4ec..daad873f 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,19 +1,19 @@ --- !Policy product_versions: - fedora-* -decision_contexts: [bodhi_update_push_testing] +decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - -#gating rawhide + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional} + +#Rawhide --- !Policy product_versions: - fedora-* -decision_contexts: [bodhi_update_push_stable] +decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional} #gating rhel --- !Policy @@ -23,4 +23,6 @@ decision_context: osci_compose_gate rules: - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional} \ No newline at end of file + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.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/all.fmf b/plans/public.fmf similarity index 100% rename from plans/all.fmf rename to plans/public.fmf diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf new file mode 100644 index 00000000..ebe4da6a --- /dev/null +++ b/plans/tier1-internal.fmf @@ -0,0 +1,12 @@ +summary: CI plan, picks internal Tier1 tests, runs in beakerlib. +discover: + - name: rhel + how: fmf + filter: 'tier: 1' + url: git://pkgs.devel.redhat.com/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 94dd9fab0838e4884b7c65316420dbae6cec1769 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 5 Apr 2023 09:43:28 +0200 Subject: [PATCH 174/324] - patchlevel 1440 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0847485b..e6c013ca 100644 --- a/.gitignore +++ b/.gitignore @@ -435,3 +435,4 @@ /vim-9.0-1407.tar.bz2 /vim-9.0-1423.tar.bz2 /vim-9.0-1429.tar.bz2 +/vim-9.0-1440.tar.bz2 diff --git a/sources b/sources index f9615bd9..4100dcf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1429.tar.bz2) = dd585cd82834eb36ad80c1090caac62d12af5551eeb5bc3e0d68b7d26e56801a554a4a0a3e6547eb640eb93d1591f07b20acb74f8cd0a7b1eba6b7d668750cca +SHA512 (vim-9.0-1440.tar.bz2) = 3f80a5d56409f21be89a35462af635b37bee6c69ae0e0535f8e6884f8381bb361a0b844d86710d95294b7e887491dd1136adab04a19cf046fb18f13fa969d0a9 diff --git a/vim.spec b/vim.spec index 2b490d4b..677840f5 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1429 +%define patchlevel 1440 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1003,6 +1003,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Apr 05 2023 Zdenek Dohnal - 2:9.0.1440-1 +- patchlevel 1440 + * Mon Mar 27 2023 Zdenek Dohnal - 2:9.0.1429-1 - patchlevel 1429 From eaa2ff76acd84c69704ef396f3964570a5cfaef5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 5 Apr 2023 15:13:58 +0200 Subject: [PATCH 175/324] list most licenses available in binary rpms and migrate them into SPDX syntax --- vim.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 677840f5..371727c1 100644 --- a/vim.spec +++ b/vim.spec @@ -52,7 +52,9 @@ Name: vim Version: %{baseversion}.%{patchlevel} Release: 1%{?dist} Epoch: 2 -License: Vim and MIT +# the Apache-2.0 is Apache 2.0 with runtime library exception - reported to legal for adding to the list of allowed licenses, but swift-lang uses it as well +# Open Publication License 1.0 or later - reported to legal for adding to the allowed licenses list +License: Vim AND LGPL-2.1-or-later AND MIT AND Apache-2.0 AND GPL-1.0-only AND (GPL-2.0-only OR Vim) AND BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-or-later AND GPL-3.0-or-later Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: virc Source2: vimrc @@ -1002,7 +1004,11 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %endif + %changelog +* Wed Apr 05 2023 Zdenek Dohnal - 2:9.0.1440-2 +- list most licenses available in binary rpms and migrate them into SPDX syntax + * Wed Apr 05 2023 Zdenek Dohnal - 2:9.0.1440-1 - patchlevel 1440 From dbc7b1d4be301471302f4472c16b20c4adab72b6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 5 Apr 2023 16:13:30 +0200 Subject: [PATCH 176/324] create xxd package, because it is used by hex.nvim --- vim.spec | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/vim.spec b/vim.spec index 371727c1..29954b76 100644 --- a/vim.spec +++ b/vim.spec @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 # the Apache-2.0 is Apache 2.0 with runtime library exception - reported to legal for adding to the list of allowed licenses, but swift-lang uses it as well # Open Publication License 1.0 or later - reported to legal for adding to the allowed licenses list @@ -169,6 +169,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, @@ -359,6 +362,17 @@ Requires: vim-enhanced This subpackage contains files needed to set Vim as the default editor. %endif +%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 +a hex dump back to its original binary form. + %prep %setup -q -b 0 -n %{vimdir} @@ -837,12 +851,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %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/rvim.* %{_mandir}/man1/vim.* %{_mandir}/man1/vimdiff.* %{_mandir}/man1/vimtutor.* -%{_mandir}/man1/xxd.* %{_mandir}/man5/vimrc.* %if %{with gui} @@ -1004,8 +1016,16 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %endif +%files -n xxd +%license LICENSE +%{_bindir}/xxd +%{_mandir}/man1/xxd.* + %changelog +* Wed Apr 05 2023 Andreas Schneider - 2:9.0.1440-2 +- create xxd package, because it is used by hex.nvim + * Wed Apr 05 2023 Zdenek Dohnal - 2:9.0.1440-2 - list most licenses available in binary rpms and migrate them into SPDX syntax From 876f300e506bc0b474fe0dcd447f0359641dcf19 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 11 Apr 2023 10:36:24 +0200 Subject: [PATCH 177/324] incorporate License tag changes based on legal team response --- vim.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/vim.spec b/vim.spec index 29954b76..d31230d9 100644 --- a/vim.spec +++ b/vim.spec @@ -52,9 +52,15 @@ Name: vim Version: %{baseversion}.%{patchlevel} Release: 2%{?dist} Epoch: 2 -# the Apache-2.0 is Apache 2.0 with runtime library exception - reported to legal for adding to the list of allowed licenses, but swift-lang uses it as well -# Open Publication License 1.0 or later - reported to legal for adding to the allowed licenses list -License: Vim AND LGPL-2.1-or-later AND MIT AND Apache-2.0 AND GPL-1.0-only AND (GPL-2.0-only OR Vim) AND BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-or-later AND GPL-3.0-or-later +# 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 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: virc Source2: vimrc @@ -1023,6 +1029,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Apr 11 2023 Zdenek Dohnal - 2:9.0.1440-2 +- incorporate License tag changes based on legal team response + * Wed Apr 05 2023 Andreas Schneider - 2:9.0.1440-2 - create xxd package, because it is used by hex.nvim From 5654b6cd07ed2a6bf6cc1bec34119da35779e886 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 11 Apr 2023 11:42:34 +0200 Subject: [PATCH 178/324] - patchlevel 1443 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e6c013ca..adfeb4ef 100644 --- a/.gitignore +++ b/.gitignore @@ -436,3 +436,4 @@ /vim-9.0-1423.tar.bz2 /vim-9.0-1429.tar.bz2 /vim-9.0-1440.tar.bz2 +/vim-9.0-1443.tar.bz2 diff --git a/sources b/sources index 4100dcf4..9268b46f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1440.tar.bz2) = 3f80a5d56409f21be89a35462af635b37bee6c69ae0e0535f8e6884f8381bb361a0b844d86710d95294b7e887491dd1136adab04a19cf046fb18f13fa969d0a9 +SHA512 (vim-9.0-1443.tar.bz2) = 8a0f5c896ea6b0d56a3b603d67e2ed5434150ca09166537be1ebdc069452add0457736985f62f29521131d0ab6b97f07be800d089f59014f92bb25c790976aee diff --git a/vim.spec b/vim.spec index d31230d9..7565cc45 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1440 +%define patchlevel 1443 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://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 @@ -1029,6 +1029,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Apr 11 2023 Zdenek Dohnal - 2:9.0.1443-1 +- patchlevel 1443 + * Tue Apr 11 2023 Zdenek Dohnal - 2:9.0.1440-2 - incorporate License tag changes based on legal team response From 911ee307da14d62d457fa198f429cdac0717ed8c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 21 Apr 2023 09:33:31 +0200 Subject: [PATCH 179/324] vim.spec: Fix deprecation warning about %%patch --- vim.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vim.spec b/vim.spec index 7565cc45..a53daa48 100644 --- a/vim.spec +++ b/vim.spec @@ -388,11 +388,11 @@ sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3005} # fix rogue dependencies from sample code chmod -x runtime/tools/mve.awk -%patch2000 -p1 -b .fixkeys -%patch2001 -p1 +%patch 2000 -p1 -b .fixkeys +%patch 2001 -p1 %if %{withhunspell} -%patch2002 -p1 +%patch 2002 -p1 %endif perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk @@ -402,12 +402,12 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %{__tar} xjf %{SOURCE100} %endif -%patch3000 -p1 -%patch3001 -p1 -%patch3002 -p1 -%patch3003 -p1 -b .python-tests -%patch3004 -p1 -b .fips-warning -%patch3005 -p1 -b .copypaste +%patch 3000 -p1 +%patch 3001 -p1 +%patch 3002 -p1 +%patch 3003 -p1 -b .python-tests +%patch 3004 -p1 -b .fips-warning +%patch 3005 -p1 -b .copypaste %build cd src From 114e0e9dd00aad4123fa964c86348f5a20e34037 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 21 Apr 2023 09:34:54 +0200 Subject: [PATCH 180/324] - patchlevel 1472 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index adfeb4ef..c1065033 100644 --- a/.gitignore +++ b/.gitignore @@ -437,3 +437,4 @@ /vim-9.0-1429.tar.bz2 /vim-9.0-1440.tar.bz2 /vim-9.0-1443.tar.bz2 +/vim-9.0-1472.tar.bz2 diff --git a/sources b/sources index 9268b46f..9abf111a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1443.tar.bz2) = 8a0f5c896ea6b0d56a3b603d67e2ed5434150ca09166537be1ebdc069452add0457736985f62f29521131d0ab6b97f07be800d089f59014f92bb25c790976aee +SHA512 (vim-9.0-1472.tar.bz2) = 974631bd92a162b355f332ef812f439bfe53ceda2fac1c537fd2a40b572c557333d5f0ab4ac456f350d6e773ce97edd1e387baebad9ace48cf313eb0a48642eb diff --git a/vim.spec b/vim.spec index a53daa48..2b7c97c6 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1443 +%define patchlevel 1472 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1029,6 +1029,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Apr 21 2023 Zdenek Dohnal - 2:9.0.1472-1 +- patchlevel 1472 + * Tue Apr 11 2023 Zdenek Dohnal - 2:9.0.1443-1 - patchlevel 1443 From 3baf1abaa8f8caf3e7a461a23cf0374b2b432486 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 25 Apr 2023 09:52:42 +0200 Subject: [PATCH 181/324] vim.spec: Use -P for %%patch, can be used in F36 as well --- vim.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vim.spec b/vim.spec index 2b7c97c6..4d251875 100644 --- a/vim.spec +++ b/vim.spec @@ -388,11 +388,11 @@ sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3005} # fix rogue dependencies from sample code chmod -x runtime/tools/mve.awk -%patch 2000 -p1 -b .fixkeys -%patch 2001 -p1 +%patch -P 2000 -p1 -b .fixkeys +%patch -P 2001 -p1 %if %{withhunspell} -%patch 2002 -p1 +%patch -P 2002 -p1 %endif perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk @@ -402,12 +402,12 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %{__tar} xjf %{SOURCE100} %endif -%patch 3000 -p1 -%patch 3001 -p1 -%patch 3002 -p1 -%patch 3003 -p1 -b .python-tests -%patch 3004 -p1 -b .fips-warning -%patch 3005 -p1 -b .copypaste +%patch -P 3000 -p1 +%patch -P 3001 -p1 +%patch -P 3002 -p1 +%patch -P 3003 -p1 -b .python-tests +%patch -P 3004 -p1 -b .fips-warning +%patch -P 3005 -p1 -b .copypaste %build cd src From 20b3e337edace521e03d029dfb57540090511428 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 25 Apr 2023 09:55:05 +0200 Subject: [PATCH 182/324] - patchlevel 1486 --- .gitignore | 1 + sources | 2 +- vim.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c1065033..63ae4a23 100644 --- a/.gitignore +++ b/.gitignore @@ -438,3 +438,4 @@ /vim-9.0-1440.tar.bz2 /vim-9.0-1443.tar.bz2 /vim-9.0-1472.tar.bz2 +/vim-9.0-1486.tar.bz2 diff --git a/sources b/sources index 9abf111a..25532e88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1472.tar.bz2) = 974631bd92a162b355f332ef812f439bfe53ceda2fac1c537fd2a40b572c557333d5f0ab4ac456f350d6e773ce97edd1e387baebad9ace48cf313eb0a48642eb +SHA512 (vim-9.0-1486.tar.bz2) = b489c738cb3a82f38fbc7b06d5c68f3bbebb5f2425966eb08c30f8342394cd090924938221f66c9d0a8c71b139b6d3e8347c9e88364ae83f315607c825a76d8b diff --git a/vim.spec b/vim.spec index 4d251875..4cfa0f0f 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1472 +%define patchlevel 1486 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -801,6 +801,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %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 @@ -1029,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Apr 25 2023 Zdenek Dohnal - 2:9.0.1486-1 +- patchlevel 1486 + * Fri Apr 21 2023 Zdenek Dohnal - 2:9.0.1472-1 - patchlevel 1472 From dca39eca82fe771613f011a6b02dec4bbecde0ba Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 27 Apr 2023 15:21:46 +0200 Subject: [PATCH 183/324] - patchlevel 1491 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 63ae4a23..3c8d5b23 100644 --- a/.gitignore +++ b/.gitignore @@ -439,3 +439,4 @@ /vim-9.0-1443.tar.bz2 /vim-9.0-1472.tar.bz2 /vim-9.0-1486.tar.bz2 +/vim-9.0-1491.tar.bz2 diff --git a/sources b/sources index 25532e88..d851315a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1486.tar.bz2) = b489c738cb3a82f38fbc7b06d5c68f3bbebb5f2425966eb08c30f8342394cd090924938221f66c9d0a8c71b139b6d3e8347c9e88364ae83f315607c825a76d8b +SHA512 (vim-9.0-1491.tar.bz2) = ff64f49b82dc2c2758323b377be61bae9d8867f25e647600eb9620b8783e52a78a6f28ca3f47893b667309ea5aa757ed503fe1f303f5caee75d47da7cd5b605a diff --git a/vim.spec b/vim.spec index 4cfa0f0f..ebd7c188 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1486 +%define patchlevel 1491 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Thu Apr 27 2023 Zdenek Dohnal - 2:9.0.1491-1 +- patchlevel 1491 + * Tue Apr 25 2023 Zdenek Dohnal - 2:9.0.1486-1 - patchlevel 1486 From c33f2cbb2882c7b9e7659c793d8ca0643c037c8d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 18 May 2023 11:47:33 +0200 Subject: [PATCH 184/324] vim-update.sh: F36 is EOL --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index bcf4c2b0..b92873c6 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f38" "f37" "f36" ) -releases=( "fc39" "fc38" "fc37" "fc36" ) +branches=( "rawhide" "f38" "f37" ) +releases=( "fc39" "fc38" "fc37" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc39" "fc38" "\|fc37" "\|fc36" ) -bodhi_enabled=( "0" "1" "1" "1" ) +regexps=( "fc39" "fc38" "\|fc37" ) +bodhi_enabled=( "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From 3ed4faa07260eb15313ea9fbdea9751740343837 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 18 May 2023 12:17:54 +0200 Subject: [PATCH 185/324] - patchlevel 1562 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3c8d5b23..b25857b8 100644 --- a/.gitignore +++ b/.gitignore @@ -440,3 +440,4 @@ /vim-9.0-1472.tar.bz2 /vim-9.0-1486.tar.bz2 /vim-9.0-1491.tar.bz2 +/vim-9.0-1562.tar.bz2 diff --git a/sources b/sources index d851315a..bdcee0b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1491.tar.bz2) = ff64f49b82dc2c2758323b377be61bae9d8867f25e647600eb9620b8783e52a78a6f28ca3f47893b667309ea5aa757ed503fe1f303f5caee75d47da7cd5b605a +SHA512 (vim-9.0-1562.tar.bz2) = da76303010cb4091a2b7d9f56bf6e811b0f9047cb09e67b7912d49e7b976d78c5ffddb98f63b252343ae66d5d86cadb7221bd934647211aa87a2102610bdd131 diff --git a/vim.spec b/vim.spec index ebd7c188..c9e7b430 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1491 +%define patchlevel 1562 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Thu May 18 2023 Zdenek Dohnal - 2:9.0.1562-1 +- patchlevel 1562 + * Thu Apr 27 2023 Zdenek Dohnal - 2:9.0.1491-1 - patchlevel 1491 From 6c378aff987da85a7c734f92ee2ec41af068a520 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 24 May 2023 09:19:54 +0200 Subject: [PATCH 186/324] - patchlevel 1575 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b25857b8..a0c97ed0 100644 --- a/.gitignore +++ b/.gitignore @@ -441,3 +441,4 @@ /vim-9.0-1486.tar.bz2 /vim-9.0-1491.tar.bz2 /vim-9.0-1562.tar.bz2 +/vim-9.0-1575.tar.bz2 diff --git a/sources b/sources index bdcee0b0..7f871c62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1562.tar.bz2) = da76303010cb4091a2b7d9f56bf6e811b0f9047cb09e67b7912d49e7b976d78c5ffddb98f63b252343ae66d5d86cadb7221bd934647211aa87a2102610bdd131 +SHA512 (vim-9.0-1575.tar.bz2) = 375851dc02e71c02894e2af0fce9d9bc389fb8f1ea61da79a3622c235dfe18d5d875cab53db1f9563eb355b30ae6078328a0a2303542c3c895b9083d7f5b5247 diff --git a/vim.spec b/vim.spec index c9e7b430..d714da9e 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1562 +%define patchlevel 1575 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Wed May 24 2023 Zdenek Dohnal - 2:9.0.1575-1 +- patchlevel 1575 + * Thu May 18 2023 Zdenek Dohnal - 2:9.0.1562-1 - patchlevel 1562 From d7b66cfd3202995d9f3ca34cf88592008ff8df23 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 29 May 2023 09:31:48 +0200 Subject: [PATCH 187/324] - patchlevel 1587 --- .gitignore | 1 + sources | 2 +- vim-crypto-warning.patch | 28 ++++++++++++++-------------- vim.spec | 5 ++++- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index a0c97ed0..92508029 100644 --- a/.gitignore +++ b/.gitignore @@ -442,3 +442,4 @@ /vim-9.0-1491.tar.bz2 /vim-9.0-1562.tar.bz2 /vim-9.0-1575.tar.bz2 +/vim-9.0-1587.tar.bz2 diff --git a/sources b/sources index 7f871c62..a229a613 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1575.tar.bz2) = 375851dc02e71c02894e2af0fce9d9bc389fb8f1ea61da79a3622c235dfe18d5d875cab53db1f9563eb355b30ae6078328a0a2303542c3c895b9083d7f5b5247 +SHA512 (vim-9.0-1587.tar.bz2) = 84da8c43c9529726307e4bdab25db31cb85e1767ca7d7cda80094a40cb94d27e95ea0f991d1d779a395eba33044bbe342517d80d1534c9eb0d82b4f0a8c59226 diff --git a/vim-crypto-warning.patch b/vim-crypto-warning.patch index 3b664232..195d7025 100644 --- a/vim-crypto-warning.patch +++ b/vim-crypto-warning.patch @@ -1,7 +1,7 @@ -diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in ---- vim82/src/config.h.in.fips-warning 2022-02-24 08:13:59.017280243 +0100 -+++ vim82/src/config.h.in 2022-02-24 08:14:33.085580298 +0100 -@@ -508,5 +508,14 @@ +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 @@ /* Define if _SC_SIGSTKSZ is available via sysconf() */ #undef HAVE_SYSCONF_SIGSTKSZ @@ -16,10 +16,10 @@ diff -up vim82/src/config.h.in.fips-warning vim82/src/config.h.in + /* Define if you want to load libgpm dynamically */ #undef DYNAMIC_GPM -diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac ---- vim82/src/configure.ac.fips-warning 2022-02-24 08:13:59.014280304 +0100 -+++ vim82/src/configure.ac 2022-02-24 08:13:59.018280222 +0100 -@@ -583,6 +583,38 @@ else +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 AC_SUBST(XDIFF_OBJS_USED) fi @@ -58,17 +58,17 @@ diff -up vim82/src/configure.ac.fips-warning vim82/src/configure.ac dnl Check for Lua feature. AC_MSG_CHECKING(--enable-luainterp argument) AC_ARG_ENABLE(luainterp, -diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c ---- vim82/src/crypt.c.fips-warning 2022-02-24 08:09:29.000000000 +0100 -+++ vim82/src/crypt.c 2022-02-24 08:13:59.018280222 +0100 -@@ -740,6 +740,21 @@ crypt_check_method(int method) +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) 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; ++ return; + + int enabled = fgetc(fips_enable_fd); + @@ -82,4 +82,4 @@ diff -up vim82/src/crypt.c.fips-warning vim82/src/crypt.c +#endif } - #ifdef FEAT_SODIUM + /* diff --git a/vim.spec b/vim.spec index d714da9e..3e0183c7 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1575 +%define patchlevel 1587 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon May 29 2023 Zdenek Dohnal - 2:9.0.1587-1 +- patchlevel 1587 + * Wed May 24 2023 Zdenek Dohnal - 2:9.0.1575-1 - patchlevel 1575 From 729524ecf9c6f0ac26aba663ab8d3665876bf016 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 31 May 2023 11:44:55 +0200 Subject: [PATCH 188/324] - patchlevel 1592 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 92508029..3b8f10de 100644 --- a/.gitignore +++ b/.gitignore @@ -443,3 +443,4 @@ /vim-9.0-1562.tar.bz2 /vim-9.0-1575.tar.bz2 /vim-9.0-1587.tar.bz2 +/vim-9.0-1592.tar.bz2 diff --git a/sources b/sources index a229a613..6a0e2007 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1587.tar.bz2) = 84da8c43c9529726307e4bdab25db31cb85e1767ca7d7cda80094a40cb94d27e95ea0f991d1d779a395eba33044bbe342517d80d1534c9eb0d82b4f0a8c59226 +SHA512 (vim-9.0-1592.tar.bz2) = 158a36ccfcc73a7d9af04c5c3d7ec3c832b4797aaee3bde048a5c1997fce9b1d33f9076df2558925fca8db35737a04c96d7b08272b024ead1e1ef998f63bb1e2 diff --git a/vim.spec b/vim.spec index 3e0183c7..2c88e687 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1587 +%define patchlevel 1592 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Wed May 31 2023 Zdenek Dohnal - 2:9.0.1592-1 +- patchlevel 1592 + * Mon May 29 2023 Zdenek Dohnal - 2:9.0.1587-1 - patchlevel 1587 From f8ac30b02a3ef798ca09ebcce667a42e88e53401 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 5 Jun 2023 11:19:45 +0200 Subject: [PATCH 189/324] - patchlevel 1607 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3b8f10de..76ae5ed5 100644 --- a/.gitignore +++ b/.gitignore @@ -444,3 +444,4 @@ /vim-9.0-1575.tar.bz2 /vim-9.0-1587.tar.bz2 /vim-9.0-1592.tar.bz2 +/vim-9.0-1607.tar.bz2 diff --git a/sources b/sources index 6a0e2007..07c57bbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1592.tar.bz2) = 158a36ccfcc73a7d9af04c5c3d7ec3c832b4797aaee3bde048a5c1997fce9b1d33f9076df2558925fca8db35737a04c96d7b08272b024ead1e1ef998f63bb1e2 +SHA512 (vim-9.0-1607.tar.bz2) = 694ae59c228f5aa1f8e7f3a6e43c37c2a0abd63061f1fa1eac724a3bf4eefd61af2cc2bf9f7b907a98164b861fd2c58cc2b24d846d743d9077ecb7ecf24a3ab1 diff --git a/vim.spec b/vim.spec index 2c88e687..4e1fd8e3 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1592 +%define patchlevel 1607 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon Jun 05 2023 Zdenek Dohnal - 2:9.0.1607-1 +- patchlevel 1607 + * Wed May 31 2023 Zdenek Dohnal - 2:9.0.1592-1 - patchlevel 1592 From ea3aa92d13d99458ada87fbafbc8e37b5e278ec3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 13 Jun 2023 11:47:13 +0200 Subject: [PATCH 190/324] - patchlevel 1627 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 76ae5ed5..faa6e301 100644 --- a/.gitignore +++ b/.gitignore @@ -445,3 +445,4 @@ /vim-9.0-1587.tar.bz2 /vim-9.0-1592.tar.bz2 /vim-9.0-1607.tar.bz2 +/vim-9.0-1627.tar.bz2 diff --git a/sources b/sources index 07c57bbc..d1685f50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1607.tar.bz2) = 694ae59c228f5aa1f8e7f3a6e43c37c2a0abd63061f1fa1eac724a3bf4eefd61af2cc2bf9f7b907a98164b861fd2c58cc2b24d846d743d9077ecb7ecf24a3ab1 +SHA512 (vim-9.0-1627.tar.bz2) = 20590c5c3fc3af6001dee666f9ade4cf34d521f3b0efd1ec1a352a07f21fe8046143000dcdb9a7eb2961a69980dd6b8f0ed32ab9eb096e31c34bf6286f3586c9 diff --git a/vim.spec b/vim.spec index 4e1fd8e3..e1d06866 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1607 +%define patchlevel 1627 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Jun 13 2023 Zdenek Dohnal - 2:9.0.1627-1 +- patchlevel 1627 + * Mon Jun 05 2023 Zdenek Dohnal - 2:9.0.1607-1 - patchlevel 1607 From 2751435f36d0be5a1e583c185e8331bfc3b69969 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 23 Jun 2023 07:41:46 +0200 Subject: [PATCH 191/324] - patchlevel 1649 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index faa6e301..24be89c5 100644 --- a/.gitignore +++ b/.gitignore @@ -446,3 +446,4 @@ /vim-9.0-1592.tar.bz2 /vim-9.0-1607.tar.bz2 /vim-9.0-1627.tar.bz2 +/vim-9.0-1649.tar.bz2 diff --git a/sources b/sources index d1685f50..64635232 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1627.tar.bz2) = 20590c5c3fc3af6001dee666f9ade4cf34d521f3b0efd1ec1a352a07f21fe8046143000dcdb9a7eb2961a69980dd6b8f0ed32ab9eb096e31c34bf6286f3586c9 +SHA512 (vim-9.0-1649.tar.bz2) = 509a6381ce69bbb56cdffa5d41ba9deef7dca5dd458422ef4290b14b9170f6489dde0bf6a669d6eabf9ee8d84e6743d533b5fa3e1d2d087a9328be25e5585972 diff --git a/vim.spec b/vim.spec index e1d06866..f1a72bb7 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1627 +%define patchlevel 1649 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Jun 23 2023 Zdenek Dohnal - 2:9.0.1649-1 +- patchlevel 1649 + * Tue Jun 13 2023 Zdenek Dohnal - 2:9.0.1627-1 - patchlevel 1627 From 134b2165106743ee28e6783c1bcb39341c62656b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 28 Jun 2023 16:10:05 +0200 Subject: [PATCH 192/324] Remove unused files --- gvim.desktop | 64 ---------------------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 gvim.desktop diff --git a/gvim.desktop b/gvim.desktop deleted file mode 100644 index 97bf6ac8..00000000 --- a/gvim.desktop +++ /dev/null @@ -1,64 +0,0 @@ -[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; From a34b1012b831b13c4d291597f634904cf96028b3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 30 Jun 2023 09:11:35 +0200 Subject: [PATCH 193/324] - patchlevel 1671 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 24be89c5..1736a159 100644 --- a/.gitignore +++ b/.gitignore @@ -447,3 +447,4 @@ /vim-9.0-1607.tar.bz2 /vim-9.0-1627.tar.bz2 /vim-9.0-1649.tar.bz2 +/vim-9.0-1671.tar.bz2 diff --git a/sources b/sources index 64635232..c3880829 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1649.tar.bz2) = 509a6381ce69bbb56cdffa5d41ba9deef7dca5dd458422ef4290b14b9170f6489dde0bf6a669d6eabf9ee8d84e6743d533b5fa3e1d2d087a9328be25e5585972 +SHA512 (vim-9.0-1671.tar.bz2) = 02111385f9716e7e81f71d45858020f6d9859955e95039c609668eff349a5b1449d15ef0a2ba98c23749d115ce9cc4024614a08915379eba67a9389ccbbfd0b2 diff --git a/vim.spec b/vim.spec index f1a72bb7..b20db680 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1649 +%define patchlevel 1671 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Jun 30 2023 Zdenek Dohnal - 2:9.0.1671-1 +- patchlevel 1671 + * Fri Jun 23 2023 Zdenek Dohnal - 2:9.0.1649-1 - patchlevel 1649 From 517fce5d931168b11e7d757c27508d7f70c875d8 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 16:13:47 +0200 Subject: [PATCH 194/324] Perl 5.38 rebuild --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index b20db680..89403a78 100644 --- a/vim.spec +++ b/vim.spec @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://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 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Jul 11 2023 Jitka Plesnikova - 2:9.0.1671-2 +- Perl 5.38 rebuild + * Fri Jun 30 2023 Zdenek Dohnal - 2:9.0.1671-1 - patchlevel 1671 From 1da81559a34264bfcd57330170d77ccdcf99add7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 10 Jul 2023 11:36:31 +0200 Subject: [PATCH 195/324] - patchlevel 1677 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1736a159..ee014a94 100644 --- a/.gitignore +++ b/.gitignore @@ -448,3 +448,4 @@ /vim-9.0-1627.tar.bz2 /vim-9.0-1649.tar.bz2 /vim-9.0-1671.tar.bz2 +/vim-9.0-1677.tar.bz2 diff --git a/sources b/sources index c3880829..39f1d80f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1671.tar.bz2) = 02111385f9716e7e81f71d45858020f6d9859955e95039c609668eff349a5b1449d15ef0a2ba98c23749d115ce9cc4024614a08915379eba67a9389ccbbfd0b2 +SHA512 (vim-9.0-1677.tar.bz2) = b04b119c47e74197f1dba646f475488e838deff0acc0ab389746486368b797f2a7c5b0fc73cd383936b7a17072b1a9d9819deed58226e5da8330b1f762f8d089 diff --git a/vim.spec b/vim.spec index 89403a78..d7401dec 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1671 +%define patchlevel 1677 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Jul 11 2023 Zdenek Dohnal - 2:9.0.1677-1 +- patchlevel 1677 + * Tue Jul 11 2023 Jitka Plesnikova - 2:9.0.1671-2 - Perl 5.38 rebuild From 74af866c9b19d24378732ca85339dbcff11514ee Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 13 Jul 2023 16:09:05 +0200 Subject: [PATCH 196/324] 2222671 - fix FTBFS due Python3 rebase 2222648 - fix FailToInstall due Perl rebase --- ...-building-dynamic-Python3-interprete.patch | 62 +++++++++++++++++++ perl538.patch | 48 ++++++++++++++ vim.spec | 10 +++ 3 files changed, 120 insertions(+) create mode 100644 0001-if_python3.c-Fix-building-dynamic-Python3-interprete.patch create mode 100644 perl538.patch diff --git a/0001-if_python3.c-Fix-building-dynamic-Python3-interprete.patch b/0001-if_python3.c-Fix-building-dynamic-Python3-interprete.patch new file mode 100644 index 00000000..6b06a3f2 --- /dev/null +++ b/0001-if_python3.c-Fix-building-dynamic-Python3-interprete.patch @@ -0,0 +1,62 @@ +From 939e0db21a5145d6a84eb8922ba3dc3a14fb4572 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Wed, 12 Jul 2023 13:13:38 +0200 +Subject: [PATCH] if_python3.c: Fix building dynamic Python3 interpreter + +There are new extern global variables defined in python3 development +files, which types are within python3 library, so they break dynamic +python3 interpret Vim plugin. + +Since the variables are used in macro `Py_SIZE` which is used in other +python3 headers, the dummy variables have to defined before including +Python.h. +--- + src/if_python3.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/if_python3.c b/src/if_python3.c +index 240b88fac..f6704a31e 100644 +--- a/src/if_python3.c ++++ b/src/if_python3.c +@@ -68,6 +68,8 @@ + #endif + + #define PY_SSIZE_T_CLEAN ++#define PyLong_Type (*py3_PyLong_Type) ++#define PyBool_Type (*py3_PyBool_Type) + + #include + +@@ -270,7 +272,6 @@ static HINSTANCE hinstPy3 = 0; // Instance of python.dll + # define PyFloat_Type (*py3_PyFloat_Type) + # define PyNumber_Check (*py3_PyNumber_Check) + # define PyNumber_Long (*py3_PyNumber_Long) +-# define PyBool_Type (*py3_PyBool_Type) + # define PyErr_NewException py3_PyErr_NewException + # ifdef Py_DEBUG + # define _Py_NegativeRefcount py3__Py_NegativeRefcount +@@ -448,7 +449,10 @@ static PyTypeObject* py3_PyType_Type; + static PyTypeObject* py3_PyStdPrinter_Type; + static PyTypeObject* py3_PySlice_Type; + static PyTypeObject* py3_PyFloat_Type; +-static PyTypeObject* py3_PyBool_Type; ++PyTypeObject* py3_PyBool_Type; ++# if PY_VERSION_HEX >= 0x030c00b0 ++PyTypeObject* py3_PyLong_Type; ++# endif + static int (*py3_PyNumber_Check)(PyObject *); + static PyObject* (*py3_PyNumber_Long)(PyObject *); + static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict); +@@ -624,6 +628,9 @@ static struct + {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type}, + {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type}, + {"PyBool_Type", (PYTHON_PROC*)&py3_PyBool_Type}, ++# if PY_VERSION_HEX >= 0x030c00b0 ++ {"PyLong_Type", (PYTHON_PROC*)&py3_PyLong_Type}, ++# endif + {"PyNumber_Check", (PYTHON_PROC*)&py3_PyNumber_Check}, + {"PyNumber_Long", (PYTHON_PROC*)&py3_PyNumber_Long}, + {"PyErr_NewException", (PYTHON_PROC*)&py3_PyErr_NewException}, +-- +2.41.0 + diff --git a/perl538.patch b/perl538.patch new file mode 100644 index 00000000..ea935745 --- /dev/null +++ b/perl538.patch @@ -0,0 +1,48 @@ +diff --git a/src/if_perl.xs b/src/if_perl.xs +index c69ed9ef1..2cf78b901 100644 +--- a/src/if_perl.xs ++++ b/src/if_perl.xs +@@ -40,7 +40,7 @@ + /* Work around for perl-5.18. + * Don't include "perl\lib\CORE\inline.h" for now, + * include it after Perl_sv_free2 is defined. */ +-#ifdef DYNAMIC_PERL ++#if (PERL_REVISION == 5) && (PERL_VERSION >= 18) + # define PERL_NO_INLINE_FUNCTIONS + #endif + +@@ -402,14 +402,14 @@ static bool (*Perl_sv_2bool)(pTHX_ SV*); + static IV (*Perl_sv_2iv)(pTHX_ SV*); + static SV* (*Perl_sv_2mortal)(pTHX_ SV*); + # if (PERL_REVISION == 5) && (PERL_VERSION >= 8) +-static char* (*Perl_sv_2pv_flags)(pTHX_ SV*, STRLEN*, I32); ++static char* (*Perl_sv_2pv_flags)(pTHX_ SV*, STRLEN* const, const U32); + static char* (*Perl_sv_2pv_nolen)(pTHX_ SV*); + # else + static char* (*Perl_sv_2pv)(pTHX_ SV*, STRLEN*); + # endif + static char* (*Perl_sv_2pvbyte)(pTHX_ SV*, STRLEN*); + # if (PERL_REVISION == 5) && (PERL_VERSION >= 32) +-static char* (*Perl_sv_2pvbyte_flags)(pTHX_ SV*, STRLEN*, I32); ++static char* (*Perl_sv_2pvbyte_flags)(pTHX_ SV*, STRLEN* const, const U32); + # endif + static SV* (*Perl_sv_bless)(pTHX_ SV*, HV*); + # if (PERL_REVISION == 5) && (PERL_VERSION >= 8) +@@ -710,7 +710,7 @@ S_POPMARK(pTHX) + # endif + + /* perl-5.34 needs Perl_SvTRUE_common; used in SvTRUE_nomg_NN */ +-# if (PERL_REVISION == 5) && (PERL_VERSION >= 34) ++# if (PERL_REVISION == 5) && (PERL_VERSION == 34) + PERL_STATIC_INLINE bool + Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback) + { +@@ -737,7 +737,7 @@ Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback) + # endif + + /* perl-5.32 needs Perl_SvTRUE */ +-# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) ++# if (PERL_REVISION == 5) && (PERL_VERSION == 32) + PERL_STATIC_INLINE bool + Perl_SvTRUE(pTHX_ SV *sv) { + if (!LIKELY(sv)) diff --git a/vim.spec b/vim.spec index d7401dec..e8ef1d35 100644 --- a/vim.spec +++ b/vim.spec @@ -98,6 +98,10 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch +# https://github.com/vim/vim/pull/12660 +Patch3006: 0001-if_python3.c-Fix-building-dynamic-Python3-interprete.patch +# https://github.com/vim/vim/pull/12575 + https://github.com/vim/vim/pull/12575#issuecomment-1634226250 +Patch3007: perl538.patch # uses autoconf in spec file @@ -408,6 +412,8 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch -P 3003 -p1 -b .python-tests %patch -P 3004 -p1 -b .fips-warning %patch -P 3005 -p1 -b .copypaste +%patch -P 3006 -p1 -b .python312 +%patch -P 3007 -p1 -b .perl538 %build cd src @@ -1030,6 +1036,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Thu Jul 13 2023 Zdenek Dohnal - 2:9.0.1677-1 +- 2222671 - fix FTBFS due Python3 rebase +- 2222648 - fix FailToInstall due Perl rebase + * Tue Jul 11 2023 Zdenek Dohnal - 2:9.0.1677-1 - patchlevel 1677 From 78deee56e96e126ba5006f64da282d538e4e6fa7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 21 Jul 2023 08:13:37 +0200 Subject: [PATCH 197/324] vim.spec: update changelog entries to release 2 The latest build which contains the fixes mentioned in the changelog was built with release 2 by mistake from rebasing the branch, so update the entries to match what was fixed in the build. --- vim.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index e8ef1d35..4d41a08f 100644 --- a/vim.spec +++ b/vim.spec @@ -1036,11 +1036,11 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog -* Thu Jul 13 2023 Zdenek Dohnal - 2:9.0.1677-1 +* Thu Jul 13 2023 Zdenek Dohnal - 2:9.0.1677-2 - 2222671 - fix FTBFS due Python3 rebase - 2222648 - fix FailToInstall due Perl rebase -* Tue Jul 11 2023 Zdenek Dohnal - 2:9.0.1677-1 +* Tue Jul 11 2023 Zdenek Dohnal - 2:9.0.1677-2 - patchlevel 1677 * Tue Jul 11 2023 Jitka Plesnikova - 2:9.0.1671-2 From b226b0ae50c0827e621df8f63c58de4c9584eb7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:37:33 +0000 Subject: [PATCH 198/324] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 4d41a08f..b99432a5 100644 --- a/vim.spec +++ b/vim.spec @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 3%{?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 @@ -1036,6 +1036,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2:9.0.1677-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 13 2023 Zdenek Dohnal - 2:9.0.1677-2 - 2222671 - fix FTBFS due Python3 rebase - 2222648 - fix FailToInstall due Perl rebase From 3094c97ae127e3a5503b732c0ec718acb2312b2a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 9 Aug 2023 14:34:56 +0200 Subject: [PATCH 199/324] vim-update.sh: include branched f39 --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index b92873c6..48a8cb1d 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f38" "f37" ) -releases=( "fc39" "fc38" "fc37" ) +branches=( "rawhide" "f39" "f38" "f37" ) +releases=( "fc40" "fc39" "fc38" "fc37" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc39" "fc38" "\|fc37" ) -bodhi_enabled=( "0" "1" "1" ) +regexps=( "fc40" "fc39" "fc38" "\|fc37" ) +bodhi_enabled=( "0" "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From 6121c87abcd805c6b00859f8f36ee98bf4ac3c36 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 11 Aug 2023 16:59:51 +0200 Subject: [PATCH 200/324] fix test suite from python3 syntax warnings --- vim-pysyntaxwarn.patch | 18 ++++++++++++++++++ vim.spec | 9 ++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 vim-pysyntaxwarn.patch diff --git a/vim-pysyntaxwarn.patch b/vim-pysyntaxwarn.patch new file mode 100644 index 00000000..514a7871 --- /dev/null +++ b/vim-pysyntaxwarn.patch @@ -0,0 +1,18 @@ +diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim +index b7140ee..e975cb6 100644 +--- a/src/testdir/test_python3.vim ++++ b/src/testdir/test_python3.vim +@@ -22,10 +22,10 @@ func Test_AAA_python3_setup() + import sys + import re + +- py33_type_error_pattern = re.compile('^__call__\(\) takes (\d+) positional argument but (\d+) were given$') ++ py33_type_error_pattern = re.compile(r'^__call__\(\) takes (\d+) positional argument but (\d+) were given$') + py37_exception_repr = re.compile(r'([^\(\),])(\)+)$') +- py39_type_error_pattern = re.compile('\w+\.([^(]+\(\) takes)') +- py310_type_error_pattern = re.compile('takes (\d+) positional argument but (\d+) were given') ++ py39_type_error_pattern = re.compile(r'\w+\.([^(]+\(\) takes)') ++ py310_type_error_pattern = re.compile(r'takes (\d+) positional argument but (\d+) were given') + + def emsg(ei): + return ei[0].__name__ + ':' + repr(ei[1].args) diff --git a/vim.spec b/vim.spec index b99432a5..42e551fc 100644 --- a/vim.spec +++ b/vim.spec @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 3%{?dist} +Release: 4%{?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 @@ -102,6 +102,9 @@ Patch3005: vim-8.0-copy-paste.patch Patch3006: 0001-if_python3.c-Fix-building-dynamic-Python3-interprete.patch # https://github.com/vim/vim/pull/12575 + https://github.com/vim/vim/pull/12575#issuecomment-1634226250 Patch3007: perl538.patch +# fix python syntax warnings which make test suite fail +# reported upstream https://github.com/vim/vim/pull/12765 +Patch3008: vim-pysyntaxwarn.patch # uses autoconf in spec file @@ -414,6 +417,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch -P 3005 -p1 -b .copypaste %patch -P 3006 -p1 -b .python312 %patch -P 3007 -p1 -b .perl538 +%patch -P 3008 -p1 -b .pysyntaxwarn %build cd src @@ -1036,6 +1040,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Aug 11 2023 Zdenek Dohnal - 2:9.0.1677-4 +- fix test suite from python3 syntax warnings + * Sat Jul 22 2023 Fedora Release Engineering - 2:9.0.1677-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From efdfc61e5d6ee9a39d546a7fb838123705eb11d4 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 14 Aug 2023 11:51:52 +0200 Subject: [PATCH 201/324] Remove patches accepted by upstream --- ...-building-dynamic-Python3-interprete.patch | 62 ------------------- perl538.patch | 48 -------------- vim-pysyntaxwarn.patch | 18 ------ vim.spec | 10 --- 4 files changed, 138 deletions(-) delete mode 100644 0001-if_python3.c-Fix-building-dynamic-Python3-interprete.patch delete mode 100644 perl538.patch delete mode 100644 vim-pysyntaxwarn.patch diff --git a/0001-if_python3.c-Fix-building-dynamic-Python3-interprete.patch b/0001-if_python3.c-Fix-building-dynamic-Python3-interprete.patch deleted file mode 100644 index 6b06a3f2..00000000 --- a/0001-if_python3.c-Fix-building-dynamic-Python3-interprete.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 939e0db21a5145d6a84eb8922ba3dc3a14fb4572 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Wed, 12 Jul 2023 13:13:38 +0200 -Subject: [PATCH] if_python3.c: Fix building dynamic Python3 interpreter - -There are new extern global variables defined in python3 development -files, which types are within python3 library, so they break dynamic -python3 interpret Vim plugin. - -Since the variables are used in macro `Py_SIZE` which is used in other -python3 headers, the dummy variables have to defined before including -Python.h. ---- - src/if_python3.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/if_python3.c b/src/if_python3.c -index 240b88fac..f6704a31e 100644 ---- a/src/if_python3.c -+++ b/src/if_python3.c -@@ -68,6 +68,8 @@ - #endif - - #define PY_SSIZE_T_CLEAN -+#define PyLong_Type (*py3_PyLong_Type) -+#define PyBool_Type (*py3_PyBool_Type) - - #include - -@@ -270,7 +272,6 @@ static HINSTANCE hinstPy3 = 0; // Instance of python.dll - # define PyFloat_Type (*py3_PyFloat_Type) - # define PyNumber_Check (*py3_PyNumber_Check) - # define PyNumber_Long (*py3_PyNumber_Long) --# define PyBool_Type (*py3_PyBool_Type) - # define PyErr_NewException py3_PyErr_NewException - # ifdef Py_DEBUG - # define _Py_NegativeRefcount py3__Py_NegativeRefcount -@@ -448,7 +449,10 @@ static PyTypeObject* py3_PyType_Type; - static PyTypeObject* py3_PyStdPrinter_Type; - static PyTypeObject* py3_PySlice_Type; - static PyTypeObject* py3_PyFloat_Type; --static PyTypeObject* py3_PyBool_Type; -+PyTypeObject* py3_PyBool_Type; -+# if PY_VERSION_HEX >= 0x030c00b0 -+PyTypeObject* py3_PyLong_Type; -+# endif - static int (*py3_PyNumber_Check)(PyObject *); - static PyObject* (*py3_PyNumber_Long)(PyObject *); - static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict); -@@ -624,6 +628,9 @@ static struct - {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type}, - {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type}, - {"PyBool_Type", (PYTHON_PROC*)&py3_PyBool_Type}, -+# if PY_VERSION_HEX >= 0x030c00b0 -+ {"PyLong_Type", (PYTHON_PROC*)&py3_PyLong_Type}, -+# endif - {"PyNumber_Check", (PYTHON_PROC*)&py3_PyNumber_Check}, - {"PyNumber_Long", (PYTHON_PROC*)&py3_PyNumber_Long}, - {"PyErr_NewException", (PYTHON_PROC*)&py3_PyErr_NewException}, --- -2.41.0 - diff --git a/perl538.patch b/perl538.patch deleted file mode 100644 index ea935745..00000000 --- a/perl538.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/if_perl.xs b/src/if_perl.xs -index c69ed9ef1..2cf78b901 100644 ---- a/src/if_perl.xs -+++ b/src/if_perl.xs -@@ -40,7 +40,7 @@ - /* Work around for perl-5.18. - * Don't include "perl\lib\CORE\inline.h" for now, - * include it after Perl_sv_free2 is defined. */ --#ifdef DYNAMIC_PERL -+#if (PERL_REVISION == 5) && (PERL_VERSION >= 18) - # define PERL_NO_INLINE_FUNCTIONS - #endif - -@@ -402,14 +402,14 @@ static bool (*Perl_sv_2bool)(pTHX_ SV*); - static IV (*Perl_sv_2iv)(pTHX_ SV*); - static SV* (*Perl_sv_2mortal)(pTHX_ SV*); - # if (PERL_REVISION == 5) && (PERL_VERSION >= 8) --static char* (*Perl_sv_2pv_flags)(pTHX_ SV*, STRLEN*, I32); -+static char* (*Perl_sv_2pv_flags)(pTHX_ SV*, STRLEN* const, const U32); - static char* (*Perl_sv_2pv_nolen)(pTHX_ SV*); - # else - static char* (*Perl_sv_2pv)(pTHX_ SV*, STRLEN*); - # endif - static char* (*Perl_sv_2pvbyte)(pTHX_ SV*, STRLEN*); - # if (PERL_REVISION == 5) && (PERL_VERSION >= 32) --static char* (*Perl_sv_2pvbyte_flags)(pTHX_ SV*, STRLEN*, I32); -+static char* (*Perl_sv_2pvbyte_flags)(pTHX_ SV*, STRLEN* const, const U32); - # endif - static SV* (*Perl_sv_bless)(pTHX_ SV*, HV*); - # if (PERL_REVISION == 5) && (PERL_VERSION >= 8) -@@ -710,7 +710,7 @@ S_POPMARK(pTHX) - # endif - - /* perl-5.34 needs Perl_SvTRUE_common; used in SvTRUE_nomg_NN */ --# if (PERL_REVISION == 5) && (PERL_VERSION >= 34) -+# if (PERL_REVISION == 5) && (PERL_VERSION == 34) - PERL_STATIC_INLINE bool - Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback) - { -@@ -737,7 +737,7 @@ Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback) - # endif - - /* perl-5.32 needs Perl_SvTRUE */ --# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) -+# if (PERL_REVISION == 5) && (PERL_VERSION == 32) - PERL_STATIC_INLINE bool - Perl_SvTRUE(pTHX_ SV *sv) { - if (!LIKELY(sv)) diff --git a/vim-pysyntaxwarn.patch b/vim-pysyntaxwarn.patch deleted file mode 100644 index 514a7871..00000000 --- a/vim-pysyntaxwarn.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim -index b7140ee..e975cb6 100644 ---- a/src/testdir/test_python3.vim -+++ b/src/testdir/test_python3.vim -@@ -22,10 +22,10 @@ func Test_AAA_python3_setup() - import sys - import re - -- py33_type_error_pattern = re.compile('^__call__\(\) takes (\d+) positional argument but (\d+) were given$') -+ py33_type_error_pattern = re.compile(r'^__call__\(\) takes (\d+) positional argument but (\d+) were given$') - py37_exception_repr = re.compile(r'([^\(\),])(\)+)$') -- py39_type_error_pattern = re.compile('\w+\.([^(]+\(\) takes)') -- py310_type_error_pattern = re.compile('takes (\d+) positional argument but (\d+) were given') -+ py39_type_error_pattern = re.compile(r'\w+\.([^(]+\(\) takes)') -+ py310_type_error_pattern = re.compile(r'takes (\d+) positional argument but (\d+) were given') - - def emsg(ei): - return ei[0].__name__ + ':' + repr(ei[1].args) diff --git a/vim.spec b/vim.spec index 42e551fc..d636b655 100644 --- a/vim.spec +++ b/vim.spec @@ -98,13 +98,6 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch -# https://github.com/vim/vim/pull/12660 -Patch3006: 0001-if_python3.c-Fix-building-dynamic-Python3-interprete.patch -# https://github.com/vim/vim/pull/12575 + https://github.com/vim/vim/pull/12575#issuecomment-1634226250 -Patch3007: perl538.patch -# fix python syntax warnings which make test suite fail -# reported upstream https://github.com/vim/vim/pull/12765 -Patch3008: vim-pysyntaxwarn.patch # uses autoconf in spec file @@ -415,9 +408,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch -P 3003 -p1 -b .python-tests %patch -P 3004 -p1 -b .fips-warning %patch -P 3005 -p1 -b .copypaste -%patch -P 3006 -p1 -b .python312 -%patch -P 3007 -p1 -b .perl538 -%patch -P 3008 -p1 -b .pysyntaxwarn %build cd src From 106e2f2581be249aa28956b63ba3b63b5f6e4e9c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 14 Aug 2023 11:52:40 +0200 Subject: [PATCH 202/324] - patchlevel 1712 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ee014a94..e24c6276 100644 --- a/.gitignore +++ b/.gitignore @@ -449,3 +449,4 @@ /vim-9.0-1649.tar.bz2 /vim-9.0-1671.tar.bz2 /vim-9.0-1677.tar.bz2 +/vim-9.0-1712.tar.bz2 diff --git a/sources b/sources index 39f1d80f..ff6814f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1677.tar.bz2) = b04b119c47e74197f1dba646f475488e838deff0acc0ab389746486368b797f2a7c5b0fc73cd383936b7a17072b1a9d9819deed58226e5da8330b1f762f8d089 +SHA512 (vim-9.0-1712.tar.bz2) = c7e72946821edc1b576d11c431ee2a608cdb76aabed4422bd41b04551d06cb8666228d0d41286d46545144b8e3a19313e2f25cf90054c69bc56686c77af6e209 diff --git a/vim.spec b/vim.spec index d636b655..328f89fb 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1677 +%define patchlevel 1712 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 4%{?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 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon Aug 14 2023 Zdenek Dohnal - 2:9.0.1712-1 +- patchlevel 1712 + * Fri Aug 11 2023 Zdenek Dohnal - 2:9.0.1677-4 - fix test suite from python3 syntax warnings From 60596bb2d9ff39be43cedc3edfdae14875ef9c60 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 30 Aug 2023 09:50:08 +0200 Subject: [PATCH 203/324] F39 is enabled in bodhi --- vim-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 48a8cb1d..4e69889e 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -5,8 +5,8 @@ branches=( "rawhide" "f39" "f38" "f37" ) releases=( "fc40" "fc39" "fc38" "fc37" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc40" "fc39" "fc38" "\|fc37" ) -bodhi_enabled=( "0" "0" "1" "1" ) +regexps=( "fc40" "fc39" "\|fc38" "\|fc37" ) +bodhi_enabled=( "0" "1" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From c0fc55f870b7710dd972881777eeb07ed178097e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 30 Aug 2023 09:55:43 +0200 Subject: [PATCH 204/324] Fix typo which breaks patch applying in the next patchlevel --- vim-7.4-specsyntax.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim-7.4-specsyntax.patch b/vim-7.4-specsyntax.patch index 3c028b56..5d794cc7 100644 --- a/vim-7.4-specsyntax.patch +++ b/vim-7.4-specsyntax.patch @@ -12,7 +12,7 @@ diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim 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 + "specCommands syn match specConfigure contained '\./configure' -syn match specTarCommand contained '\ Date: Wed, 30 Aug 2023 09:56:30 +0200 Subject: [PATCH 205/324] - patchlevel 1822 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e24c6276..3e82913d 100644 --- a/.gitignore +++ b/.gitignore @@ -450,3 +450,4 @@ /vim-9.0-1671.tar.bz2 /vim-9.0-1677.tar.bz2 /vim-9.0-1712.tar.bz2 +/vim-9.0-1822.tar.bz2 diff --git a/sources b/sources index ff6814f0..ce340bcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1712.tar.bz2) = c7e72946821edc1b576d11c431ee2a608cdb76aabed4422bd41b04551d06cb8666228d0d41286d46545144b8e3a19313e2f25cf90054c69bc56686c77af6e209 +SHA512 (vim-9.0-1822.tar.bz2) = ac518fb2226936191196ef43f33436d8b6ed65dfc9743931e070983fd0f450ea3675de3d1d83c7d695bd6dbe617e0744a6b618be7ad81f191603c0a70bdad67e diff --git a/vim.spec b/vim.spec index 328f89fb..7fe200be 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1712 +%define patchlevel 1822 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1030,6 +1030,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Wed Aug 30 2023 Zdenek Dohnal - 2:9.0.1822-1 +- patchlevel 1822 + * Mon Aug 14 2023 Zdenek Dohnal - 2:9.0.1712-1 - patchlevel 1712 From 84f77f278cf7d3437d4e51a059f4fa9e18fcaba5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 30 Aug 2023 16:17:27 +0200 Subject: [PATCH 206/324] Add libtool as buildrequire --- vim.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vim.spec b/vim.spec index 7fe200be..1964fa74 100644 --- a/vim.spec +++ b/vim.spec @@ -134,6 +134,9 @@ BuildRequires: libselinux-devel BuildRequires: libsodium-devel %endif +# uses libtool for linking +BuildRequires: libtool + # for lua plugin %if "%{withlua}" == "1" BuildRequires: lua-devel From 550f31b21ea93fa31a64804c812b9e7a447a52b7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 5 Sep 2023 13:20:39 +0200 Subject: [PATCH 207/324] - patchlevel 1872 --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 1964fa74..e9979737 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1822 +%define patchlevel 1872 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1033,6 +1033,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Sep 05 2023 Zdenek Dohnal - 2:9.0.1872-1 +- patchlevel 1872 + * Wed Aug 30 2023 Zdenek Dohnal - 2:9.0.1822-1 - patchlevel 1822 From 17ae92d06390c67f777a00b3e166c0b64368e4ab Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 5 Sep 2023 13:31:36 +0200 Subject: [PATCH 208/324] Revert "- patchlevel 1872" This reverts commit 550f31b21ea93fa31a64804c812b9e7a447a52b7. --- vim.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vim.spec b/vim.spec index e9979737..1964fa74 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1872 +%define patchlevel 1822 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1033,9 +1033,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog -* Tue Sep 05 2023 Zdenek Dohnal - 2:9.0.1872-1 -- patchlevel 1872 - * Wed Aug 30 2023 Zdenek Dohnal - 2:9.0.1822-1 - patchlevel 1822 From 7d2199c149ad2617254f0e5c665d26ea322c4cb2 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 5 Sep 2023 13:32:35 +0200 Subject: [PATCH 209/324] - patchlevel 1872 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3e82913d..5372e471 100644 --- a/.gitignore +++ b/.gitignore @@ -451,3 +451,4 @@ /vim-9.0-1677.tar.bz2 /vim-9.0-1712.tar.bz2 /vim-9.0-1822.tar.bz2 +/vim-9.0-1872.tar.bz2 diff --git a/sources b/sources index ce340bcc..2b27080f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1822.tar.bz2) = ac518fb2226936191196ef43f33436d8b6ed65dfc9743931e070983fd0f450ea3675de3d1d83c7d695bd6dbe617e0744a6b618be7ad81f191603c0a70bdad67e +SHA512 (vim-9.0-1872.tar.bz2) = 5b4c092303e4919f1733f3d12c5c238b306bf09c4b0d139cd7e3637e68b5eb51889ecad529648921a40d8ec9ab112bbb9958e1dd65be801749931cda4b0effc1 diff --git a/vim.spec b/vim.spec index 1964fa74..e9979737 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1822 +%define patchlevel 1872 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1033,6 +1033,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Sep 05 2023 Zdenek Dohnal - 2:9.0.1872-1 +- patchlevel 1872 + * Wed Aug 30 2023 Zdenek Dohnal - 2:9.0.1822-1 - patchlevel 1822 From b9b503c389166006db327bfd296ef691c1ea0b58 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 6 Sep 2023 12:18:35 +0200 Subject: [PATCH 210/324] test_xxd_color2 is flaky --- vim-disable-xxd-color2-test.patch | 21 +++++++++++++++++++++ vim.spec | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 vim-disable-xxd-color2-test.patch diff --git a/vim-disable-xxd-color2-test.patch b/vim-disable-xxd-color2-test.patch new file mode 100644 index 00000000..09d38bcd --- /dev/null +++ b/vim-disable-xxd-color2-test.patch @@ -0,0 +1,21 @@ +diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim +index 437437e..a7deaeb 100644 +--- a/src/testdir/test_xxd.vim ++++ b/src/testdir/test_xxd.vim +@@ -583,11 +583,11 @@ func Test_xxd_color2() + call TermWait(buf) + call VerifyScreenDump(buf, 'Test_xxd_color_0', {}) + +- call TermWait(buf) +- call term_sendkeys(buf, "clear\") +- call term_sendkeys(buf, s:xxd_cmd .. " -R always < XXDfile_colors\") +- call TermWait(buf) +- call VerifyScreenDump(buf, 'Test_xxd_color_1', {}) ++ "call TermWait(buf) ++ "call term_sendkeys(buf, "clear\") ++ "call term_sendkeys(buf, s:xxd_cmd .. " -R always < XXDfile_colors\") ++ "call TermWait(buf) ++ "call VerifyScreenDump(buf, 'Test_xxd_color_1', {}) + + call term_sendkeys(buf, "exit\") + diff --git a/vim.spec b/vim.spec index e9979737..09cc7a42 100644 --- a/vim.spec +++ b/vim.spec @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://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 @@ -98,6 +98,8 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch +# downstream patch for now - reported upstream here https://github.com/vim/vim/pull/13040/ +Patch3006: vim-disable-xxd-color2-test.patch # uses autoconf in spec file @@ -411,6 +413,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch -P 3003 -p1 -b .python-tests %patch -P 3004 -p1 -b .fips-warning %patch -P 3005 -p1 -b .copypaste +%patch -P 3006 -p1 -b .nocleartest %build cd src @@ -1033,6 +1036,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Wed Sep 06 2023 Zdenek Dohnal - 2:9.0.1872-2 +- test_xxd_color2 is flaky + * Tue Sep 05 2023 Zdenek Dohnal - 2:9.0.1872-1 - patchlevel 1872 From 9b37e1a9b2d67e9add3ad716b7246399b3a85b62 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 7 Sep 2023 14:02:32 +0200 Subject: [PATCH 211/324] Remove the patch, latest upstream tests pass --- vim-disable-xxd-color2-test.patch | 21 --------------------- vim.spec | 3 --- 2 files changed, 24 deletions(-) delete mode 100644 vim-disable-xxd-color2-test.patch diff --git a/vim-disable-xxd-color2-test.patch b/vim-disable-xxd-color2-test.patch deleted file mode 100644 index 09d38bcd..00000000 --- a/vim-disable-xxd-color2-test.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim -index 437437e..a7deaeb 100644 ---- a/src/testdir/test_xxd.vim -+++ b/src/testdir/test_xxd.vim -@@ -583,11 +583,11 @@ func Test_xxd_color2() - call TermWait(buf) - call VerifyScreenDump(buf, 'Test_xxd_color_0', {}) - -- call TermWait(buf) -- call term_sendkeys(buf, "clear\") -- call term_sendkeys(buf, s:xxd_cmd .. " -R always < XXDfile_colors\") -- call TermWait(buf) -- call VerifyScreenDump(buf, 'Test_xxd_color_1', {}) -+ "call TermWait(buf) -+ "call term_sendkeys(buf, "clear\") -+ "call term_sendkeys(buf, s:xxd_cmd .. " -R always < XXDfile_colors\") -+ "call TermWait(buf) -+ "call VerifyScreenDump(buf, 'Test_xxd_color_1', {}) - - call term_sendkeys(buf, "exit\") - diff --git a/vim.spec b/vim.spec index 09cc7a42..fb55816e 100644 --- a/vim.spec +++ b/vim.spec @@ -98,8 +98,6 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch -# downstream patch for now - reported upstream here https://github.com/vim/vim/pull/13040/ -Patch3006: vim-disable-xxd-color2-test.patch # uses autoconf in spec file @@ -413,7 +411,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch -P 3003 -p1 -b .python-tests %patch -P 3004 -p1 -b .fips-warning %patch -P 3005 -p1 -b .copypaste -%patch -P 3006 -p1 -b .nocleartest %build cd src From 6bd5a39c27ecbf068865d88c6917740b66d06a1e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 7 Sep 2023 14:03:07 +0200 Subject: [PATCH 212/324] - patchlevel 1882 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5372e471..8f25f18c 100644 --- a/.gitignore +++ b/.gitignore @@ -452,3 +452,4 @@ /vim-9.0-1712.tar.bz2 /vim-9.0-1822.tar.bz2 /vim-9.0-1872.tar.bz2 +/vim-9.0-1882.tar.bz2 diff --git a/sources b/sources index 2b27080f..025c5c5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1872.tar.bz2) = 5b4c092303e4919f1733f3d12c5c238b306bf09c4b0d139cd7e3637e68b5eb51889ecad529648921a40d8ec9ab112bbb9958e1dd65be801749931cda4b0effc1 +SHA512 (vim-9.0-1882.tar.bz2) = a0d25b6a37145605fe8d5154d3d13d7eec256942f5d6be9a60ea1458cc12aace595452bc94172c0dc6f7e8bf7c028f5e789bd99008c870c819621c714c7554eb diff --git a/vim.spec b/vim.spec index fb55816e..e6cb225b 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1872 +%define patchlevel 1882 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://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 @@ -1033,6 +1033,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Thu Sep 07 2023 Zdenek Dohnal - 2:9.0.1882-1 +- patchlevel 1882 + * Wed Sep 06 2023 Zdenek Dohnal - 2:9.0.1872-2 - test_xxd_color2 is flaky From ebd9aa2b250f8cc26541babc6263be26269de32b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 22 Sep 2023 09:39:44 +0200 Subject: [PATCH 213/324] - patchlevel 1927 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8f25f18c..9088b96e 100644 --- a/.gitignore +++ b/.gitignore @@ -453,3 +453,4 @@ /vim-9.0-1822.tar.bz2 /vim-9.0-1872.tar.bz2 /vim-9.0-1882.tar.bz2 +/vim-9.0-1927.tar.bz2 diff --git a/sources b/sources index 025c5c5d..4a75df67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1882.tar.bz2) = a0d25b6a37145605fe8d5154d3d13d7eec256942f5d6be9a60ea1458cc12aace595452bc94172c0dc6f7e8bf7c028f5e789bd99008c870c819621c714c7554eb +SHA512 (vim-9.0-1927.tar.bz2) = 53c66a75e84f78ddf0b0e260e8e5cb24153e0fa9f7f823265216f5179dbaec8d043a02e96eb40f497a035a1232dd58aa21b85c6afb592935227d2ff831869375 diff --git a/vim.spec b/vim.spec index e6cb225b..a7d4cbd4 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1882 +%define patchlevel 1927 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1033,6 +1033,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Sep 22 2023 Zdenek Dohnal - 2:9.0.1927-1 +- patchlevel 1927 + * Thu Sep 07 2023 Zdenek Dohnal - 2:9.0.1882-1 - patchlevel 1882 From f0205b896993fcd8afcadccc6928611095e2e889 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 2 Oct 2023 11:48:39 +0200 Subject: [PATCH 214/324] - patchlevel 1968 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9088b96e..e2d3942e 100644 --- a/.gitignore +++ b/.gitignore @@ -454,3 +454,4 @@ /vim-9.0-1872.tar.bz2 /vim-9.0-1882.tar.bz2 /vim-9.0-1927.tar.bz2 +/vim-9.0-1968.tar.bz2 diff --git a/sources b/sources index 4a75df67..d5d1af75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1927.tar.bz2) = 53c66a75e84f78ddf0b0e260e8e5cb24153e0fa9f7f823265216f5179dbaec8d043a02e96eb40f497a035a1232dd58aa21b85c6afb592935227d2ff831869375 +SHA512 (vim-9.0-1968.tar.bz2) = 7b716f3131c3b1b78383d1366df302035e5118acf2c6adbb41452293a308bc8f23ef23640fa9a60bcef2747361dd8f001be477dc050e6d89acac04a787c128e2 diff --git a/vim.spec b/vim.spec index a7d4cbd4..356f03b8 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1927 +%define patchlevel 1968 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1033,6 +1033,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon Oct 02 2023 Zdenek Dohnal - 2:9.0.1968-1 +- patchlevel 1968 + * Fri Sep 22 2023 Zdenek Dohnal - 2:9.0.1927-1 - patchlevel 1927 From 2c0204dad4ef947ee5e47fd00e9f67cfa3ef360c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 5 Oct 2023 08:03:04 +0200 Subject: [PATCH 215/324] - patchlevel 1984 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e2d3942e..c703a209 100644 --- a/.gitignore +++ b/.gitignore @@ -455,3 +455,4 @@ /vim-9.0-1882.tar.bz2 /vim-9.0-1927.tar.bz2 /vim-9.0-1968.tar.bz2 +/vim-9.0-1984.tar.bz2 diff --git a/sources b/sources index d5d1af75..4c2b80d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1968.tar.bz2) = 7b716f3131c3b1b78383d1366df302035e5118acf2c6adbb41452293a308bc8f23ef23640fa9a60bcef2747361dd8f001be477dc050e6d89acac04a787c128e2 +SHA512 (vim-9.0-1984.tar.bz2) = 8e39dc05258aa44ce2f8386cc2f217fe77c4a009f9087582b9cd47c0ab19c8336bbfad1506da08c7706ceca76b59a23eb2a7c2cba93e43070ea3b6b8bde6f6c0 diff --git a/vim.spec b/vim.spec index 356f03b8..c9d50592 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1968 +%define patchlevel 1984 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1033,6 +1033,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Thu Oct 05 2023 Zdenek Dohnal - 2:9.0.1984-1 +- patchlevel 1984 + * Mon Oct 02 2023 Zdenek Dohnal - 2:9.0.1968-1 - patchlevel 1968 From 6f0c536c471d03f33b5a7323f48b8cf9d45ba033 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Oct 2023 10:01:54 +0200 Subject: [PATCH 216/324] rebuild for new libsodium --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index c9d50592..8ff22643 100644 --- a/vim.spec +++ b/vim.spec @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://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 @@ -1033,6 +1033,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Thu Oct 05 2023 Remi Collet - 2:9.0.1984-2 +- rebuild for new libsodium + * Thu Oct 05 2023 Zdenek Dohnal - 2:9.0.1984-1 - patchlevel 1984 From 6f47745cb14e1b77ff95275d4bc13fd1e9ebaf06 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 18 Oct 2023 16:49:18 +0200 Subject: [PATCH 217/324] - patchlevel 2048 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c703a209..9d881096 100644 --- a/.gitignore +++ b/.gitignore @@ -456,3 +456,4 @@ /vim-9.0-1927.tar.bz2 /vim-9.0-1968.tar.bz2 /vim-9.0-1984.tar.bz2 +/vim-9.0-2048.tar.bz2 diff --git a/sources b/sources index 4c2b80d1..0ebac0a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1984.tar.bz2) = 8e39dc05258aa44ce2f8386cc2f217fe77c4a009f9087582b9cd47c0ab19c8336bbfad1506da08c7706ceca76b59a23eb2a7c2cba93e43070ea3b6b8bde6f6c0 +SHA512 (vim-9.0-2048.tar.bz2) = 7885c6890acc4cca3a4c8d196014e2ad15ba094b86afc1995b9879fc16c50685d30b49ca021ee87d8fb49d396ab84199a26021e86084450f00005d8a5d1c53f0 diff --git a/vim.spec b/vim.spec index 8ff22643..7377904c 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1984 +%define patchlevel 2048 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://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 @@ -1033,6 +1033,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Wed Oct 18 2023 Zdenek Dohnal - 2:9.0.2048-1 +- patchlevel 2048 + * Thu Oct 05 2023 Remi Collet - 2:9.0.1984-2 - rebuild for new libsodium From 64dcac16598c11372383f58535336de41a2c64d7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 1 Nov 2023 13:36:46 +0100 Subject: [PATCH 218/324] - patchlevel 2081 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9d881096..d2ba9113 100644 --- a/.gitignore +++ b/.gitignore @@ -457,3 +457,4 @@ /vim-9.0-1968.tar.bz2 /vim-9.0-1984.tar.bz2 /vim-9.0-2048.tar.bz2 +/vim-9.0-2081.tar.bz2 diff --git a/sources b/sources index 0ebac0a8..658ba8a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-2048.tar.bz2) = 7885c6890acc4cca3a4c8d196014e2ad15ba094b86afc1995b9879fc16c50685d30b49ca021ee87d8fb49d396ab84199a26021e86084450f00005d8a5d1c53f0 +SHA512 (vim-9.0-2081.tar.bz2) = a78040aef587c353f4016b6a83f0f68ce224542247c692077bc7476d1d6bcd1a71c63e53a212dbf5216e37e19f69483829900c07a593e078f063b7f72a8f3a38 diff --git a/vim.spec b/vim.spec index 7377904c..545586d0 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 2048 +%define patchlevel 2081 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1033,6 +1033,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Wed Nov 01 2023 Zdenek Dohnal - 2:9.0.2081-1 +- patchlevel 2081 + * Wed Oct 18 2023 Zdenek Dohnal - 2:9.0.2048-1 - patchlevel 2048 From 7667b5b7defcda2567acba3f66cc002687bf005a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 16 Nov 2023 11:36:54 +0100 Subject: [PATCH 219/324] - patchlevel 2105 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d2ba9113..7c6834b7 100644 --- a/.gitignore +++ b/.gitignore @@ -458,3 +458,4 @@ /vim-9.0-1984.tar.bz2 /vim-9.0-2048.tar.bz2 /vim-9.0-2081.tar.bz2 +/vim-9.0-2105.tar.bz2 diff --git a/sources b/sources index 658ba8a4..d9fdab4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-2081.tar.bz2) = a78040aef587c353f4016b6a83f0f68ce224542247c692077bc7476d1d6bcd1a71c63e53a212dbf5216e37e19f69483829900c07a593e078f063b7f72a8f3a38 +SHA512 (vim-9.0-2105.tar.bz2) = 88b89a92fe3ade4d1157fb327064b06c46e29a6d2710fed081c98bcfda33317287cc8242840ab9d931b566a5b53a22b764efcd53c71c498d138a0417e96f3547 diff --git a/vim.spec b/vim.spec index 545586d0..fec3174c 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 2081 +%define patchlevel 2105 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1033,6 +1033,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Thu Nov 16 2023 Zdenek Dohnal - 2:9.0.2105-1 +- patchlevel 2105 + * Wed Nov 01 2023 Zdenek Dohnal - 2:9.0.2081-1 - patchlevel 2081 From 5f7b13674e7eff69d9e845dfea76c1e6a8bf1a86 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 16 Nov 2023 08:46:34 -0500 Subject: [PATCH 220/324] Enable perl in flatpak builds perl is now available for use in flatpak apps, but no assumptions should be made as to the location of a given Perl module. --- vim.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index fec3174c..c065a0e3 100644 --- a/vim.spec +++ b/vim.spec @@ -29,11 +29,10 @@ %define withvimspell 0 %define withhunspell 0 %define withlua 1 +%define withperl 1 %if 0%{?flatpak} -%define withperl 0 %define withruby 0 %else -%define withperl 1 %define withruby 1 %endif @@ -486,6 +485,7 @@ mv -f os_unix.h.save os_unix.h %endif %if "%{withperl}" == "1" --enable-perlinterp=dynamic \ + --with-xsubpp=$(which xsubpp) \ %else --disable-perlinterp \ %endif @@ -534,6 +534,7 @@ make clean %endif %if "%{withperl}" == "1" --enable-perlinterp=dynamic \ + --with-xsubpp=$(which xsubpp) \ %else --disable-perlinterp \ %endif From f2e1a4c7cbecd5219cda9c4815a4c9f340fd5c57 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 22 Nov 2023 12:23:55 +0100 Subject: [PATCH 221/324] - patchlevel 2120 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7c6834b7..6c4f2dc6 100644 --- a/.gitignore +++ b/.gitignore @@ -459,3 +459,4 @@ /vim-9.0-2048.tar.bz2 /vim-9.0-2081.tar.bz2 /vim-9.0-2105.tar.bz2 +/vim-9.0-2120.tar.bz2 diff --git a/sources b/sources index d9fdab4a..b6902ee7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-2105.tar.bz2) = 88b89a92fe3ade4d1157fb327064b06c46e29a6d2710fed081c98bcfda33317287cc8242840ab9d931b566a5b53a22b764efcd53c71c498d138a0417e96f3547 +SHA512 (vim-9.0-2120.tar.bz2) = d93d304461d9b6aeb112e26d5058f7564496a4fe040d78dcb88ee7a12d30cd2b93b4cbc832dffdb91f35189cca77912395d834ae6a4c27fdf5d29cd61e877dd6 diff --git a/vim.spec b/vim.spec index c065a0e3..f9a13f1c 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 2105 +%define patchlevel 2120 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1034,6 +1034,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Wed Nov 22 2023 Zdenek Dohnal - 2:9.0.2120-1 +- patchlevel 2120 + * Thu Nov 16 2023 Zdenek Dohnal - 2:9.0.2105-1 - patchlevel 2105 From 11d2dd0433776d80822b6641f2e4ec92c9abaaea Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 4 Dec 2023 09:47:59 +0100 Subject: [PATCH 222/324] Remove F37 --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 4e69889e..22c86924 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f39" "f38" "f37" ) -releases=( "fc40" "fc39" "fc38" "fc37" ) +branches=( "rawhide" "f39" "f38" ) +releases=( "fc40" "fc39" "fc38" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc40" "fc39" "\|fc38" "\|fc37" ) -bodhi_enabled=( "0" "1" "1" "1" ) +regexps=( "fc40" "fc39" "\|fc38" ) +bodhi_enabled=( "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From b81a3a67463f58aca4f1eb51512a3be48533e5fc Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 8 Dec 2023 09:14:55 +0100 Subject: [PATCH 223/324] - patchlevel 2153 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6c4f2dc6..769c8c78 100644 --- a/.gitignore +++ b/.gitignore @@ -460,3 +460,4 @@ /vim-9.0-2081.tar.bz2 /vim-9.0-2105.tar.bz2 /vim-9.0-2120.tar.bz2 +/vim-9.0-2153.tar.bz2 diff --git a/sources b/sources index b6902ee7..2137ac13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-2120.tar.bz2) = d93d304461d9b6aeb112e26d5058f7564496a4fe040d78dcb88ee7a12d30cd2b93b4cbc832dffdb91f35189cca77912395d834ae6a4c27fdf5d29cd61e877dd6 +SHA512 (vim-9.0-2153.tar.bz2) = b7403daf311414ddb9e1feb2e523870237076336e6986e38eafb0130745953ff0da5b985717a6d8ef1e18131abd0bb13983469cf484f595099059bb63c297ee6 diff --git a/vim.spec b/vim.spec index f9a13f1c..31939c24 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 2120 +%define patchlevel 2153 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1034,6 +1034,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Dec 08 2023 Zdenek Dohnal - 2:9.0.2153-1 +- patchlevel 2153 + * Wed Nov 22 2023 Zdenek Dohnal - 2:9.0.2120-1 - patchlevel 2120 From 5863537d72823092bb3a3caa393ebae0b3bc3e29 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 15 Dec 2023 09:18:51 +0100 Subject: [PATCH 224/324] - patchlevel 2167 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 769c8c78..05ae84ba 100644 --- a/.gitignore +++ b/.gitignore @@ -461,3 +461,4 @@ /vim-9.0-2105.tar.bz2 /vim-9.0-2120.tar.bz2 /vim-9.0-2153.tar.bz2 +/vim-9.0-2167.tar.bz2 diff --git a/sources b/sources index 2137ac13..50074331 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-2153.tar.bz2) = b7403daf311414ddb9e1feb2e523870237076336e6986e38eafb0130745953ff0da5b985717a6d8ef1e18131abd0bb13983469cf484f595099059bb63c297ee6 +SHA512 (vim-9.0-2167.tar.bz2) = 4df67ed86288cc91ab87f0aa0753af670941ef97026c40c27f2953e46d65779d6ab511627a0432afdaa1eb57b7330d01c0581edff70e402a87e951cba4b154c3 diff --git a/vim.spec b/vim.spec index 31939c24..7418090b 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 2153 +%define patchlevel 2167 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1034,6 +1034,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Dec 15 2023 Zdenek Dohnal - 2:9.0.2167-1 +- patchlevel 2167 + * Fri Dec 08 2023 Zdenek Dohnal - 2:9.0.2153-1 - patchlevel 2153 From 174d14ee43a98761d16fef325c981a1a3d520bc0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 2 Jan 2024 11:18:43 +0100 Subject: [PATCH 225/324] - patchlevel 2190 Added Hungarian translation --- .gitignore | 1 + sources | 2 +- vim.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 05ae84ba..9bbfb305 100644 --- a/.gitignore +++ b/.gitignore @@ -462,3 +462,4 @@ /vim-9.0-2120.tar.bz2 /vim-9.0-2153.tar.bz2 /vim-9.0-2167.tar.bz2 +/vim-9.0-2190.tar.bz2 diff --git a/sources b/sources index 50074331..b5421ecd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-2167.tar.bz2) = 4df67ed86288cc91ab87f0aa0753af670941ef97026c40c27f2953e46d65779d6ab511627a0432afdaa1eb57b7330d01c0581edff70e402a87e951cba4b154c3 +SHA512 (vim-9.0-2190.tar.bz2) = df0bad7293886db14aa4af551d80d6ad97b3a365895106720fd75f2b2908b9497a6b182ee448f01adcb495538b93a8afb72b5564a8fd19edfbbf354dcdd0ae84 diff --git a/vim.spec b/vim.spec index 7418090b..a2a75f34 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 2167 +%define patchlevel 2190 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -833,6 +833,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %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(it) %{_datadir}/%{name}/%{vimdir}/lang/it %lang(ja) %{_datadir}/%{name}/%{vimdir}/lang/ja %lang(ja.euc-jp) %{_datadir}/%{name}/%{vimdir}/lang/ja.euc-jp @@ -1034,6 +1035,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Jan 02 2024 Zdenek Dohnal - 2:9.0.2190-1 +- patchlevel 2190 + * Fri Dec 15 2023 Zdenek Dohnal - 2:9.0.2167-1 - patchlevel 2167 From 8b3099979b07ed51d00fbcf71c91c2083fa6dfe6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 8 Jan 2024 11:07:34 +0100 Subject: [PATCH 226/324] - patchlevel 16 --- .gitignore | 1 + sources | 2 +- vim.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9bbfb305..367876a1 100644 --- a/.gitignore +++ b/.gitignore @@ -463,3 +463,4 @@ /vim-9.0-2153.tar.bz2 /vim-9.0-2167.tar.bz2 /vim-9.0-2190.tar.bz2 +/vim-9.1-016.tar.bz2 diff --git a/sources b/sources index b5421ecd..4270cb51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-2190.tar.bz2) = df0bad7293886db14aa4af551d80d6ad97b3a365895106720fd75f2b2908b9497a6b182ee448f01adcb495538b93a8afb72b5564a8fd19edfbbf354dcdd0ae84 +SHA512 (vim-9.1-016.tar.bz2) = 34e79c083fb88ff0a8773679cb23a035c19fb732bac0cd6fa9f23a11073301715ea6d5a6948a8ee3d0c612a8853537d00de45a1c11c39ccb3f536201cf889b13 diff --git a/vim.spec b/vim.spec index a2a75f34..9c831015 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 2190 +%define patchlevel 016 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -42,8 +42,8 @@ # https://github.com/vim/vim/pull/3507 %define _fortify_level 1 -%define baseversion 9.0 -%define vimdir vim90 +%define baseversion 9.1 +%define vimdir vim91 Summary: The VIM editor URL: http://www.vim.org/ @@ -1035,6 +1035,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon Jan 08 2024 Zdenek Dohnal - 2:9.1.016-1 +- patchlevel 016 + * Tue Jan 02 2024 Zdenek Dohnal - 2:9.0.2190-1 - patchlevel 2190 From e07dd4f3909c197c759dde86593932da18958b32 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 16 Jan 2024 15:57:25 +0100 Subject: [PATCH 227/324] - patchlevel 31 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 367876a1..ea28e7ef 100644 --- a/.gitignore +++ b/.gitignore @@ -464,3 +464,4 @@ /vim-9.0-2167.tar.bz2 /vim-9.0-2190.tar.bz2 /vim-9.1-016.tar.bz2 +/vim-9.1-031.tar.bz2 diff --git a/sources b/sources index 4270cb51..d511c96f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-016.tar.bz2) = 34e79c083fb88ff0a8773679cb23a035c19fb732bac0cd6fa9f23a11073301715ea6d5a6948a8ee3d0c612a8853537d00de45a1c11c39ccb3f536201cf889b13 +SHA512 (vim-9.1-031.tar.bz2) = 64b5524f11bed7c3095d764e0e1687a663e69b049d2231124056eaa1c2491f3aae267c9928ff0100c278d2fb769c934d5b12c91f2137ed8e1a92f742d88aeacd diff --git a/vim.spec b/vim.spec index 9c831015..235240eb 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 016 +%define patchlevel 031 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1035,6 +1035,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Jan 16 2024 Zdenek Dohnal - 2:9.1.031-1 +- patchlevel 031 + * Mon Jan 08 2024 Zdenek Dohnal - 2:9.1.016-1 - patchlevel 016 From a7bbd42bc1b52d312953464b36c7576197b98bf4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:45:20 +0000 Subject: [PATCH 228/324] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 235240eb..bcf9bb57 100644 --- a/vim.spec +++ b/vim.spec @@ -49,7 +49,7 @@ Summary: The VIM editor URL: http://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 @@ -1035,6 +1035,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2:9.1.031-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jan 16 2024 Zdenek Dohnal - 2:9.1.031-1 - patchlevel 031 From 3dbc59bdc83ee1335a5c70efaa82609b18b1d569 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 5 Feb 2024 11:28:06 +0100 Subject: [PATCH 229/324] - patchlevel 76 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ea28e7ef..460e347b 100644 --- a/.gitignore +++ b/.gitignore @@ -465,3 +465,4 @@ /vim-9.0-2190.tar.bz2 /vim-9.1-016.tar.bz2 /vim-9.1-031.tar.bz2 +/vim-9.1-076.tar.bz2 diff --git a/sources b/sources index d511c96f..cecb87e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-031.tar.bz2) = 64b5524f11bed7c3095d764e0e1687a663e69b049d2231124056eaa1c2491f3aae267c9928ff0100c278d2fb769c934d5b12c91f2137ed8e1a92f742d88aeacd +SHA512 (vim-9.1-076.tar.bz2) = 1a2f21592ea560796bd209dbc12b79cc6cccb9e26d8718cdcdec4e38f463b70245f8592a549621a0af5ff34447936fd3f8d7f86c984566d3163e348403f44309 diff --git a/vim.spec b/vim.spec index bcf9bb57..e86ea9c4 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 031 +%define patchlevel 076 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -49,7 +49,7 @@ Summary: The VIM editor URL: http://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 @@ -1035,6 +1035,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon Feb 05 2024 Zdenek Dohnal - 2:9.1.076-1 +- patchlevel 076 + * Sat Jan 27 2024 Fedora Release Engineering - 2:9.1.031-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 227278cbe9d21efb09b25ed4d6a38bfb8aea46da Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 5 Feb 2024 14:23:55 +0100 Subject: [PATCH 230/324] enable building without GPM support - build with GPM in Fedora --- vim.spec | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index e86ea9c4..adf6a9c5 100644 --- a/vim.spec +++ b/vim.spec @@ -2,9 +2,11 @@ %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 @@ -49,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -118,8 +120,10 @@ BuildRequires: gettext # formats during compilation. BuildRequires: glibc-gconv-extra +%if %{with gpm} # for mouse support in console BuildRequires: gpm-devel +%endif # for setting ACL on created files BuildRequires: libacl-devel @@ -473,6 +477,11 @@ mv -f os_unix.h.save os_unix.h --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 @@ -522,6 +531,11 @@ make clean --with-tlib=ncurses \ --enable-fips-warning \ --with-compiledby="" \ +%if %{with gpm} + --enable-gpm \ +%else + --disable-gpm \ +%endif %if "%{withnetbeans}" == "1" --enable-netbeans \ %else @@ -1035,6 +1049,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon Feb 05 2024 Zdenek Dohnal - 2:9.1.076-2 +- enable building without GPM support - build with GPM in Fedora + * Mon Feb 05 2024 Zdenek Dohnal - 2:9.1.076-1 - patchlevel 076 From 1d02e6e58277162d524fd36c88eb8f264081d26c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 5 Feb 2024 15:46:32 +0100 Subject: [PATCH 231/324] 2262371 - gvim: symbol lookup error: gvim: undefined symbol: g_once_init_enter_pointer --- vim.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vim.spec b/vim.spec index adf6a9c5..e62dc0ed 100644 --- a/vim.spec +++ b/vim.spec @@ -309,6 +309,14 @@ Provides: gvim 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) @@ -1051,6 +1059,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog * Mon Feb 05 2024 Zdenek Dohnal - 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 - 2:9.1.076-1 - patchlevel 076 From ebe24336803ef4fb19746b9c7e12315125a4377c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 9 Feb 2024 06:34:49 +0100 Subject: [PATCH 232/324] - patchlevel 83 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 460e347b..1d414fdb 100644 --- a/.gitignore +++ b/.gitignore @@ -466,3 +466,4 @@ /vim-9.1-016.tar.bz2 /vim-9.1-031.tar.bz2 /vim-9.1-076.tar.bz2 +/vim-9.1-083.tar.bz2 diff --git a/sources b/sources index cecb87e4..29f03864 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-076.tar.bz2) = 1a2f21592ea560796bd209dbc12b79cc6cccb9e26d8718cdcdec4e38f463b70245f8592a549621a0af5ff34447936fd3f8d7f86c984566d3163e348403f44309 +SHA512 (vim-9.1-083.tar.bz2) = bf76375164fb930f91dc3bd91ca7d5cb1d051ae59697f8a3a5f2713530b8198c669c1763e76e6c240ba0b20ad935c7ad7deb60d1fdfcb60439c17b0e58d9ebd1 diff --git a/vim.spec b/vim.spec index e62dc0ed..96d759ca 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 076 +%define patchlevel 083 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Feb 09 2024 Zdenek Dohnal - 2:9.1.083-1 +- patchlevel 083 + * Mon Feb 05 2024 Zdenek Dohnal - 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 From f1498c0c7ca2f24c0d5200961b0616d99147a33a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 16 Feb 2024 07:41:45 +0100 Subject: [PATCH 233/324] F40 got branched, but not bodhi enabled yet --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 22c86924..db9662ae 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f39" "f38" ) -releases=( "fc40" "fc39" "fc38" ) +branches=( "rawhide" "f40" "f39" "f38" ) +releases=( "fc41" "fc40" "fc39" "fc38" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc40" "fc39" "\|fc38" ) -bodhi_enabled=( "0" "1" "1" ) +regexps=( "fc41" "fc40" "fc39" "\|fc38" ) +bodhi_enabled=( "0" "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From cbd11ce35d815cad1db6bb386591837e82a801d7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 16 Feb 2024 07:43:21 +0100 Subject: [PATCH 234/324] - patchlevel 113 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1d414fdb..bc2493ba 100644 --- a/.gitignore +++ b/.gitignore @@ -467,3 +467,4 @@ /vim-9.1-031.tar.bz2 /vim-9.1-076.tar.bz2 /vim-9.1-083.tar.bz2 +/vim-9.1-113.tar.bz2 diff --git a/sources b/sources index 29f03864..9f5561b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-083.tar.bz2) = bf76375164fb930f91dc3bd91ca7d5cb1d051ae59697f8a3a5f2713530b8198c669c1763e76e6c240ba0b20ad935c7ad7deb60d1fdfcb60439c17b0e58d9ebd1 +SHA512 (vim-9.1-113.tar.bz2) = 9cb62b00f996dc3031c7badf913550fef8607196e9698fb17d03035291b4d031b9f4a7d971643e4c623abb2c5336d80b060acfd6a73bf3376da16db1c6740ea3 diff --git a/vim.spec b/vim.spec index 96d759ca..b1820d49 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 083 +%define patchlevel 113 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Feb 16 2024 Zdenek Dohnal - 2:9.1.113-1 +- patchlevel 113 + * Fri Feb 09 2024 Zdenek Dohnal - 2:9.1.083-1 - patchlevel 083 From baf6873d991ca312afdfca1c06d1135da4923844 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 19 Feb 2024 14:06:13 +0100 Subject: [PATCH 235/324] Add Apache-2.0 WITH Swift-exception into licenses --- vim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index b1820d49..f99b1fbf 100644 --- a/vim.spec +++ b/vim.spec @@ -61,7 +61,7 @@ Epoch: 2 # 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 +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 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: virc Source2: vimrc From 7f016db19d31290c84a76f4b3cc47601f5df2674 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 1 Mar 2024 06:58:52 +0100 Subject: [PATCH 236/324] F40 enabled in bodhi --- vim-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim-update.sh b/vim-update.sh index db9662ae..7676659d 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -6,7 +6,7 @@ releases=( "fc41" "fc40" "fc39" "fc38" ) # the first bodhi enabled release is the last without \| - all # others need to have \| regexps=( "fc41" "fc40" "fc39" "\|fc38" ) -bodhi_enabled=( "0" "0" "1" "1" ) +bodhi_enabled=( "0" "1" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From 7e6e0d936e0304ce97506f670aafeb025902003f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 8 Mar 2024 07:19:17 +0100 Subject: [PATCH 237/324] - patchlevel 158 --- .gitignore | 1 + sources | 2 +- vim-7.4-specsyntax.patch | 16 ++++++++-------- vim.spec | 7 +++++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index bc2493ba..33e9e125 100644 --- a/.gitignore +++ b/.gitignore @@ -468,3 +468,4 @@ /vim-9.1-076.tar.bz2 /vim-9.1-083.tar.bz2 /vim-9.1-113.tar.bz2 +/vim-9.1-158.tar.bz2 diff --git a/sources b/sources index 9f5561b1..31087b34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-113.tar.bz2) = 9cb62b00f996dc3031c7badf913550fef8607196e9698fb17d03035291b4d031b9f4a7d971643e4c623abb2c5336d80b060acfd6a73bf3376da16db1c6740ea3 +SHA512 (vim-9.1-158.tar.bz2) = c8c64f185fb2a9bd8448afbe6fa4cafa741dd2078b644fd1d5afed7a2ccd6a985b0d9aee7d495de8870ef06239170b39003da4c690054a6004224e432170d888 diff --git a/vim-7.4-specsyntax.patch b/vim-7.4-specsyntax.patch index 5d794cc7..71720a46 100644 --- a/vim-7.4-specsyntax.patch +++ b/vim-7.4-specsyntax.patch @@ -1,7 +1,7 @@ -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 +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 syn match specManpageFile '[a-zA-Z]\.1' "Day, Month and most used license acronyms @@ -10,7 +10,7 @@ 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 -@@ -61,9 +61,9 @@ syn cluster specListedFiles contains=spe +@@ -58,9 +58,9 @@ syn cluster specListedFiles contains=spe "specCommands syn match specConfigure contained '\./configure' @@ -22,12 +22,12 @@ diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial "frequently used rpm env vars -@@ -105,7 +105,7 @@ syn case ignore +@@ -102,7 +102,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\|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 +-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\|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.spec b/vim.spec index f99b1fbf..4e134a6c 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 113 +%define patchlevel 158 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -403,7 +403,7 @@ sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3005} # fix rogue dependencies from sample code chmod -x runtime/tools/mve.awk %patch -P 2000 -p1 -b .fixkeys -%patch -P 2001 -p1 +%patch -P 2001 -p1 -b .spec-syntax %if %{withhunspell} %patch -P 2002 -p1 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Mar 08 2024 Zdenek Dohnal - 2:9.1.158-1 +- patchlevel 158 + * Fri Feb 16 2024 Zdenek Dohnal - 2:9.1.113-1 - patchlevel 113 From 51295901ea0cc58081d33077a20a547eb61bbe1f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 15 Mar 2024 06:33:22 +0100 Subject: [PATCH 238/324] - patchlevel 181 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 33e9e125..af2bd620 100644 --- a/.gitignore +++ b/.gitignore @@ -469,3 +469,4 @@ /vim-9.1-083.tar.bz2 /vim-9.1-113.tar.bz2 /vim-9.1-158.tar.bz2 +/vim-9.1-181.tar.bz2 diff --git a/sources b/sources index 31087b34..f13fc4de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-158.tar.bz2) = c8c64f185fb2a9bd8448afbe6fa4cafa741dd2078b644fd1d5afed7a2ccd6a985b0d9aee7d495de8870ef06239170b39003da4c690054a6004224e432170d888 +SHA512 (vim-9.1-181.tar.bz2) = b6731db5fc78a45c397f2c7022f49f911680aaf768979940411f0e8ee892371148f17febc61512aafbf5aad65f31ebf99e016aca82df194980736e6cabfa1889 diff --git a/vim.spec b/vim.spec index 4e134a6c..55b92768 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 158 +%define patchlevel 181 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Mar 15 2024 Zdenek Dohnal - 2:9.1.181-1 +- patchlevel 181 + * Fri Mar 08 2024 Zdenek Dohnal - 2:9.1.158-1 - patchlevel 158 From 79458eed291016cff09375bd790ce3d8d147d701 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 2 Apr 2024 13:56:48 +0200 Subject: [PATCH 239/324] - patchlevel 252 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index af2bd620..c536996f 100644 --- a/.gitignore +++ b/.gitignore @@ -470,3 +470,4 @@ /vim-9.1-113.tar.bz2 /vim-9.1-158.tar.bz2 /vim-9.1-181.tar.bz2 +/vim-9.1-252.tar.bz2 diff --git a/sources b/sources index f13fc4de..b419831a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-181.tar.bz2) = b6731db5fc78a45c397f2c7022f49f911680aaf768979940411f0e8ee892371148f17febc61512aafbf5aad65f31ebf99e016aca82df194980736e6cabfa1889 +SHA512 (vim-9.1-252.tar.bz2) = a27248ee1c3f2e6e166d7ba961f1aae0826423fe793196ad4ae67f9b82cbfe9ca5f3bb3b13dd93e473720ad3d060f6187081602f5ad4f547141671813e8c458d diff --git a/vim.spec b/vim.spec index 55b92768..d5cf6494 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 181 +%define patchlevel 252 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Apr 02 2024 Zdenek Dohnal - 2:9.1.252-1 +- patchlevel 252 + * Fri Mar 15 2024 Zdenek Dohnal - 2:9.1.181-1 - patchlevel 181 From 1d1b573e72b2ccd58ec0ecbe5f99c7ff1ebfd36e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 5 Apr 2024 07:52:35 +0200 Subject: [PATCH 240/324] - patchlevel 264 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c536996f..ac470366 100644 --- a/.gitignore +++ b/.gitignore @@ -471,3 +471,4 @@ /vim-9.1-158.tar.bz2 /vim-9.1-181.tar.bz2 /vim-9.1-252.tar.bz2 +/vim-9.1-264.tar.bz2 diff --git a/sources b/sources index b419831a..9d44fd0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-252.tar.bz2) = a27248ee1c3f2e6e166d7ba961f1aae0826423fe793196ad4ae67f9b82cbfe9ca5f3bb3b13dd93e473720ad3d060f6187081602f5ad4f547141671813e8c458d +SHA512 (vim-9.1-264.tar.bz2) = e9d6e492b79b015c355771ab6beb9da7818ee3fff31f1a2c2078360caeb7205069e5978c1d03958eed13012a9b223e2e2925e7598f2f0e4877499dcb6041af2c diff --git a/vim.spec b/vim.spec index d5cf6494..73fecbca 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 252 +%define patchlevel 264 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Apr 05 2024 Zdenek Dohnal - 2:9.1.264-1 +- patchlevel 264 + * Tue Apr 02 2024 Zdenek Dohnal - 2:9.1.252-1 - patchlevel 252 From 305932eca006eef0714a16101d8ef8d9992d0891 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 12 Apr 2024 09:49:23 +0200 Subject: [PATCH 241/324] - patchlevel 309 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ac470366..75af8613 100644 --- a/.gitignore +++ b/.gitignore @@ -472,3 +472,4 @@ /vim-9.1-181.tar.bz2 /vim-9.1-252.tar.bz2 /vim-9.1-264.tar.bz2 +/vim-9.1-309.tar.bz2 diff --git a/sources b/sources index 9d44fd0e..78321d80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-264.tar.bz2) = e9d6e492b79b015c355771ab6beb9da7818ee3fff31f1a2c2078360caeb7205069e5978c1d03958eed13012a9b223e2e2925e7598f2f0e4877499dcb6041af2c +SHA512 (vim-9.1-309.tar.bz2) = eb4e9e771eb8ad923339ea6458af384467e9ccf414825bad89eb11529b747f6c43ad4f5295372cd0864fb2e551df6987fa3897d41959af3f3cbb71eb67d30079 diff --git a/vim.spec b/vim.spec index 73fecbca..3f0c732e 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 264 +%define patchlevel 309 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Apr 12 2024 Zdenek Dohnal - 2:9.1.309-1 +- patchlevel 309 + * Fri Apr 05 2024 Zdenek Dohnal - 2:9.1.264-1 - patchlevel 264 From 0f86079996ad757d11d53b7c0f2b5f8121f11738 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 15 Apr 2024 15:11:05 +0200 Subject: [PATCH 242/324] Update gating.yaml --- gating.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/gating.yaml b/gating.yaml index daad873f..3c35f7d3 100644 --- a/gating.yaml +++ b/gating.yaml @@ -21,8 +21,5 @@ product_versions: - rhel-* decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional} - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional} From 93d0d9afe8fc5a6720ced232c9ea155183232565 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 19 Apr 2024 11:22:10 +0200 Subject: [PATCH 243/324] - patchlevel 354 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 75af8613..bde5e9b3 100644 --- a/.gitignore +++ b/.gitignore @@ -473,3 +473,4 @@ /vim-9.1-252.tar.bz2 /vim-9.1-264.tar.bz2 /vim-9.1-309.tar.bz2 +/vim-9.1-354.tar.bz2 diff --git a/sources b/sources index 78321d80..8a71371a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-309.tar.bz2) = eb4e9e771eb8ad923339ea6458af384467e9ccf414825bad89eb11529b747f6c43ad4f5295372cd0864fb2e551df6987fa3897d41959af3f3cbb71eb67d30079 +SHA512 (vim-9.1-354.tar.bz2) = 6cf3b94915716816b070cc8efe357dc9148498709928f1c45d7fb81217ca675d3f8cd9dcbd30e8488c9b48c6f8c02690bdb30682af0a2d8be73618abb1ad54d3 diff --git a/vim.spec b/vim.spec index 3f0c732e..52ae9292 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 309 +%define patchlevel 354 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Apr 19 2024 Zdenek Dohnal - 2:9.1.354-1 +- patchlevel 354 + * Fri Apr 12 2024 Zdenek Dohnal - 2:9.1.309-1 - patchlevel 309 From d2cd318e43fd55aa58e72ac3281a45df42c3615b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 6 May 2024 12:59:30 +0200 Subject: [PATCH 244/324] - patchlevel 393 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bde5e9b3..e85d6609 100644 --- a/.gitignore +++ b/.gitignore @@ -474,3 +474,4 @@ /vim-9.1-264.tar.bz2 /vim-9.1-309.tar.bz2 /vim-9.1-354.tar.bz2 +/vim-9.1-393.tar.bz2 diff --git a/sources b/sources index 8a71371a..27ea3e6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-354.tar.bz2) = 6cf3b94915716816b070cc8efe357dc9148498709928f1c45d7fb81217ca675d3f8cd9dcbd30e8488c9b48c6f8c02690bdb30682af0a2d8be73618abb1ad54d3 +SHA512 (vim-9.1-393.tar.bz2) = 9c70bb8f2b07b3ccb489653556b928f3eefeea1cd2be51eb0c5438f3e7382700d395462f649402fd8e38f37175dbf47f1b926d8e26adae70cb84487c4e572a97 diff --git a/vim.spec b/vim.spec index 52ae9292..c5783afb 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 354 +%define patchlevel 393 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon May 06 2024 Zdenek Dohnal - 2:9.1.393-1 +- patchlevel 393 + * Fri Apr 19 2024 Zdenek Dohnal - 2:9.1.354-1 - patchlevel 354 From d46b35c84dfc4c7bf4552ef69504bd773279172e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 15 May 2024 09:46:29 +0200 Subject: [PATCH 245/324] vim-update.sh: Disable soon-to-be-EOL F38 --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 7676659d..d6e328db 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f40" "f39" "f38" ) -releases=( "fc41" "fc40" "fc39" "fc38" ) +branches=( "rawhide" "f40" "f39" ) +releases=( "fc41" "fc40" "fc39" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc41" "fc40" "fc39" "\|fc38" ) -bodhi_enabled=( "0" "1" "1" "1" ) +regexps=( "fc41" "fc40" "\|fc39" ) +bodhi_enabled=( "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From e7742698d18ad55ed3f5e4042c41bb48eddd69ac Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 23 May 2024 15:43:11 +0200 Subject: [PATCH 246/324] plans: fix url --- plans/tier1-internal.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf index ebe4da6a..1e8030df 100644 --- a/plans/tier1-internal.fmf +++ b/plans/tier1-internal.fmf @@ -3,7 +3,7 @@ discover: - name: rhel how: fmf filter: 'tier: 1' - url: git://pkgs.devel.redhat.com/tests/vim + url: https://pkgs.devel.redhat.com/git/tests/vim execute: how: tmt adjust: From b1105c832652a45c18cc6bcc1292fb7d51d98124 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 31 May 2024 06:14:09 +0200 Subject: [PATCH 247/324] - patchlevel 452 --- .gitignore | 1 + sources | 2 +- vim-7.4-globalsyntax.patch | 13 ++++++------- vim.spec | 11 +++++++---- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index e85d6609..0d1c0300 100644 --- a/.gitignore +++ b/.gitignore @@ -475,3 +475,4 @@ /vim-9.1-309.tar.bz2 /vim-9.1-354.tar.bz2 /vim-9.1-393.tar.bz2 +/vim-9.1-452.tar.bz2 diff --git a/sources b/sources index 27ea3e6c..9fc5518b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-393.tar.bz2) = 9c70bb8f2b07b3ccb489653556b928f3eefeea1cd2be51eb0c5438f3e7382700d395462f649402fd8e38f37175dbf47f1b926d8e26adae70cb84487c4e572a97 +SHA512 (vim-9.1-452.tar.bz2) = 72568fb9f60f7b8b94dd2c00e91c6a9b6b03a8846032e831cdb0bb23ef736c27c72f5dd617734b3ad6c4af19cd9b8b49fd89cad7ee36fcb84dbdfcec63e7188d diff --git a/vim-7.4-globalsyntax.patch b/vim-7.4-globalsyntax.patch index 4503f2d0..81efb8c1 100644 --- a/vim-7.4-globalsyntax.patch +++ b/vim-7.4-globalsyntax.patch @@ -1,13 +1,12 @@ -diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim -index 1a5a108..b709d20 100644 ---- a/runtime/syntax/spec.vim -+++ b/runtime/syntax/spec.vim -@@ -111,7 +111,7 @@ syn region specDescriptionArea matchgroup=specSection start='^%description' end= +diff -up vim91/runtime/syntax/spec.vim.globalsyntax vim91/runtime/syntax/spec.vim +--- vim91/runtime/syntax/spec.vim.globalsyntax 2024-05-31 07:07:51.928490680 +0200 ++++ vim91/runtime/syntax/spec.vim 2024-05-31 07:08:26.049624156 +0200 +@@ -111,7 +111,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\|check\|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\|clean\|check\|pre\|postun\|preun\|post\|posttrans\)\>' 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\|generate_buildrequires\|conf\|build\|install\|clean\|check\|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\|generate_buildrequires\|conf\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\)\>' 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 "%% 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.spec b/vim.spec index c5783afb..2af586a2 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 393 +%define patchlevel 452 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -416,9 +416,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %{__tar} xjf %{SOURCE100} %endif -%patch -P 3000 -p1 -%patch -P 3001 -p1 -%patch -P 3002 -p1 +%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 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri May 31 2024 Zdenek Dohnal - 2:9.1.452-1 +- patchlevel 452 + * Mon May 06 2024 Zdenek Dohnal - 2:9.1.393-1 - patchlevel 393 From 3583633bff0da9663483e57cdf79a0404593a8f5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 8 Jul 2024 10:29:12 +0200 Subject: [PATCH 248/324] - patchlevel 544 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0d1c0300..a4af1b3c 100644 --- a/.gitignore +++ b/.gitignore @@ -476,3 +476,4 @@ /vim-9.1-354.tar.bz2 /vim-9.1-393.tar.bz2 /vim-9.1-452.tar.bz2 +/vim-9.1-544.tar.bz2 diff --git a/sources b/sources index 9fc5518b..cf9b995b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-452.tar.bz2) = 72568fb9f60f7b8b94dd2c00e91c6a9b6b03a8846032e831cdb0bb23ef736c27c72f5dd617734b3ad6c4af19cd9b8b49fd89cad7ee36fcb84dbdfcec63e7188d +SHA512 (vim-9.1-544.tar.bz2) = 65a2a9fda4152fea8d61974544522e2568767db6f0e631d8c7e479a470a389c290a6a6518de18546c7d7c38e69270e681b528cf4cdabd24b38f79d0625c4358e diff --git a/vim.spec b/vim.spec index 2af586a2..3287ba42 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 452 +%define patchlevel 544 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon Jul 08 2024 Zdenek Dohnal - 2:9.1.544-1 +- patchlevel 544 + * Fri May 31 2024 Zdenek Dohnal - 2:9.1.452-1 - patchlevel 452 From bd864ede9b08693c8cc3f2443c98e08edf1f11a8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 12 Jul 2024 10:35:12 +0200 Subject: [PATCH 249/324] fix upstream-scripttests in CI - new test needs our downstream 'set mouse=a' to pass --- vim-8.0-copy-paste.patch | 32 ++++++++++++++++++++++---------- vim.spec | 5 ++++- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch index bd5bbd44..a1487d12 100644 --- a/vim-8.0-copy-paste.patch +++ b/vim-8.0-copy-paste.patch @@ -1,8 +1,8 @@ diff --git a/runtime/defaults.vim b/runtime/defaults.vim -index f1d5cd1..b08de8e 100644 +index ff8ce8e..2ed8542 100644 --- a/runtime/defaults.vim +++ b/runtime/defaults.vim -@@ -74,18 +74,6 @@ sunmap Q +@@ -75,18 +75,6 @@ sunmap Q " Revert with ":iunmap ". inoremap u @@ -22,7 +22,7 @@ index f1d5cd1..b08de8e 100644 if 1 diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim -index ed0c6c1..90c8c40 100644 +index 80d5831..713f580 100644 --- a/src/testdir/test_balloon.vim +++ b/src/testdir/test_balloon.vim @@ -9,6 +9,7 @@ source screendump.vim @@ -33,11 +33,23 @@ index ed0c6c1..90c8c40 100644 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 --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim +index d930133..0c74032 100644 +--- a/src/testdir/test_popup.vim ++++ b/src/testdir/test_popup.vim +@@ -945,6 +945,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 --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim -index b91689e..c6b70d1 100644 +index 64aa654..1a1261c 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim -@@ -553,6 +553,7 @@ func Test_popup_drag() +@@ -558,6 +558,7 @@ func Test_popup_drag() " create a popup that covers the command line let lines =<< trim END call setline(1, range(1, 20)) @@ -45,7 +57,7 @@ index b91689e..c6b70d1 100644 split vsplit $wincmd w -@@ -621,6 +622,7 @@ func Test_popup_drag_minwidth() +@@ -625,6 +626,7 @@ func Test_popup_drag_minwidth() " create a popup that does not fit let lines =<< trim END @@ -53,7 +65,7 @@ index b91689e..c6b70d1 100644 call range(40) \ ->map({_,i -> string(i)}) \ ->popup_create({ -@@ -669,6 +671,7 @@ func Test_popup_drag_termwin() +@@ -672,6 +674,7 @@ func Test_popup_drag_termwin() let lines =<< trim END set foldmethod=marker call setline(1, range(100)) @@ -61,7 +73,7 @@ index b91689e..c6b70d1 100644 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() +@@ -724,6 +727,7 @@ func Test_popup_close_with_mouse() let lines =<< trim END call setline(1, range(1, 20)) @@ -69,7 +81,7 @@ index b91689e..c6b70d1 100644 " With border, can click on X let winid = popup_create('foobar', #{ \ close: 'button', -@@ -1557,6 +1561,7 @@ func Test_popup_beval() +@@ -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') @@ -77,7 +89,7 @@ index b91689e..c6b70d1 100644 set balloonevalterm set balloonexpr=BalloonExpr() set balloondelay=100 -@@ -2262,6 +2267,7 @@ func Test_popup_scrollbar() +@@ -2255,6 +2260,7 @@ func Test_popup_scrollbar() let lines =<< trim END call setline(1, range(1, 20)) diff --git a/vim.spec b/vim.spec index 3287ba42..cf491b02 100644 --- a/vim.spec +++ b/vim.spec @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Jul 12 2024 Zdenek Dohnal - 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 - 2:9.1.544-1 - patchlevel 544 From 4dfca63620f25627962c7ad7ad91874d9aa1a364 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 12 Jul 2024 10:36:38 +0200 Subject: [PATCH 250/324] - patchlevel 571 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a4af1b3c..836665fa 100644 --- a/.gitignore +++ b/.gitignore @@ -477,3 +477,4 @@ /vim-9.1-393.tar.bz2 /vim-9.1-452.tar.bz2 /vim-9.1-544.tar.bz2 +/vim-9.1-571.tar.bz2 diff --git a/sources b/sources index cf9b995b..83dfb061 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-544.tar.bz2) = 65a2a9fda4152fea8d61974544522e2568767db6f0e631d8c7e479a470a389c290a6a6518de18546c7d7c38e69270e681b528cf4cdabd24b38f79d0625c4358e +SHA512 (vim-9.1-571.tar.bz2) = c2664b05760ae65f697b3db1b747b8d3a61756b108c8402332aba143e4e067cbe2e7db72e3285e8d4b61176d86a302210e1967e92852df0ed7475f32804bd879 diff --git a/vim.spec b/vim.spec index cf491b02..bccfd0c1 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 544 +%define patchlevel 571 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Jul 12 2024 Zdenek Dohnal - 2:9.1.571-1 +- patchlevel 571 + * Fri Jul 12 2024 Zdenek Dohnal - 2:9.1.544-2 - fix upstream-scripttests in CI - new test needs our downstream 'set mouse=a' to pass From 6cc814d79799684fdbc9c8e853bf25b8f7c0679e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:46:13 +0000 Subject: [PATCH 251/324] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index bccfd0c1..0d63efd5 100644 --- a/vim.spec +++ b/vim.spec @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -1057,6 +1057,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2:9.1.571-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jul 12 2024 Zdenek Dohnal - 2:9.1.571-1 - patchlevel 571 From 3c4227cd7c268b9dbfa9986c28b4634d2daf5f00 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 22 Jul 2024 17:57:06 +0200 Subject: [PATCH 252/324] Use wildcard in .gitignore --- .gitignore | 481 +---------------------------------------------------- 1 file changed, 1 insertion(+), 480 deletions(-) diff --git a/.gitignore b/.gitignore index 836665fa..243a54fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,480 +1 @@ -/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 -/vim-8.1-1413.tar.bz2 -/vim-8.1-1471.tar.bz2 -/vim-8.1-1517.tar.bz2 -/vim-8.1-1561.tar.bz2 -/vim-8.1-1602.tar.bz2 -/vim-8.1-1661.tar.bz2 -/vim-8.1-1713.tar.bz2 -/vim-8.1-1749.tar.bz2 -/vim-8.1-1790.tar.bz2 -/vim-8.1-1890.tar.bz2 -/vim-8.1-1912.tar.bz2 -/vim-8.1-1991.tar.bz2 -/vim-8.1-2019.tar.bz2 -/vim-8.1-2056.tar.bz2 -/vim-8.1-2102.tar.bz2 -/vim-8.1-2120.tar.bz2 -/vim-8.1-2168.tar.bz2 -/vim-8.1-2197.tar.bz2 -/vim-8.1-2198.tar.bz2 -/vim-8.1-2234.tar.bz2 -/vim-8.1-2267.tar.bz2 -/vim-8.1-2352.tar.bz2 -/vim-8.1-2424.tar.bz2 -/vim-8.2-012.tar.bz2 -/vim-8.2-019.tar.bz2 -/vim-8.2-076.tar.bz2 -/vim-8.2-109.tar.bz2 -/vim-8.2-158.tar.bz2 -/vim-8.2-236.tar.bz2 -/vim-8.2-348.tar.bz2 -/vim-8.2-356.tar.bz2 -/vim-8.2-357.tar.bz2 -/vim-8.2-390.tar.bz2 -/vim-8.2-444.tar.bz2 -/vim-8.2-448.tar.bz2 -/vim-8.2-480.tar.bz2 -/vim-8.2-520.tar.bz2 -/vim-8.2-525.tar.bz2 -/vim-8.2-534.tar.bz2 -/vim-8.2-587.tar.bz2 -/vim-8.2-613.tar.bz2 -/vim-8.2-628.tar.bz2 -/vim-8.2-694.tar.bz2 -/vim-8.2-735.tar.bz2 -/vim-8.2-752.tar.bz2 -/vim-8.2-789.tar.bz2 -/vim-8.2-806.tar.bz2 -/vim-8.2-834.tar.bz2 -/vim-8.2-869.tar.bz2 -/vim-8.2-905.tar.bz2 -/vim-8.2-987.tar.bz2 -/vim-8.2-993.tar.bz2 -/vim-8.2-1009.tar.bz2 -/vim-8.2-1052.tar.bz2 -/vim-8.2-1081.tar.bz2 -/vim-8.2-1199.tar.bz2 -/vim-8.2-1217.tar.bz2 -/vim-8.2-1224.tar.bz2 -/vim-8.2-1273.tar.bz2 -/vim-8.2-1307.tar.bz2 -/vim-8.2-1328.tar.bz2 -/vim-8.2-1359.tar.bz2 -/vim-8.2-1382.tar.bz2 -/vim-8.2-1412.tar.bz2 -/vim-8.2-1484.tar.bz2 -/vim-8.2-1520.tar.bz2 -/vim-8.2-1522.tar.bz2 -/vim-8.2-1551.tar.bz2 -/vim-8.2-1634.tar.bz2 -/vim-8.2-1651.tar.bz2 -/vim-8.2-1687.tar.bz2 -/vim-8.2-1770.tar.bz2 -/vim-8.2-1805.tar.bz2 -/vim-8.2-1815.tar.bz2 -/vim-8.2-1885.tar.bz2 -/vim-8.2-1941.tar.bz2 -/vim-8.2-1961.tar.bz2 -/vim-8.2-1971.tar.bz2 -/vim-8.2-2018.tar.bz2 -/vim-8.2-2072.tar.bz2 -/vim-8.2-2086.tar.bz2 -/vim-8.2-2108.tar.bz2 -/vim-8.2-2115.tar.bz2 -/vim-8.2-2143.tar.bz2 -/vim-8.2-2146.tar.bz2 -/vim-8.2-2311.tar.bz2 -/vim-8.2-2451.tar.bz2 -/vim-8.2-2465.tar.bz2 -/vim-8.2-2488.tar.bz2 -/vim-8.2-2529.tar.bz2 -/vim-8.2-2541.tar.bz2 -/vim-8.2-2559.tar.bz2 -/vim-8.2-2576.tar.bz2 -/vim-8.2-2607.tar.bz2 -/vim-8.2-2637.tar.bz2 -/vim-8.2-2735.tar.bz2 -/vim-8.2-2756.tar.bz2 -/vim-8.2-2787.tar.bz2 -/vim-8.2-2811.tar.bz2 -/vim-8.2-2825.tar.bz2 -/vim-8.2-2846.tar.bz2 -/vim-8.2-2875.tar.bz2 -/vim-8.2-2879.tar.bz2 -/vim-8.2-2932.tar.bz2 -/vim-8.2-2956.tar.bz2 -/vim-8.2-3009.tar.bz2 -/vim-8.2-3043.tar.bz2 -/vim-8.2-3046.tar.bz2 -/vim-8.2-3070.tar.bz2 -/vim-8.2-3154.tar.bz2 -/vim-8.2-3182.tar.bz2 -/vim-8.2-3223.tar.bz2 -/vim-8.2-3273.tar.bz2 -/vim-8.2-3290.tar.bz2 -/vim-8.2-3318.tar.bz2 -/vim-8.2-3354.tar.bz2 -/vim-8.2-3367.tar.bz2 -/vim-8.2-3391.tar.bz2 -/vim-8.2-3404.tar.bz2 -/vim-8.2-3512.tar.bz2 -/vim-8.2-3568.tar.bz2 -/vim-8.2-3582.tar.bz2 -/vim-8.2-3642.tar.bz2 -/vim-8.2-3717.tar.bz2 -/vim-8.2-3755.tar.bz2 -/vim-8.2-3811.tar.bz2 -/vim-8.2-4006.tar.bz2 -/vim-8.2-4051.tar.bz2 -/vim-8.2-4068.tar.bz2 -/vim-8.2-4198.tar.bz2 -/vim-8.2-4232.tar.bz2 -/vim-8.2-4314.tar.bz2 -/vim-8.2-4386.tar.bz2 -/vim-8.2-4428.tar.bz2 -/vim-8.2-4460.tar.bz2 -/vim-8.2-4485.tar.bz2 -/vim-8.2-4529.tar.bz2 -/vim-8.2-4579.tar.bz2 -/vim-8.2-4621.tar.bz2 -/vim-8.2-4701.tar.bz2 -/vim-8.2-4804.tar.bz2 -/vim-8.2-4845.tar.bz2 -/vim-8.2-4857.tar.bz2 -/vim-8.2-4877.tar.bz2 -/vim-8.2-4927.tar.bz2 -/vim-8.2-4969.tar.bz2 -/vim-8.2-4975.tar.bz2 -/vim-8.2-5046.tar.bz2 -/vim-8.2-5052.tar.bz2 -/vim-8.2-5085.tar.bz2 -/vim-8.2-5141.tar.bz2 -/vim-8.2-5172.tar.bz2 -/vim-9.0-049.tar.bz2 -/vim-9.0-077.tar.bz2 -/vim-9.0-137.tar.bz2 -/vim-9.0-189.tar.bz2 -/vim-9.0-213.tar.bz2 -/vim-9.0-246.tar.bz2 -/vim-9.0-327.tar.bz2 -/vim-9.0-348.tar.bz2 -/vim-9.0-412.tar.bz2 -/vim-9.0-475.tar.bz2 -/vim-9.0-720.tar.bz2 -/vim-9.0-777.tar.bz2 -/vim-9.0-803.tar.bz2 -/vim-9.0-828.tar.bz2 -/vim-9.0-915.tar.bz2 -/vim-9.0-963.tar.bz2 -/vim-9.0-1006.tar.bz2 -/vim-9.0-1054.tar.bz2 -/vim-9.0-1160.tar.bz2 -/vim-9.0-1182.tar.bz2 -/vim-9.0-1221.tar.bz2 -/vim-9.0-1262.tar.bz2 -/vim-9.0-1293.tar.bz2 -/vim-9.0-1307.tar.bz2 -/vim-9.0-1314.tar.bz2 -/vim-9.0-1367.tar.bz2 -/vim-9.0-1403.tar.bz2 -/vim-9.0-1407.tar.bz2 -/vim-9.0-1423.tar.bz2 -/vim-9.0-1429.tar.bz2 -/vim-9.0-1440.tar.bz2 -/vim-9.0-1443.tar.bz2 -/vim-9.0-1472.tar.bz2 -/vim-9.0-1486.tar.bz2 -/vim-9.0-1491.tar.bz2 -/vim-9.0-1562.tar.bz2 -/vim-9.0-1575.tar.bz2 -/vim-9.0-1587.tar.bz2 -/vim-9.0-1592.tar.bz2 -/vim-9.0-1607.tar.bz2 -/vim-9.0-1627.tar.bz2 -/vim-9.0-1649.tar.bz2 -/vim-9.0-1671.tar.bz2 -/vim-9.0-1677.tar.bz2 -/vim-9.0-1712.tar.bz2 -/vim-9.0-1822.tar.bz2 -/vim-9.0-1872.tar.bz2 -/vim-9.0-1882.tar.bz2 -/vim-9.0-1927.tar.bz2 -/vim-9.0-1968.tar.bz2 -/vim-9.0-1984.tar.bz2 -/vim-9.0-2048.tar.bz2 -/vim-9.0-2081.tar.bz2 -/vim-9.0-2105.tar.bz2 -/vim-9.0-2120.tar.bz2 -/vim-9.0-2153.tar.bz2 -/vim-9.0-2167.tar.bz2 -/vim-9.0-2190.tar.bz2 -/vim-9.1-016.tar.bz2 -/vim-9.1-031.tar.bz2 -/vim-9.1-076.tar.bz2 -/vim-9.1-083.tar.bz2 -/vim-9.1-113.tar.bz2 -/vim-9.1-158.tar.bz2 -/vim-9.1-181.tar.bz2 -/vim-9.1-252.tar.bz2 -/vim-9.1-264.tar.bz2 -/vim-9.1-309.tar.bz2 -/vim-9.1-354.tar.bz2 -/vim-9.1-393.tar.bz2 -/vim-9.1-452.tar.bz2 -/vim-9.1-544.tar.bz2 -/vim-9.1-571.tar.bz2 +/vim-*.tar.bz2 From a01683035a3b6f21ecbdeafb8be14dc26d449e8d Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 25 Jul 2024 23:41:06 -0700 Subject: [PATCH 253/324] Require gdk-pixbuf2-modules-extra on F41+ -X11 for XPM loading (rhbz#2277751) --- vim.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 0d63efd5..9d5e7af0 100644 --- a/vim.spec +++ b/vim.spec @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 3%{?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 @@ -321,6 +321,10 @@ Requires: glib2 >= 2.79.1 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 @@ -1057,6 +1061,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Jul 26 2024 Benjamin Gilbert - 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 - 2:9.1.571-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7b5a18972405e87f371cd11e0496390112b566da Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 5 Aug 2024 10:15:03 +0200 Subject: [PATCH 254/324] - patchlevel 660 --- sources | 2 +- vim.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 83dfb061..539e2cf6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-571.tar.bz2) = c2664b05760ae65f697b3db1b747b8d3a61756b108c8402332aba143e4e067cbe2e7db72e3285e8d4b61176d86a302210e1967e92852df0ed7475f32804bd879 +SHA512 (vim-9.1-660.tar.bz2) = 9aff4b76c054f073ecb9bdcfba5ade0ce10a2e8924fde8fb37f3dfa630681003e1b40eeb949e883046613064776c8f9d5914366247492c3fc8d337eead5cbcda diff --git a/vim.spec b/vim.spec index 9d5e7af0..748779a8 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 571 +%define patchlevel 660 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 3%{?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 @@ -1061,6 +1061,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon Aug 05 2024 Zdenek Dohnal - 2:9.1.660-1 +- patchlevel 660 + * Fri Jul 26 2024 Benjamin Gilbert - 2:9.1.571-3 - Require gdk-pixbuf2-modules-extra on F41+ -X11 for XPM loading (rhbz#2277751) From 98bc0498b2a26fb2d790661b21cdf0d1b99f4d2a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 9 Aug 2024 14:19:01 +0200 Subject: [PATCH 255/324] 2303669 - vim in rawhide (41) can't load python library --- vim.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 748779a8..3a0b7d47 100644 --- a/vim.spec +++ b/vim.spec @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -482,6 +482,7 @@ mv -f os_unix.h.save os_unix.h %configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ --with-features=huge \ --enable-python3interp=dynamic \ + --with-python3-stable-abi=3.10 \ --disable-tclinterp --with-x=yes \ --enable-xim --enable-multibyte \ --with-tlib=ncurses \ @@ -536,6 +537,7 @@ make clean %configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ --prefix=%{_prefix} --with-features=huge \ --enable-python3interp=dynamic \ + --with-python3-stable-abi=3.10 \ --disable-tclinterp \ --with-x=no \ --enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte \ @@ -1061,6 +1063,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Aug 09 2024 Zdenek Dohnal - 2:9.1.660-2 +- 2303669 - vim in rawhide (41) can't load python library + * Mon Aug 05 2024 Zdenek Dohnal - 2:9.1.660-1 - patchlevel 660 From fc241eb37884f00b581f92ac993cf9cb19360ff3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 12 Aug 2024 14:17:36 +0200 Subject: [PATCH 256/324] Remove configuration option for Python stable ABI Upstream now defaults to Python 3.8 stable ABI - let's follow upstream. --- vim.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/vim.spec b/vim.spec index 3a0b7d47..97d242a8 100644 --- a/vim.spec +++ b/vim.spec @@ -482,7 +482,6 @@ mv -f os_unix.h.save os_unix.h %configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ --with-features=huge \ --enable-python3interp=dynamic \ - --with-python3-stable-abi=3.10 \ --disable-tclinterp --with-x=yes \ --enable-xim --enable-multibyte \ --with-tlib=ncurses \ @@ -537,7 +536,6 @@ make clean %configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ --prefix=%{_prefix} --with-features=huge \ --enable-python3interp=dynamic \ - --with-python3-stable-abi=3.10 \ --disable-tclinterp \ --with-x=no \ --enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte \ From 699a4e37e44dda5ed80d727fc6eea9e493e1f563 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 12 Aug 2024 14:20:03 +0200 Subject: [PATCH 257/324] - patchlevel 672 --- sources | 2 +- vim.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 539e2cf6..c8de7fe6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-660.tar.bz2) = 9aff4b76c054f073ecb9bdcfba5ade0ce10a2e8924fde8fb37f3dfa630681003e1b40eeb949e883046613064776c8f9d5914366247492c3fc8d337eead5cbcda +SHA512 (vim-9.1-672.tar.bz2) = 9a047ff889e66b033b3a42c687a541e8b091a405871a320077079e9543407379d6e6401999bf76d34a280143204853f2ee1c8b7c23193bde722fdd583c705e08 diff --git a/vim.spec b/vim.spec index 97d242a8..4c22aa7f 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 660 +%define patchlevel 672 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -1061,6 +1061,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon Aug 12 2024 Zdenek Dohnal - 2:9.1.672-1 +- patchlevel 672 + * Fri Aug 09 2024 Zdenek Dohnal - 2:9.1.660-2 - 2303669 - vim in rawhide (41) can't load python library From cc6366596d376d2e958403ef45e8eb163d63b751 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 30 Aug 2024 10:37:24 +0200 Subject: [PATCH 258/324] Enable F41 for bodhi --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index d6e328db..7b43537c 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f40" "f39" ) -releases=( "fc41" "fc40" "fc39" ) +branches=( "rawhide" "f41" "f40" "f39" ) +releases=( "fc42" "fc41" "fc40" "fc39" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc41" "fc40" "\|fc39" ) -bodhi_enabled=( "0" "1" "1" ) +regexps=( "fc42" "fc41" "\|fc40" "\|fc39" ) +bodhi_enabled=( "0" "1" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From 172195d4961385dbff459483810f8806b103b206 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 30 Aug 2024 10:39:17 +0200 Subject: [PATCH 259/324] - patchlevel 703 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c8de7fe6..7679dd09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-672.tar.bz2) = 9a047ff889e66b033b3a42c687a541e8b091a405871a320077079e9543407379d6e6401999bf76d34a280143204853f2ee1c8b7c23193bde722fdd583c705e08 +SHA512 (vim-9.1-703.tar.bz2) = 238bef436142fb4cc66d252502e34eee31e4b40854cc4ee7dc1327771935312328139e9b5afbbfcd2d31db3e9cfec5449a77dedc2cf85515c2179dfad9e4f6db diff --git a/vim.spec b/vim.spec index 4c22aa7f..24c8acaa 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 672 +%define patchlevel 703 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1061,6 +1061,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Aug 30 2024 Zdenek Dohnal - 2:9.1.703-1 +- patchlevel 703 + * Mon Aug 12 2024 Zdenek Dohnal - 2:9.1.672-1 - patchlevel 672 From 0b294c2268f6eb31be10d442c4a26dc2dbbbe25e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 30 Aug 2024 11:14:29 +0200 Subject: [PATCH 260/324] Update manpage patch --- vim-manpagefixes-948566.patch | 228 ++++++++++++++++------------------ 1 file changed, 104 insertions(+), 124 deletions(-) diff --git a/vim-manpagefixes-948566.patch b/vim-manpagefixes-948566.patch index 6f495600..40dc9af6 100644 --- a/vim-manpagefixes-948566.patch +++ b/vim-manpagefixes-948566.patch @@ -1,38 +1,7 @@ -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 @@ +diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1 +--- vim91/runtime/doc/vim.1.manpagefixes 2024-08-30 10:46:21.683161397 +0200 ++++ vim91/runtime/doc/vim.1 2024-08-30 10:46:21.685161385 +0200 +@@ -17,11 +17,13 @@ vim \- Vi IMproved, a programmer's text .PP .br .B ex @@ -46,7 +15,7 @@ diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1 .B evim .B eview .br -@@ -114,7 +116,12 @@ +@@ -114,7 +116,12 @@ Can also be done with the "\-R" argument gvim gview The GUI version. Starts a new window. @@ -60,7 +29,7 @@ diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1 .TP evim eview The GUI version in easy mode. -@@ -458,6 +458,12 @@ +@@ -491,6 +498,12 @@ As \-\-remote, but Vim does not exit unt \-\-remote\-wait\-silent As \-\-remote\-wait, but without the warning when no server is found. .TP @@ -73,10 +42,10 @@ diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1 \-\-serverlist List the names of all Vim servers that can be found. .TP -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 @@ +diff -up vim91/runtime/doc/vim-fr.1.manpagefixes vim91/runtime/doc/vim-fr.1 +--- vim91/runtime/doc/vim-fr.1.manpagefixes 2024-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vim-fr.1 2024-08-30 10:46:21.685161385 +0200 +@@ -24,11 +24,13 @@ vim \- Vi IMproved, éditeur de texte pou .PP .br .B ex @@ -90,10 +59,10 @@ diff -urN vim73/runtime/doc/vim-fr.1 vim73_new/runtime/doc/vim-fr.1 .B evim .B eview .br -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 @@ +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-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vim-fr.UTF-8.1 2024-08-30 10:46:21.685161385 +0200 +@@ -24,11 +24,13 @@ vim \- Vi IMproved, éditeur de texte po .PP .br .B ex @@ -107,10 +76,10 @@ diff -urN vim73/runtime/doc/vim-fr.UTF-8.1 vim73_new/runtime/doc/vim-fr.UTF-8.1 .B evim .B eview .br -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 @@ +diff -up vim91/runtime/doc/vim-it.1.manpagefixes vim91/runtime/doc/vim-it.1 +--- vim91/runtime/doc/vim-it.1.manpagefixes 2024-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vim-it.1 2024-08-30 10:46:21.685161385 +0200 +@@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi .PP .br .B ex @@ -124,10 +93,10 @@ diff -urN vim73/runtime/doc/vim-it.1 vim73_new/runtime/doc/vim-it.1 .B evim .B eview .br -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 @@ +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-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vim-it.UTF-8.1 2024-08-30 10:46:21.685161385 +0200 +@@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi .PP .br .B ex @@ -141,26 +110,41 @@ diff -urN vim73/runtime/doc/vim-it.UTF-8.1 vim73_new/runtime/doc/vim-it.UTF-8.1 .B evim .B eview .br -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. +diff -up vim91/runtime/doc/vim.man.manpagefixes vim91/runtime/doc/vim.man +--- vim91/runtime/doc/vim.man.manpagefixes 2024-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vim.man 2024-08-30 10:46:21.686161378 +0200 +@@ -9,9 +9,9 @@ SYNOPSIS + vim [options] -t tag + vim [options] -q [errorfile] - gex Starts a new gvim window in Ex mode. Can also be done with -- the "-e" argument to gvim. +- 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 + the "-e" argument to gvim - - vimx Starts gvim in "Vi" mode similar to "vim", but with -- additional features like xterm clipboard support. ++ ++ 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-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 @@ +diff -up vim91/runtime/doc/vim-pl.1.manpagefixes vim91/runtime/doc/vim-pl.1 +--- vim91/runtime/doc/vim-pl.1.manpagefixes 2024-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vim-pl.1 2024-08-30 10:46:21.686161378 +0200 +@@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla .PP .br .B ex @@ -174,10 +158,10 @@ diff -urN vim73/runtime/doc/vim-pl.1 vim73_new/runtime/doc/vim-pl.1 .B evim .B eview .br -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 @@ +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-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vim-pl.UTF-8.1 2024-08-30 10:46:21.686161378 +0200 +@@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla .PP .br .B ex @@ -191,10 +175,10 @@ diff -urN vim73/runtime/doc/vim-pl.UTF-8.1 vim73_new/runtime/doc/vim-pl.UTF-8.1 .B evim .B eview .br -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 @@ +diff -up vim91/runtime/doc/vim-ru.1.manpagefixes vim91/runtime/doc/vim-ru.1 +--- vim91/runtime/doc/vim-ru.1.manpagefixes 2024-08-30 10:46:21.686161378 +0200 ++++ vim91/runtime/doc/vim-ru.1 2024-08-30 10:47:41.358659029 +0200 +@@ -18,11 +18,13 @@ .PP .br .B ex @@ -205,15 +189,13 @@ diff -urN vim73/runtime/doc/vim-ru.1 vim73_new/runtime/doc/vim-ru.1 .B gvim .B gview +.B vimx -+.B evim -+.B eview + .B evim + .B eview .br - .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 @@ +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-08-30 10:46:21.687161372 +0200 ++++ vim91/runtime/doc/vim-ru.UTF-8.1 2024-08-30 10:48:19.972415568 +0200 +@@ -18,11 +18,13 @@ программиÑтов. .PP .br .B ex @@ -224,15 +206,13 @@ diff -urN vim73/runtime/doc/vim-ru.UTF-8.1 vim73_new/runtime/doc/vim-ru.UTF-8.1 .B gvim .B gview +.B vimx -+.B evim -+.B eview + .B evim + .B eview .br - .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 @@ +diff -up vim91/runtime/doc/vimtutor.1.manpagefixes vim91/runtime/doc/vimtutor.1 +--- vim91/runtime/doc/vimtutor.1.manpagefixes 2024-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vimtutor.1 2024-08-30 10:46:21.687161372 +0200 +@@ -4,6 +4,8 @@ vimtutor \- the Vim tutor .SH SYNOPSIS .br .B vimtutor [\-g] [language] @@ -241,10 +221,10 @@ diff -urN vim73/runtime/doc/vimtutor.1 vim73_new/runtime/doc/vimtutor.1 .SH DESCRIPTION .B Vimtutor starts the -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 @@ +diff -up vim91/runtime/doc/vimtutor-it.1.manpagefixes vim91/runtime/doc/vimtutor-it.1 +--- vim91/runtime/doc/vimtutor-it.1.manpagefixes 2024-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vimtutor-it.1 2024-08-30 10:46:21.687161372 +0200 +@@ -4,6 +4,8 @@ vimtutor \- Un breve corso introduttivo .SH SINTASSI .br .B vimtutor [\-g] [lingua] @@ -253,10 +233,10 @@ diff -urN vim73/runtime/doc/vimtutor-it.1 vim73_new/runtime/doc/vimtutor-it.1 .SH DESCRIZIONE .B Vimtutor inizia il -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 @@ +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-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vimtutor-it.UTF-8.1 2024-08-30 10:46:21.688161366 +0200 +@@ -4,6 +4,8 @@ vimtutor \- Un breve corso introduttivo .SH SINTASSI .br .B vimtutor [\-g] [lingua] @@ -265,10 +245,10 @@ diff -urN vim73/runtime/doc/vimtutor-it.UTF-8.1 vim73_new/runtime/doc/vimtutor-i .SH DESCRIZIONE .B Vimtutor inizia il -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 @@ +diff -up vim91/runtime/doc/vimtutor.man.manpagefixes vim91/runtime/doc/vimtutor.man +--- vim91/runtime/doc/vimtutor.man.manpagefixes 2024-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vimtutor.man 2024-08-30 10:46:21.688161366 +0200 +@@ -7,6 +7,7 @@ NAME SYNOPSIS vimtutor [-g] [language] @@ -276,10 +256,10 @@ diff -urN vim73/runtime/doc/vimtutor.man vim73_new/runtime/doc/vimtutor.man DESCRIPTION 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 @@ +diff -up vim91/runtime/doc/vimtutor-pl.1.manpagefixes vim91/runtime/doc/vimtutor-pl.1 +--- vim91/runtime/doc/vimtutor-pl.1.manpagefixes 2024-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vimtutor-pl.1 2024-08-30 10:46:21.688161366 +0200 +@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima .SH SYNOPSIS .br .B vimtutor -g [jêzyk] @@ -288,10 +268,10 @@ diff -urN vim73/runtime/doc/vimtutor-pl.1 vim73_new/runtime/doc/vimtutor-pl.1 .SH OPIS .B Vimtutor uruchamia nauczyciela -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 @@ +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-08-30 10:38:11.000000000 +0200 ++++ vim91/runtime/doc/vimtutor-pl.UTF-8.1 2024-08-30 10:46:21.689161359 +0200 +@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima .SH SYNOPSIS .br .B vimtutor -g [jÄ™zyk] @@ -300,27 +280,27 @@ diff -urN vim73/runtime/doc/vimtutor-pl.UTF-8.1 vim73_new/runtime/doc/vimtutor-p .SH OPIS .B Vimtutor uruchamia nauczyciela -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 +diff -up vim91/runtime/doc/vimtutor-ru.1.manpagefixes vim91/runtime/doc/vimtutor-ru.1 +--- vim91/runtime/doc/vimtutor-ru.1.manpagefixes 2024-08-30 10:46:21.689161359 +0200 ++++ vim91/runtime/doc/vimtutor-ru.1 2024-08-30 10:49:28.122985860 +0200 @@ -4,6 +4,8 @@ - .SH ëïíáîäîáñ óôòïëá + .SH ëòáôëéê ïâúïò .br - .B vimtutor [ÑÚÙË] + .B vimtutor [\-g] [ÑÚÙË] +.br +.B gvimtutor .SH ïðéóáîéå - ëÏÍÁÎÄÁ + ðÏ ËÏÍÁÎÄÅ .B vimtutor -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 @@ +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-08-30 10:46:21.689161359 +0200 ++++ vim91/runtime/doc/vimtutor-ru.UTF-8.1 2024-08-30 10:50:11.634711513 +0200 +@@ -7,6 +7,8 @@ Программа vimtutor \[em] вып .SH ОПИСÐÐИЕ - Команда + По команде .B vimtutor +.br +.B gvimtutor - запуÑкает учебник по + выполнÑетÑÑ Ð·Ð°Ð¿ÑƒÑк редактора .B Vim. - При Ñтом Ñначала проиÑходит Ñоздание копии файла учебника, + Ñ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ð¼ файлом, Ñодержащем текÑÑ‚ учебника. Ðо перед Ñтим проиÑходит From 91761c6fd5f6c6da1cd37d821f40ede049be5975 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 6 Sep 2024 17:45:56 +0200 Subject: [PATCH 261/324] - patchlevel 719 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7679dd09..4288bff1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-703.tar.bz2) = 238bef436142fb4cc66d252502e34eee31e4b40854cc4ee7dc1327771935312328139e9b5afbbfcd2d31db3e9cfec5449a77dedc2cf85515c2179dfad9e4f6db +SHA512 (vim-9.1-719.tar.bz2) = bab89f3cbc567b0ea9fd3018f3db338ba2a477a97d062a6ff8c4fe6198b64e22796ae3defa3b05fdb171d5c9d021aa00319bc0dfad342fd2a8344f1d332bb888 diff --git a/vim.spec b/vim.spec index 24c8acaa..d163b247 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 703 +%define patchlevel 719 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1061,6 +1061,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Sep 06 2024 Zdenek Dohnal - 2:9.1.719-1 +- patchlevel 719 + * Fri Aug 30 2024 Zdenek Dohnal - 2:9.1.703-1 - patchlevel 703 From 90c8fff6449e8032f8596e963a5486a14436a709 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 20 Sep 2024 22:05:39 +0200 Subject: [PATCH 262/324] - patchlevel 737 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4288bff1..919e519c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-719.tar.bz2) = bab89f3cbc567b0ea9fd3018f3db338ba2a477a97d062a6ff8c4fe6198b64e22796ae3defa3b05fdb171d5c9d021aa00319bc0dfad342fd2a8344f1d332bb888 +SHA512 (vim-9.1-737.tar.bz2) = b61ec2aeee927530e6f0a3fedd0753aba540d254e01241d7dc5c78e0a37d3ab1149aa8e099da525ff79a2c12713428577e8c69cf06b087f8124b4bacd3a20316 diff --git a/vim.spec b/vim.spec index d163b247..bd8ee9c2 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 719 +%define patchlevel 737 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1061,6 +1061,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Sep 20 2024 Zdenek Dohnal - 2:9.1.737-1 +- patchlevel 737 + * Fri Sep 06 2024 Zdenek Dohnal - 2:9.1.719-1 - patchlevel 719 From d759f0c7444b2d743264d31e1b2c80450a65cc9a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 20 Sep 2024 23:41:33 +0200 Subject: [PATCH 263/324] patchlevel 737 (fedora#2311860) --- ....h-Reset-severity-for-empty-messages.patch | 45 +++++++++++++++++++ vim-7.4-globalsyntax.patch | 10 ++--- vim.spec | 7 ++- 3 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 0001-if_py_both.h-Reset-severity-for-empty-messages.patch diff --git a/0001-if_py_both.h-Reset-severity-for-empty-messages.patch b/0001-if_py_both.h-Reset-severity-for-empty-messages.patch new file mode 100644 index 00000000..390a6d4f --- /dev/null +++ b/0001-if_py_both.h-Reset-severity-for-empty-messages.patch @@ -0,0 +1,45 @@ +From dfda5118ba68f20c653b4ab1dd5e2e4736d206d3 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Fri, 20 Sep 2024 22:14:56 +0200 +Subject: [PATCH] if_py_both.h: Reset severity for empty messages + +Python 3 interpreter sometimes sends error which is not parsable by +`PyArg_Parse()` in `write_output()`, which ends up with empty string +being sent to `writer()` with `emsg_severe` being set, but `emsg()`, +which resets the severity flag, is not called for empty strings. + +It can result in certain cases into putting severity on not severe +messages, because severity stays set after processing an empty string - +it was one of the causes of test suite errors when compiled with Python +3.13 and using stable ABI. + +The patch resets the severity flag in `writer()` in case the flag is set +and we would have called `emsg()` if the string was not empty. + +Partially resolves #15534 +--- + src/if_py_both.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/if_py_both.h b/src/if_py_both.h +index 3643f8be2..213ace986 100644 +--- a/src/if_py_both.h ++++ b/src/if_py_both.h +@@ -678,6 +678,14 @@ writer(writefn fn, char_u *str, PyInt n) + mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n); + io_ga.ga_len += (int)n; + } ++ ++ // Reset emsg_sever if we got empty output from Python interpreter. ++ // Usually emsg_severe is set to FALSE in emsg(), but the function is not called ++ // for empty strings and the var stays TRUE, causing side effects further down, ++ // f.e. returning a different error message than expected, because not severe message ++ // gets severity from previous call write_output() which had the severity. ++ if (fn == (writefn)emsg && emsg_severe == TRUE) ++ emsg_severe = FALSE; + } + + static int +-- +2.46.0 + diff --git a/vim-7.4-globalsyntax.patch b/vim-7.4-globalsyntax.patch index 81efb8c1..2f7fe16b 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-05-31 07:07:51.928490680 +0200 -+++ vim91/runtime/syntax/spec.vim 2024-05-31 07:08:26.049624156 +0200 -@@ -111,7 +111,7 @@ syn region specDescriptionArea matchgrou +--- 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 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\)\>' 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\)\>' 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\|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 "%% 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.spec b/vim.spec index bd8ee9c2..976cfda6 100644 --- a/vim.spec +++ b/vim.spec @@ -99,6 +99,8 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch +# https://github.com/vim/vim/pull/15711 +Patch3006: 0001-if_py_both.h-Reset-severity-for-empty-messages.patch # uses autoconf in spec file @@ -426,6 +428,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch -P 3003 -p1 -b .python-tests %patch -P 3004 -p1 -b .fips-warning %patch -P 3005 -p1 -b .copypaste +%patch -P 3006 -p1 -b .reset-emsg-severity %build cd src @@ -482,6 +485,7 @@ mv -f os_unix.h.save os_unix.h %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 \ @@ -536,6 +540,7 @@ make clean %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 \ @@ -1062,7 +1067,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog * Fri Sep 20 2024 Zdenek Dohnal - 2:9.1.737-1 -- patchlevel 737 +- patchlevel 737 (fedora#2311860) * Fri Sep 06 2024 Zdenek Dohnal - 2:9.1.719-1 - patchlevel 719 From aed1291d2e526683e4412deb2ffd68417ee5b2bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 3 Oct 2024 18:04:38 +0200 Subject: [PATCH 264/324] Add in AppData for icon reference Without this tag, the G-S does not display icon properly. But also the `appstream-builder` inserts into metadata generic `org.vim.Vim.desktop`, which cannot be found. This results in `Vetos: Has no Icon` and therefore rejection of GVim from `appstream-data` package. --- vim.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 976cfda6..7058ac4b 100644 --- a/vim.spec +++ b/vim.spec @@ -635,7 +635,7 @@ 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 < $RPM_BUILD_ROOT%{_datadir}/metainfo/gvim.appdata.xml <<"EOF" + gvim.desktop EOF From 9c62530262a90207711038842ee8ce4de156d390 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 15 Oct 2024 10:51:16 +0200 Subject: [PATCH 265/324] Remove the downstream patch, got fixed upstream --- ....h-Reset-severity-for-empty-messages.patch | 45 ------------------- vim.spec | 4 +- 2 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 0001-if_py_both.h-Reset-severity-for-empty-messages.patch diff --git a/0001-if_py_both.h-Reset-severity-for-empty-messages.patch b/0001-if_py_both.h-Reset-severity-for-empty-messages.patch deleted file mode 100644 index 390a6d4f..00000000 --- a/0001-if_py_both.h-Reset-severity-for-empty-messages.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dfda5118ba68f20c653b4ab1dd5e2e4736d206d3 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Fri, 20 Sep 2024 22:14:56 +0200 -Subject: [PATCH] if_py_both.h: Reset severity for empty messages - -Python 3 interpreter sometimes sends error which is not parsable by -`PyArg_Parse()` in `write_output()`, which ends up with empty string -being sent to `writer()` with `emsg_severe` being set, but `emsg()`, -which resets the severity flag, is not called for empty strings. - -It can result in certain cases into putting severity on not severe -messages, because severity stays set after processing an empty string - -it was one of the causes of test suite errors when compiled with Python -3.13 and using stable ABI. - -The patch resets the severity flag in `writer()` in case the flag is set -and we would have called `emsg()` if the string was not empty. - -Partially resolves #15534 ---- - src/if_py_both.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/if_py_both.h b/src/if_py_both.h -index 3643f8be2..213ace986 100644 ---- a/src/if_py_both.h -+++ b/src/if_py_both.h -@@ -678,6 +678,14 @@ writer(writefn fn, char_u *str, PyInt n) - mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n); - io_ga.ga_len += (int)n; - } -+ -+ // Reset emsg_sever if we got empty output from Python interpreter. -+ // Usually emsg_severe is set to FALSE in emsg(), but the function is not called -+ // for empty strings and the var stays TRUE, causing side effects further down, -+ // f.e. returning a different error message than expected, because not severe message -+ // gets severity from previous call write_output() which had the severity. -+ if (fn == (writefn)emsg && emsg_severe == TRUE) -+ emsg_severe = FALSE; - } - - static int --- -2.46.0 - diff --git a/vim.spec b/vim.spec index 7058ac4b..2e04a611 100644 --- a/vim.spec +++ b/vim.spec @@ -99,8 +99,6 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch -# https://github.com/vim/vim/pull/15711 -Patch3006: 0001-if_py_both.h-Reset-severity-for-empty-messages.patch # uses autoconf in spec file @@ -428,7 +426,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch -P 3003 -p1 -b .python-tests %patch -P 3004 -p1 -b .fips-warning %patch -P 3005 -p1 -b .copypaste -%patch -P 3006 -p1 -b .reset-emsg-severity + %build cd src From b25fd607ccb516f83c9d6cf622f0fa68cf8b9a44 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 15 Oct 2024 12:42:09 +0200 Subject: [PATCH 266/324] - patchlevel 785 --- sources | 2 +- vim.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 919e519c..f7767557 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-737.tar.bz2) = b61ec2aeee927530e6f0a3fedd0753aba540d254e01241d7dc5c78e0a37d3ab1149aa8e099da525ff79a2c12713428577e8c69cf06b087f8124b4bacd3a20316 +SHA512 (vim-9.1-785.tar.bz2) = a1072b1aaee1db29af80c4211157546c6d4b9d859bd8af53f51febc976c1e002258e180f2d6d074d9f5bee96106d715f2b17672492fabe8c7e2063c78491f0b4 diff --git a/vim.spec b/vim.spec index 2e04a611..04440185 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 737 +%define patchlevel 785 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -859,6 +859,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %lang(af) %{_datadir}/%{name}/%{vimdir}/lang/af +%lang(am) %{_datadir}/%{name}/%{vimdir}/lang/am %lang(ca) %{_datadir}/%{name}/%{vimdir}/lang/ca %lang(cs) %{_datadir}/%{name}/%{vimdir}/lang/cs %lang(cs.cp1250) %{_datadir}/%{name}/%{vimdir}/lang/cs.cp1250 @@ -1072,6 +1073,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Tue Oct 15 2024 Zdenek Dohnal - 2:9.1.785-1 +- patchlevel 785 + * Fri Sep 20 2024 Zdenek Dohnal - 2:9.1.737-1 - patchlevel 737 (fedora#2311860) From 890a4758cd1261d31088d276ea023d44e0d977b6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 1 Nov 2024 07:50:22 +0100 Subject: [PATCH 267/324] - patchlevel 825 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f7767557..dca9f838 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-785.tar.bz2) = a1072b1aaee1db29af80c4211157546c6d4b9d859bd8af53f51febc976c1e002258e180f2d6d074d9f5bee96106d715f2b17672492fabe8c7e2063c78491f0b4 +SHA512 (vim-9.1-825.tar.bz2) = d61ab82e4e20aa08a7a71ebc6668c152f1e03ca618bfb5390de6f093659e00c4047bda40c64ab2b811cd597ba2a2d98d3a5ef21f4c46522e87e8b4e689863458 diff --git a/vim.spec b/vim.spec index 04440185..2deee032 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 785 +%define patchlevel 825 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1073,6 +1073,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Nov 01 2024 Zdenek Dohnal - 2:9.1.825-1 +- patchlevel 825 + * Tue Oct 15 2024 Zdenek Dohnal - 2:9.1.785-1 - patchlevel 785 From b71d9f022c81414b983eefb41be55e817e85cedf Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 15 Nov 2024 06:31:36 +0100 Subject: [PATCH 268/324] F39 is EOL in less than 14 days --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 7b43537c..62d68f7a 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f41" "f40" "f39" ) -releases=( "fc42" "fc41" "fc40" "fc39" ) +branches=( "rawhide" "f41" "f40" ) +releases=( "fc42" "fc41" "fc40" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc42" "fc41" "\|fc40" "\|fc39" ) -bodhi_enabled=( "0" "1" "1" "1" ) +regexps=( "fc42" "fc41" "\|fc40" ) +bodhi_enabled=( "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From 9eb44931632082f2873d99735b28745326a6d133 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 15 Nov 2024 06:33:26 +0100 Subject: [PATCH 269/324] - patchlevel 866 --- sources | 2 +- vim-manpagefixes-948566.patch | 100 +++++++++++++++++----------------- vim.spec | 5 +- 3 files changed, 55 insertions(+), 52 deletions(-) diff --git a/sources b/sources index dca9f838..d12dbfc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-825.tar.bz2) = d61ab82e4e20aa08a7a71ebc6668c152f1e03ca618bfb5390de6f093659e00c4047bda40c64ab2b811cd597ba2a2d98d3a5ef21f4c46522e87e8b4e689863458 +SHA512 (vim-9.1-866.tar.bz2) = c2ce23170cf5530df80542440e98b678e19147a5ee70878d66b28e0e78e26e665122f9decea8f37034ba354e14726eaa2939981952b0e2f82a1e887a82583f9e diff --git a/vim-manpagefixes-948566.patch b/vim-manpagefixes-948566.patch index 40dc9af6..cad76e36 100644 --- a/vim-manpagefixes-948566.patch +++ b/vim-manpagefixes-948566.patch @@ -1,6 +1,6 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1 ---- vim91/runtime/doc/vim.1.manpagefixes 2024-08-30 10:46:21.683161397 +0200 -+++ vim91/runtime/doc/vim.1 2024-08-30 10:46:21.685161385 +0200 +--- vim91/runtime/doc/vim.1.manpagefixes 2024-11-15 06:34:57.866102079 +0100 ++++ vim91/runtime/doc/vim.1 2024-11-15 06:34:57.868102064 +0100 @@ -17,11 +17,13 @@ vim \- Vi IMproved, a programmer's text .PP .br @@ -43,8 +43,8 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1 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-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vim-fr.1 2024-08-30 10:46:21.685161385 +0200 +--- vim91/runtime/doc/vim-fr.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-fr.1 2024-11-15 06:34:57.868102064 +0100 @@ -24,11 +24,13 @@ vim \- Vi IMproved, éditeur de texte pou .PP .br @@ -60,8 +60,8 @@ diff -up vim91/runtime/doc/vim-fr.1.manpagefixes vim91/runtime/doc/vim-fr.1 .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-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vim-fr.UTF-8.1 2024-08-30 10:46:21.685161385 +0200 +--- 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-15 06:34:57.868102064 +0100 @@ -24,11 +24,13 @@ vim \- Vi IMproved, éditeur de texte po .PP .br @@ -77,8 +77,8 @@ diff -up vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes vim91/runtime/doc/vim-fr. .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-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vim-it.1 2024-08-30 10:46:21.685161385 +0200 +--- vim91/runtime/doc/vim-it.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-it.1 2024-11-15 06:34:57.869102056 +0100 @@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi .PP .br @@ -94,8 +94,8 @@ diff -up vim91/runtime/doc/vim-it.1.manpagefixes vim91/runtime/doc/vim-it.1 .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-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vim-it.UTF-8.1 2024-08-30 10:46:21.685161385 +0200 +--- 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-15 06:34:57.869102056 +0100 @@ -17,11 +17,13 @@ vim \- VI Migliorato, un editor di testi .PP .br @@ -111,8 +111,8 @@ diff -up vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes vim91/runtime/doc/vim-it. .B eview .br diff -up vim91/runtime/doc/vim.man.manpagefixes vim91/runtime/doc/vim.man ---- vim91/runtime/doc/vim.man.manpagefixes 2024-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vim.man 2024-08-30 10:46:21.686161378 +0200 +--- vim91/runtime/doc/vim.man.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim.man 2024-11-15 06:34:57.869102056 +0100 @@ -9,9 +9,9 @@ SYNOPSIS vim [options] -t tag vim [options] -q [errorfile] @@ -142,8 +142,8 @@ diff -up vim91/runtime/doc/vim.man.manpagefixes vim91/runtime/doc/vim.man 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-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vim-pl.1 2024-08-30 10:46:21.686161378 +0200 +--- vim91/runtime/doc/vim-pl.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-pl.1 2024-11-15 06:34:57.869102056 +0100 @@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla .PP .br @@ -159,8 +159,8 @@ diff -up vim91/runtime/doc/vim-pl.1.manpagefixes vim91/runtime/doc/vim-pl.1 .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-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vim-pl.UTF-8.1 2024-08-30 10:46:21.686161378 +0200 +--- 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-15 06:34:57.869102056 +0100 @@ -17,11 +17,13 @@ vim \- Vi rozbudowany, edytor tekstu dla .PP .br @@ -176,8 +176,8 @@ diff -up vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vim-pl. .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-08-30 10:46:21.686161378 +0200 -+++ vim91/runtime/doc/vim-ru.1 2024-08-30 10:47:41.358659029 +0200 +--- vim91/runtime/doc/vim-ru.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vim-ru.1 2024-11-15 06:34:57.870102048 +0100 @@ -18,11 +18,13 @@ .PP .br @@ -193,8 +193,8 @@ diff -up vim91/runtime/doc/vim-ru.1.manpagefixes vim91/runtime/doc/vim-ru.1 .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-08-30 10:46:21.687161372 +0200 -+++ vim91/runtime/doc/vim-ru.UTF-8.1 2024-08-30 10:48:19.972415568 +0200 +--- 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-15 06:34:57.870102048 +0100 @@ -18,11 +18,13 @@ программиÑтов. .PP .br @@ -210,55 +210,55 @@ diff -up vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vim-ru. .B eview .br diff -up vim91/runtime/doc/vimtutor.1.manpagefixes vim91/runtime/doc/vimtutor.1 ---- vim91/runtime/doc/vimtutor.1.manpagefixes 2024-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vimtutor.1 2024-08-30 10:46:21.687161372 +0200 -@@ -4,6 +4,8 @@ vimtutor \- the Vim tutor - .SH SYNOPSIS +--- vim91/runtime/doc/vimtutor.1.manpagefixes 2024-11-15 06:34:57.870102048 +0100 ++++ vim91/runtime/doc/vimtutor.1 2024-11-15 06:36:03.320603026 +0100 +@@ -8,6 +8,8 @@ vimtutor \- the Vim tutor + .B vimtutor [\-h | \-\-help] .br - .B vimtutor [\-g] [language] + .B vimtutor [\-\-list] +.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-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vimtutor-it.1 2024-08-30 10:46:21.687161372 +0200 -@@ -4,6 +4,8 @@ vimtutor \- Un breve corso introduttivo - .SH SINTASSI +--- vim91/runtime/doc/vimtutor-it.1.manpagefixes 2024-11-15 06:34:57.870102048 +0100 ++++ vim91/runtime/doc/vimtutor-it.1 2024-11-15 06:36:36.103353076 +0100 +@@ -8,6 +8,8 @@ vimtutor \- Un breve corso introduttivo + .B vimtutor [\-h | \-\-help] .br - .B vimtutor [\-g] [lingua] + .B vimtutor [\-\-list] +.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-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vimtutor-it.UTF-8.1 2024-08-30 10:46:21.688161366 +0200 -@@ -4,6 +4,8 @@ vimtutor \- Un breve corso introduttivo - .SH SINTASSI +--- vim91/runtime/doc/vimtutor-it.UTF-8.1.manpagefixes 2024-11-15 06:34:57.871102041 +0100 ++++ vim91/runtime/doc/vimtutor-it.UTF-8.1 2024-11-15 06:36:59.673180945 +0100 +@@ -8,6 +8,8 @@ vimtutor \- Un breve corso introduttivo + .B vimtutor [\-h | \-\-help] .br - .B vimtutor [\-g] [lingua] + .B vimtutor [\-\-list] +.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-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vimtutor.man 2024-08-30 10:46:21.688161366 +0200 -@@ -7,6 +7,7 @@ NAME - - SYNOPSIS - vimtutor [-g] [language] +--- vim91/runtime/doc/vimtutor.man.manpagefixes 2024-11-15 06:34:57.871102041 +0100 ++++ vim91/runtime/doc/vimtutor.man 2024-11-15 06:37:21.673037169 +0100 +@@ -8,6 +8,7 @@ SYNOPSIS + [ISO639] + vimtutor [-h | --help] + vimtutor [--list] + gvimtutor DESCRIPTION - Vimtutor starts the Vim tutor. It copies the tutor file first, so that + 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-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vimtutor-pl.1 2024-08-30 10:46:21.688161366 +0200 +--- vim91/runtime/doc/vimtutor-pl.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vimtutor-pl.1 2024-11-15 06:34:57.871102041 +0100 @@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima .SH SYNOPSIS .br @@ -269,8 +269,8 @@ diff -up vim91/runtime/doc/vimtutor-pl.1.manpagefixes vim91/runtime/doc/vimtutor .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-08-30 10:38:11.000000000 +0200 -+++ vim91/runtime/doc/vimtutor-pl.UTF-8.1 2024-08-30 10:46:21.689161359 +0200 +--- 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-15 06:34:57.871102041 +0100 @@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima .SH SYNOPSIS .br @@ -281,8 +281,8 @@ diff -up vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vi .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-08-30 10:46:21.689161359 +0200 -+++ vim91/runtime/doc/vimtutor-ru.1 2024-08-30 10:49:28.122985860 +0200 +--- vim91/runtime/doc/vimtutor-ru.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vimtutor-ru.1 2024-11-15 06:34:57.871102041 +0100 @@ -4,6 +4,8 @@ .SH ëòáôëéê ïâúïò .br @@ -293,8 +293,8 @@ diff -up vim91/runtime/doc/vimtutor-ru.1.manpagefixes vim91/runtime/doc/vimtutor ðÏ ËÏÍÁÎÄÅ .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-08-30 10:46:21.689161359 +0200 -+++ vim91/runtime/doc/vimtutor-ru.UTF-8.1 2024-08-30 10:50:11.634711513 +0200 +--- vim91/runtime/doc/vimtutor-ru.UTF-8.1.manpagefixes 2024-11-15 06:32:23.000000000 +0100 ++++ vim91/runtime/doc/vimtutor-ru.UTF-8.1 2024-11-15 06:34:57.871102041 +0100 @@ -7,6 +7,8 @@ Программа vimtutor \[em] вып .SH ОПИСÐÐИЕ По команде diff --git a/vim.spec b/vim.spec index 2deee032..d6d00362 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 825 +%define patchlevel 866 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1073,6 +1073,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Nov 15 2024 Zdenek Dohnal - 2:9.1.866-1 +- patchlevel 866 + * Fri Nov 01 2024 Zdenek Dohnal - 2:9.1.825-1 - patchlevel 825 From 85975376534393a3a84976dbef2ac1d6f6b0410c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 29 Nov 2024 12:10:50 +0100 Subject: [PATCH 270/324] - patchlevel 895 --- sources | 2 +- vim-manpagefixes-948566.patch | 60 +++++++++++++++++------------------ vim.spec | 5 ++- 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/sources b/sources index d12dbfc2..3b023a7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-866.tar.bz2) = c2ce23170cf5530df80542440e98b678e19147a5ee70878d66b28e0e78e26e665122f9decea8f37034ba354e14726eaa2939981952b0e2f82a1e887a82583f9e +SHA512 (vim-9.1-895.tar.bz2) = 8613646a654632abbe963b3deb78e23fb3cc2be4c18eccfda63b3066813e9f8f2b24fa5a731c7bdfbcb39c74322c82e82e363ad9b25f4a828ad4990714543dfa diff --git a/vim-manpagefixes-948566.patch b/vim-manpagefixes-948566.patch index cad76e36..c0806d65 100644 --- a/vim-manpagefixes-948566.patch +++ b/vim-manpagefixes-948566.patch @@ -1,6 +1,6 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1 ---- vim91/runtime/doc/vim.1.manpagefixes 2024-11-15 06:34:57.866102079 +0100 -+++ vim91/runtime/doc/vim.1 2024-11-15 06:34:57.868102064 +0100 +--- 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 .PP .br @@ -44,7 +44,7 @@ diff -up vim91/runtime/doc/vim.1.manpagefixes vim91/runtime/doc/vim.1 .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-15 06:34:57.868102064 +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 .PP .br @@ -61,7 +61,7 @@ diff -up vim91/runtime/doc/vim-fr.1.manpagefixes vim91/runtime/doc/vim-fr.1 .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-15 06:34:57.868102064 +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 .PP .br @@ -78,7 +78,7 @@ diff -up vim91/runtime/doc/vim-fr.UTF-8.1.manpagefixes vim91/runtime/doc/vim-fr. .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-15 06:34:57.869102056 +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 .PP .br @@ -95,7 +95,7 @@ diff -up vim91/runtime/doc/vim-it.1.manpagefixes vim91/runtime/doc/vim-it.1 .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-15 06:34:57.869102056 +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 .PP .br @@ -112,7 +112,7 @@ diff -up vim91/runtime/doc/vim-it.UTF-8.1.manpagefixes vim91/runtime/doc/vim-it. .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-15 06:34:57.869102056 +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] @@ -143,7 +143,7 @@ diff -up vim91/runtime/doc/vim.man.manpagefixes vim91/runtime/doc/vim.man 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-15 06:34:57.869102056 +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 .PP .br @@ -160,7 +160,7 @@ diff -up vim91/runtime/doc/vim-pl.1.manpagefixes vim91/runtime/doc/vim-pl.1 .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-15 06:34:57.869102056 +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 .PP .br @@ -177,7 +177,7 @@ diff -up vim91/runtime/doc/vim-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vim-pl. .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-15 06:34:57.870102048 +0100 ++++ vim91/runtime/doc/vim-ru.1 2024-11-29 12:17:53.558382649 +0100 @@ -18,11 +18,13 @@ .PP .br @@ -194,7 +194,7 @@ diff -up vim91/runtime/doc/vim-ru.1.manpagefixes vim91/runtime/doc/vim-ru.1 .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-15 06:34:57.870102048 +0100 ++++ vim91/runtime/doc/vim-ru.UTF-8.1 2024-11-29 12:17:53.558382649 +0100 @@ -18,11 +18,13 @@ программиÑтов. .PP .br @@ -210,8 +210,8 @@ diff -up vim91/runtime/doc/vim-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vim-ru. .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:34:57.870102048 +0100 -+++ vim91/runtime/doc/vimtutor.1 2024-11-15 06:36:03.320603026 +0100 +--- 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] .br @@ -222,8 +222,8 @@ diff -up vim91/runtime/doc/vimtutor.1.manpagefixes vim91/runtime/doc/vimtutor.1 .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:34:57.870102048 +0100 -+++ vim91/runtime/doc/vimtutor-it.1 2024-11-15 06:36:36.103353076 +0100 +--- 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] .br @@ -234,8 +234,8 @@ diff -up vim91/runtime/doc/vimtutor-it.1.manpagefixes vim91/runtime/doc/vimtutor .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:34:57.871102041 +0100 -+++ vim91/runtime/doc/vimtutor-it.UTF-8.1 2024-11-15 06:36:59.673180945 +0100 +--- 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] .br @@ -246,8 +246,8 @@ diff -up vim91/runtime/doc/vimtutor-it.UTF-8.1.manpagefixes vim91/runtime/doc/vi .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:34:57.871102041 +0100 -+++ vim91/runtime/doc/vimtutor.man 2024-11-15 06:37:21.673037169 +0100 +--- 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] @@ -258,7 +258,7 @@ diff -up vim91/runtime/doc/vimtutor.man.manpagefixes vim91/runtime/doc/vimtutor. 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-15 06:34:57.871102041 +0100 ++++ vim91/runtime/doc/vimtutor-pl.1 2024-11-29 12:17:53.559382639 +0100 @@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima .SH SYNOPSIS .br @@ -270,7 +270,7 @@ diff -up vim91/runtime/doc/vimtutor-pl.1.manpagefixes vim91/runtime/doc/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-15 06:34:57.871102041 +0100 ++++ vim91/runtime/doc/vimtutor-pl.UTF-8.1 2024-11-29 12:17:53.560382630 +0100 @@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima .SH SYNOPSIS .br @@ -281,21 +281,21 @@ diff -up vim91/runtime/doc/vimtutor-pl.UTF-8.1.manpagefixes vim91/runtime/doc/vi .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-15 06:32:23.000000000 +0100 -+++ vim91/runtime/doc/vimtutor-ru.1 2024-11-15 06:34:57.871102041 +0100 -@@ -4,6 +4,8 @@ - .SH ëòáôëéê ïâúïò +--- 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] .br - .B vimtutor [\-g] [ÑÚÙË] + .B vimtutor [\-\-list] +.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-15 06:32:23.000000000 +0100 -+++ vim91/runtime/doc/vimtutor-ru.UTF-8.1 2024-11-15 06:34:57.871102041 +0100 -@@ -7,6 +7,8 @@ Программа vimtutor \[em] вып +--- 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] вып .SH ОПИСÐÐИЕ По команде .B vimtutor @@ -303,4 +303,4 @@ diff -up vim91/runtime/doc/vimtutor-ru.UTF-8.1.manpagefixes vim91/runtime/doc/vi +.B gvimtutor выполнÑетÑÑ Ð·Ð°Ð¿ÑƒÑк редактора .B Vim. - Ñ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ð¼ файлом, Ñодержащем текÑÑ‚ учебника. Ðо перед Ñтим проиÑходит + Ñ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ð¼ файлом, Ñодержащем текÑÑ‚ учебника. diff --git a/vim.spec b/vim.spec index d6d00362..74cc793b 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 866 +%define patchlevel 895 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1073,6 +1073,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Nov 29 2024 Zdenek Dohnal - 2:9.1.895-1 +- patchlevel 895 + * Fri Nov 15 2024 Zdenek Dohnal - 2:9.1.866-1 - patchlevel 866 From 0588de6cc35720c922e1993fa5b650769e5426de Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 6 Dec 2024 06:44:19 +0100 Subject: [PATCH 271/324] - patchlevel 906 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 3b023a7b..40c0d2cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-895.tar.bz2) = 8613646a654632abbe963b3deb78e23fb3cc2be4c18eccfda63b3066813e9f8f2b24fa5a731c7bdfbcb39c74322c82e82e363ad9b25f4a828ad4990714543dfa +SHA512 (vim-9.1-906.tar.bz2) = 8fcd355891bd6e2f39a682b32bfdfd50f7e0a52a67b4926d755fd1d38457c3f87e979f34df2801c199e7a432c999a4451be90a11fe56da6c7e393f7e963f5919 diff --git a/vim.spec b/vim.spec index 74cc793b..d5a410c5 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 895 +%define patchlevel 906 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1073,6 +1073,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Dec 06 2024 Zdenek Dohnal - 2:9.1.906-1 +- patchlevel 906 + * Fri Nov 29 2024 Zdenek Dohnal - 2:9.1.895-1 - patchlevel 895 From 979b4a07c7f493f911776a23c8daefdee5ac695f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 6 Dec 2024 07:14:54 +0100 Subject: [PATCH 272/324] UTF-8 tutor files are shipped upstream now, remove the workaround --- vim.spec | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/vim.spec b/vim.spec index d5a410c5..bbd1f793 100644 --- a/vim.spec +++ b/vim.spec @@ -740,30 +740,6 @@ rm %{buildroot}/%{_datadir}/icons/{hicolor,locolor}/*/apps/gvim.png ln -sf menu_ja_jp.ujis.vim menu_ja_jp.eucjp.vim ) ) -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 \ From 2b538aae6bc79546ce0145edde2dbc840281a25d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 13 Dec 2024 10:26:18 +0100 Subject: [PATCH 273/324] - patchlevel 919 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 40c0d2cf..26f5da68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-906.tar.bz2) = 8fcd355891bd6e2f39a682b32bfdfd50f7e0a52a67b4926d755fd1d38457c3f87e979f34df2801c199e7a432c999a4451be90a11fe56da6c7e393f7e963f5919 +SHA512 (vim-9.1-919.tar.bz2) = 1186107b4b4be3ec03cb369b5a788ec479732c6c7165c455ec7c0fccdc96dc6c82d1899c1e7590bb982c9d027c573fd60a7aa3f306920354ba065ffe4335d309 diff --git a/vim.spec b/vim.spec index bbd1f793..ba1aa988 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 906 +%define patchlevel 919 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1049,6 +1049,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Dec 13 2024 Zdenek Dohnal - 2:9.1.919-1 +- patchlevel 919 + * Fri Dec 06 2024 Zdenek Dohnal - 2:9.1.906-1 - patchlevel 906 From 86fb2418b66bfa855bebf1e62bf5806983a20374 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 3 Jan 2025 08:24:52 +0100 Subject: [PATCH 274/324] - patchlevel 984 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 26f5da68..64eeb5d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-919.tar.bz2) = 1186107b4b4be3ec03cb369b5a788ec479732c6c7165c455ec7c0fccdc96dc6c82d1899c1e7590bb982c9d027c573fd60a7aa3f306920354ba065ffe4335d309 +SHA512 (vim-9.1-984.tar.bz2) = d0c0e05a5d6d7d1ecac60e7afe85113c50d27393574dd584b38353fcd97b767d265a9b759953cb442ab4992afc374d67c2d6099c7d574e9d25d3c3823b689add diff --git a/vim.spec b/vim.spec index ba1aa988..af56a276 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 919 +%define patchlevel 984 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1049,6 +1049,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Jan 03 2025 Zdenek Dohnal - 2:9.1.984-1 +- patchlevel 984 + * Fri Dec 13 2024 Zdenek Dohnal - 2:9.1.919-1 - patchlevel 919 From 684593869b56d35d586c6fcecef59aa46087c1c3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 10 Jan 2025 08:15:27 +0100 Subject: [PATCH 275/324] - patchlevel 1000 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 64eeb5d7..bf412165 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-984.tar.bz2) = d0c0e05a5d6d7d1ecac60e7afe85113c50d27393574dd584b38353fcd97b767d265a9b759953cb442ab4992afc374d67c2d6099c7d574e9d25d3c3823b689add +SHA512 (vim-9.1-1000.tar.bz2) = bba60832d5d8badde45903172258bb21cf53f4f4da9f3ff54c4bf4144789513782a5e8c004741434a44a04b3f5bf33c1e5ce415c155f15836cc90b0677acf1c0 diff --git a/vim.spec b/vim.spec index af56a276..ba7590d2 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 984 +%define patchlevel 1000 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1049,6 +1049,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Jan 10 2025 Zdenek Dohnal - 2:9.1.1000-1 +- patchlevel 1000 + * Fri Jan 03 2025 Zdenek Dohnal - 2:9.1.984-1 - patchlevel 984 From 7b5d01f395fd03554ba90ac64f034dfad96d68fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:20:16 +0000 Subject: [PATCH 276/324] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index ba7590d2..fb96b5db 100644 --- a/vim.spec +++ b/vim.spec @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -1049,6 +1049,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2:9.1.1000-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jan 10 2025 Zdenek Dohnal - 2:9.1.1000-1 - patchlevel 1000 From c8221c1d7093a7029489d7336cb37494f3f7c742 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 3 Feb 2025 10:40:53 +0100 Subject: [PATCH 277/324] Fix FTBFS (fedora#2341508) --- vim.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index fb96b5db..68e88bef 100644 --- a/vim.spec +++ b/vim.spec @@ -432,8 +432,12 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk cd src autoconf -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" +# 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" cp -f os_unix.h os_unix.h.save @@ -1049,6 +1053,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Mon Feb 03 2025 Zdenek Dohnal - 2:9.1.1000-2 +- Fix FTBFS (fedora#2341508) + * Sun Jan 19 2025 Fedora Release Engineering - 2:9.1.1000-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3264af98a29ca82fed49bcf699b13c01491d7ac8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 7 Feb 2025 09:15:23 +0100 Subject: [PATCH 278/324] F42 got branched --- vim-update.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 62d68f7a..900bdac8 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f41" "f40" ) -releases=( "fc42" "fc41" "fc40" ) +branches=( "rawhide" "f42" "f41" "f40" ) +releases=( "fc43" "fc42" "fc41" "fc40" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc42" "fc41" "\|fc40" ) -bodhi_enabled=( "0" "1" "1" ) +regexps=( "fc43" "fc42" "fc41" "\|fc40" ) +bodhi_enabled=( "0" "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 @@ -123,9 +123,9 @@ if [ $CHANGES -ne 0 ]; then $debug fedpkg switch-branch $branch # merge with previous branch - $debug bash -c "git merge ${branches[@]: $branches_index: 1} <<<':x'" + $debug bash -c "git merge rawhide <<<':x'" if [ $? -ne 0 ]; then - echo "Error: git merge ${branches[@]: $branches_index: 1}" + echo "Error: git merge rawhide" exit 1 fi From 86fcebd96b5b68083e229f9d43183dc9bd39de2d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 7 Feb 2025 09:18:04 +0100 Subject: [PATCH 279/324] - patchlevel 1081 --- sources | 2 +- vim.spec | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sources b/sources index bf412165..b654a822 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1000.tar.bz2) = bba60832d5d8badde45903172258bb21cf53f4f4da9f3ff54c4bf4144789513782a5e8c004741434a44a04b3f5bf33c1e5ce415c155f15836cc90b0677acf1c0 +SHA512 (vim-9.1-1081.tar.bz2) = 57e514d1d288178be8ec1cab24291b366101727420ba6086f0de57f17f8b90ad3069932883ea21a2eebeccaa80fa460d0d7f96d1276cccc4ead500e28f65c842 diff --git a/vim.spec b/vim.spec index 68e88bef..84c9ef95 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1000 +%define patchlevel 1081 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -597,7 +597,6 @@ 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 runtime/doc/uganda.txt LICENSE # Those aren't Linux info files but some binary files for Amiga: rm -f README*.info @@ -799,6 +798,12 @@ 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 + # Refresh documentation helptags %transfiletriggerin common -- %{_datadir}/%{name}/vimfiles/doc @@ -1053,6 +1058,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog +* Fri Feb 07 2025 Zdenek Dohnal - 2:9.1.1081-1 +- patchlevel 1081 + * Mon Feb 03 2025 Zdenek Dohnal - 2:9.1.1000-2 - Fix FTBFS (fedora#2341508) From 12bccb38efa972567394e0ca70a3c77130894f3b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 19 Feb 2025 11:28:21 +0100 Subject: [PATCH 280/324] vim-update.sh: F42 got enabled --- vim-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 900bdac8..61f7965d 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -5,8 +5,8 @@ branches=( "rawhide" "f42" "f41" "f40" ) releases=( "fc43" "fc42" "fc41" "fc40" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc43" "fc42" "fc41" "\|fc40" ) -bodhi_enabled=( "0" "0" "1" "1" ) +regexps=( "fc43" "fc42" "\|fc41" "\|fc40" ) +bodhi_enabled=( "0" "1" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From 86eb060916dbe9dac270594bd00307d2d9289b94 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 19 Feb 2025 11:29:37 +0100 Subject: [PATCH 281/324] - patchlevel 1122 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b654a822..d597d56a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1081.tar.bz2) = 57e514d1d288178be8ec1cab24291b366101727420ba6086f0de57f17f8b90ad3069932883ea21a2eebeccaa80fa460d0d7f96d1276cccc4ead500e28f65c842 +SHA512 (vim-9.1-1122.tar.bz2) = 3f994b72e252058cc035fe2393a3f93ce13a446a5376f8ebdc36a5fe01a60bfcfdc6db7232f3b255f76fd5c09817e5801a7d1258a10405192b143e06fe447e56 diff --git a/vim.spec b/vim.spec index 84c9ef95..927ba7ea 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1081 +%define patchlevel 1122 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1058,6 +1058,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Wed Feb 19 2025 Zdenek Dohnal - 2:9.1.1122-1 +- patchlevel 1122 + * Fri Feb 07 2025 Zdenek Dohnal - 2:9.1.1081-1 - patchlevel 1081 From 0c440c2c789cbabbd914925353b0cd0d1597aa24 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 4 Mar 2025 15:37:53 +0100 Subject: [PATCH 282/324] - patchlevel 1169 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d597d56a..6425b39c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1122.tar.bz2) = 3f994b72e252058cc035fe2393a3f93ce13a446a5376f8ebdc36a5fe01a60bfcfdc6db7232f3b255f76fd5c09817e5801a7d1258a10405192b143e06fe447e56 +SHA512 (vim-9.1-1169.tar.bz2) = df499768436f0da50870eba4bd6e0eac130923f280cfa6d06eb17f78467c27080915489c08b5fc782e3c79270313621141df7b3a6fc984eee97c99ec3cb6bebf diff --git a/vim.spec b/vim.spec index 927ba7ea..17f3e789 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1122 +%define patchlevel 1169 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1058,6 +1058,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Tue Mar 04 2025 Zdenek Dohnal - 2:9.1.1169-1 +- patchlevel 1169 + * Wed Feb 19 2025 Zdenek Dohnal - 2:9.1.1122-1 - patchlevel 1122 From 100943a3bfaaa7cf915600ba64ff59e02424068d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 7 Mar 2025 10:51:40 +0100 Subject: [PATCH 283/324] - patchlevel 1179 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6425b39c..8dec141a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1169.tar.bz2) = df499768436f0da50870eba4bd6e0eac130923f280cfa6d06eb17f78467c27080915489c08b5fc782e3c79270313621141df7b3a6fc984eee97c99ec3cb6bebf +SHA512 (vim-9.1-1179.tar.bz2) = 39441e65b87e59419b4e1162e5d648a98d35350348e81d7b2af70582058a8edd88cfecd0b37f08f83c19a0702f375ef7a82324f21de60c30b3f984b5cd1bebc1 diff --git a/vim.spec b/vim.spec index 17f3e789..383e79a0 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1169 +%define patchlevel 1179 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1058,6 +1058,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Fri Mar 07 2025 Zdenek Dohnal - 2:9.1.1179-1 +- patchlevel 1179 + * Tue Mar 04 2025 Zdenek Dohnal - 2:9.1.1169-1 - patchlevel 1169 From 29d7ff0bb5531b2055769c8c43014334c962abd5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 14 Mar 2025 07:45:12 +0100 Subject: [PATCH 284/324] - patchlevel 1202 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 8dec141a..d57aa5f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1179.tar.bz2) = 39441e65b87e59419b4e1162e5d648a98d35350348e81d7b2af70582058a8edd88cfecd0b37f08f83c19a0702f375ef7a82324f21de60c30b3f984b5cd1bebc1 +SHA512 (vim-9.1-1202.tar.bz2) = 61cf964a64054d9cddaf99095b5216ae2dad5052e5c0624995038a293de04c6d05c6d149304a31c54455cf88d4af3a245ff397f6efcab67517bde1dd47eee19c diff --git a/vim.spec b/vim.spec index 383e79a0..a8b41311 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1179 +%define patchlevel 1202 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1058,6 +1058,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Fri Mar 14 2025 Zdenek Dohnal - 2:9.1.1202-1 +- patchlevel 1202 + * Fri Mar 07 2025 Zdenek Dohnal - 2:9.1.1179-1 - patchlevel 1179 From 6801a39cd4106920e0a38991fa6c84913559d3fa Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 21 Mar 2025 06:16:17 +0100 Subject: [PATCH 285/324] - patchlevel 1227 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d57aa5f0..ce914fa1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1202.tar.bz2) = 61cf964a64054d9cddaf99095b5216ae2dad5052e5c0624995038a293de04c6d05c6d149304a31c54455cf88d4af3a245ff397f6efcab67517bde1dd47eee19c +SHA512 (vim-9.1-1227.tar.bz2) = d1b0ece854a35ac0fc608a9fc31be634c09e0f856428c3678854fa3ba9338fa1d64794537a3eac809bba4599bc8831c516ad01a91977cc1cb56a383baec21e24 diff --git a/vim.spec b/vim.spec index a8b41311..d55116ef 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1202 +%define patchlevel 1227 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1058,6 +1058,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Fri Mar 21 2025 Zdenek Dohnal - 2:9.1.1227-1 +- patchlevel 1227 + * Fri Mar 14 2025 Zdenek Dohnal - 2:9.1.1202-1 - patchlevel 1202 From 6b7fbb962167ef788ab7de4a96e08f5c1e89ee61 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 4 Apr 2025 09:15:50 +0200 Subject: [PATCH 286/324] - patchlevel 1275 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index ce914fa1..719c6080 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1227.tar.bz2) = d1b0ece854a35ac0fc608a9fc31be634c09e0f856428c3678854fa3ba9338fa1d64794537a3eac809bba4599bc8831c516ad01a91977cc1cb56a383baec21e24 +SHA512 (vim-9.1-1275.tar.bz2) = 211952ff0876cd271059b7c332cdfa2147458ca5b3074f8206e58a15bc07ba495d501a2d98e96c1a4012c6bdfa893cc1ac4e250e9708400e8a103acea292e831 diff --git a/vim.spec b/vim.spec index d55116ef..e5929571 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1227 +%define patchlevel 1275 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1058,6 +1058,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Fri Apr 04 2025 Zdenek Dohnal - 2:9.1.1275-1 +- patchlevel 1275 + * Fri Mar 21 2025 Zdenek Dohnal - 2:9.1.1227-1 - patchlevel 1227 From e4e37842bf66b8d650df20a04cdd7245aad3cb50 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 11 Apr 2025 06:57:36 +0200 Subject: [PATCH 287/324] - patchlevel 1291 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 719c6080..60fb1b97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1275.tar.bz2) = 211952ff0876cd271059b7c332cdfa2147458ca5b3074f8206e58a15bc07ba495d501a2d98e96c1a4012c6bdfa893cc1ac4e250e9708400e8a103acea292e831 +SHA512 (vim-9.1-1291.tar.bz2) = 66b9f4f81e33f3e9ef61e8e9d792d5f0896833912434c204697b71686a4d21996d1030a4a2549f3d82f7be3f47578fed87f12b9b2b2a4473bf695c164f8851c6 diff --git a/vim.spec b/vim.spec index e5929571..d703d848 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1275 +%define patchlevel 1291 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1058,6 +1058,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Fri Apr 11 2025 Zdenek Dohnal - 2:9.1.1291-1 +- patchlevel 1291 + * Fri Apr 04 2025 Zdenek Dohnal - 2:9.1.1275-1 - patchlevel 1275 From ca6e36ab213b11203b9e0300fde205106a6e389c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 30 May 2025 09:49:03 +0200 Subject: [PATCH 288/324] F40 is EOL --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 61f7965d..81b69dee 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f42" "f41" "f40" ) -releases=( "fc43" "fc42" "fc41" "fc40" ) +branches=( "rawhide" "f42" "f41" ) +releases=( "fc43" "fc42" "fc41" ) # the first bodhi enabled release is the last without \| - all # others need to have \| -regexps=( "fc43" "fc42" "\|fc41" "\|fc40" ) -bodhi_enabled=( "0" "1" "1" "1" ) +regexps=( "fc43" "fc42" "\|fc41" ) +bodhi_enabled=( "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From f158e7ec35e8d4d8c8911f9ca2feb4ad4ccac5a5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 30 May 2025 09:50:27 +0200 Subject: [PATCH 289/324] - patchlevel 1418 --- sources | 2 +- vim-8.0-copy-paste.patch | 40 ++++++++++++++++++---------------------- vim.spec | 7 +++++-- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/sources b/sources index 60fb1b97..d7ebfd85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1291.tar.bz2) = 66b9f4f81e33f3e9ef61e8e9d792d5f0896833912434c204697b71686a4d21996d1030a4a2549f3d82f7be3f47578fed87f12b9b2b2a4473bf695c164f8851c6 +SHA512 (vim-9.1-1418.tar.bz2) = c4efb023d47221f42bcbf63f577fe4356fe3c4ee75ddd453a029c2914a0cd2bd4de63c57d89bfd54ca5a7ecdc1812851645c798df311ec3ab6ef911461456da5 diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch index a1487d12..c85f1544 100644 --- a/vim-8.0-copy-paste.patch +++ b/vim-8.0-copy-paste.patch @@ -1,8 +1,7 @@ -diff --git a/runtime/defaults.vim b/runtime/defaults.vim -index ff8ce8e..2ed8542 100644 ---- a/runtime/defaults.vim -+++ b/runtime/defaults.vim -@@ -75,18 +75,6 @@ sunmap Q +diff -up vim91/runtime/defaults.vim.copypaste vim91/runtime/defaults.vim +--- vim91/runtime/defaults.vim.copypaste 2025-05-30 09:49:31.000000000 +0200 ++++ vim91/runtime/defaults.vim 2025-05-30 09:57:03.715615959 +0200 +@@ -70,18 +70,6 @@ sunmap Q " Revert with ":iunmap ". inoremap u @@ -21,23 +20,21 @@ index ff8ce8e..2ed8542 100644 " Only do this part when Vim was compiled with the +eval feature. if 1 -diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim -index 80d5831..713f580 100644 ---- a/src/testdir/test_balloon.vim -+++ b/src/testdir/test_balloon.vim -@@ -9,6 +9,7 @@ source screendump.vim - CheckScreendump +diff -up vim91/src/testdir/test_balloon.vim.copypaste vim91/src/testdir/test_balloon.vim +--- vim91/src/testdir/test_balloon.vim.copypaste 2025-05-30 09:57:03.715773219 +0200 ++++ vim91/src/testdir/test_balloon.vim 2025-05-30 09:58:51.344389890 +0200 +@@ -8,6 +8,7 @@ CheckFeature balloon_eval_term + source 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 --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim -index d930133..0c74032 100644 ---- a/src/testdir/test_popup.vim -+++ b/src/testdir/test_popup.vim -@@ -945,6 +945,7 @@ func Test_mouse_popup_position() +diff -up vim91/src/testdir/test_popup.vim.copypaste vim91/src/testdir/test_popup.vim +--- vim91/src/testdir/test_popup.vim.copypaste 2025-05-30 09:49:32.000000000 +0200 ++++ vim91/src/testdir/test_popup.vim 2025-05-30 09:57:03.716006063 +0200 +@@ -959,6 +959,7 @@ func Test_mouse_popup_position() let script =<< trim END set mousemodel=popup_setpos source $VIMRUNTIME/menu.vim @@ -45,10 +42,9 @@ index d930133..0c74032 100644 call setline(1, join(range(20))) func Trigger(col) call test_setmouse(1, a:col) -diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim -index 64aa654..1a1261c 100644 ---- a/src/testdir/test_popupwin.vim -+++ b/src/testdir/test_popupwin.vim +diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_popupwin.vim +--- vim91/src/testdir/test_popupwin.vim.copypaste 2025-05-30 09:49:32.000000000 +0200 ++++ vim91/src/testdir/test_popupwin.vim 2025-05-30 09:57:03.716358043 +0200 @@ -558,6 +558,7 @@ func Test_popup_drag() " create a popup that covers the command line let lines =<< trim END @@ -81,7 +77,7 @@ index 64aa654..1a1261c 100644 " With border, can click on X let winid = popup_create('foobar', #{ \ close: 'button', -@@ -1559,6 +1563,7 @@ func Test_popup_beval() +@@ -1560,6 +1564,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') @@ -89,7 +85,7 @@ index 64aa654..1a1261c 100644 set balloonevalterm set balloonexpr=BalloonExpr() set balloondelay=100 -@@ -2255,6 +2260,7 @@ func Test_popup_scrollbar() +@@ -2270,6 +2275,7 @@ func Test_popup_scrollbar() let lines =<< trim END call setline(1, range(1, 20)) diff --git a/vim.spec b/vim.spec index d703d848..a19d8140 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1291 +%define patchlevel 1418 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -844,7 +844,6 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %endif %lang(af) %{_datadir}/%{name}/%{vimdir}/lang/af -%lang(am) %{_datadir}/%{name}/%{vimdir}/lang/am %lang(ca) %{_datadir}/%{name}/%{vimdir}/lang/ca %lang(cs) %{_datadir}/%{name}/%{vimdir}/lang/cs %lang(cs.cp1250) %{_datadir}/%{name}/%{vimdir}/lang/cs.cp1250 @@ -857,6 +856,7 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %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 @@ -1058,6 +1058,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Fri May 30 2025 Zdenek Dohnal - 2:9.1.1418-1 +- patchlevel 1418 + * Fri Apr 11 2025 Zdenek Dohnal - 2:9.1.1291-1 - patchlevel 1291 From d1c415d03600b15b9a182da4f7b46285c77760e1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 6 Jun 2025 07:03:55 +0200 Subject: [PATCH 290/324] - patchlevel 1435 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d7ebfd85..29399985 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1418.tar.bz2) = c4efb023d47221f42bcbf63f577fe4356fe3c4ee75ddd453a029c2914a0cd2bd4de63c57d89bfd54ca5a7ecdc1812851645c798df311ec3ab6ef911461456da5 +SHA512 (vim-9.1-1435.tar.bz2) = 467a45ddbaa24639e307e1a135852a77326f467d44d6863d94e85487b5b16e6ca8b0b6da0ac70aba7c25754f04f85a5c6a64baa7ca878741d244c3afc8efb5a9 diff --git a/vim.spec b/vim.spec index a19d8140..92069150 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1418 +%define patchlevel 1435 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1058,6 +1058,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Fri Jun 06 2025 Zdenek Dohnal - 2:9.1.1435-1 +- patchlevel 1435 + * Fri May 30 2025 Zdenek Dohnal - 2:9.1.1418-1 - patchlevel 1418 From 4d63e8a53c29ec5904e14127d7a9039f794c5a8d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 19 Jun 2025 14:50:43 +0200 Subject: [PATCH 291/324] FTBFS with Python 3.14 (fedora#2373314) --- vim-py314-nogetsize.patch | 35 +++++++++++++++++++++++++++++++++++ vim.spec | 9 ++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 vim-py314-nogetsize.patch diff --git a/vim-py314-nogetsize.patch b/vim-py314-nogetsize.patch new file mode 100644 index 00000000..e5a1c194 --- /dev/null +++ b/vim-py314-nogetsize.patch @@ -0,0 +1,35 @@ +diff --git a/src/if_py_both.h b/src/if_py_both.h +index ed66254ff..7fc055db5 100644 +--- a/src/if_py_both.h ++++ b/src/if_py_both.h +@@ -2409,18 +2409,18 @@ DictionaryUpdate(DictionaryObject *self, PyObject *args, PyObject *kwargs) + + Py_DECREF(item); + +- if (PySequence_Fast_GET_SIZE(fast) != 2) ++ if (PySequence_Size(fast) != 2) + { + Py_DECREF(iterator); + Py_DECREF(fast); + PyErr_FORMAT(PyExc_ValueError, + N_("expected sequence element of size 2, " + "but got sequence of size %d"), +- (int) PySequence_Fast_GET_SIZE(fast)); ++ (int) PySequence_Size(fast)); + return NULL; + } + +- keyObject = PySequence_Fast_GET_ITEM(fast, 0); ++ keyObject = PySequence_GetItem(fast, 0); + + if (!(key = StringToChars(keyObject, &todecref))) + { +@@ -2442,7 +2442,7 @@ DictionaryUpdate(DictionaryObject *self, PyObject *args, PyObject *kwargs) + } + di->di_tv.v_type = VAR_UNKNOWN; + +- valObject = PySequence_Fast_GET_ITEM(fast, 1); ++ valObject = PySequence_GetItem(fast, 1); + + if (ConvertFromPyObject(valObject, &di->di_tv) == -1) + { diff --git a/vim.spec b/vim.spec index 92069150..fa25cf7e 100644 --- a/vim.spec +++ b/vim.spec @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -99,6 +99,9 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch +# PySequence_Fast_{GET_ITEM,GET_SIZE} removed from stable API +# https://github.com/vim/vim/pull/17575 +Patch3006: vim-py314-nogetsize.patch # uses autoconf in spec file @@ -426,6 +429,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch -P 3003 -p1 -b .python-tests %patch -P 3004 -p1 -b .fips-warning %patch -P 3005 -p1 -b .copypaste +%patch -P 3006 -p1 -b .py314-noget %build @@ -1058,6 +1062,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Thu Jun 19 2025 Zdenek Dohnal - 2:9.1.1435-2 +- FTBFS with Python 3.14 (fedora#2373314) + * Fri Jun 06 2025 Zdenek Dohnal - 2:9.1.1435-1 - patchlevel 1435 From 47571c96d79c5e527ac0e2be6a5a7e0f219f1a38 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 27 Jun 2025 06:44:47 +0200 Subject: [PATCH 292/324] - patchlevel 1484 --- sources | 2 +- vim-py314-nogetsize.patch | 35 ----------------------------------- vim.spec | 11 +++++------ 3 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 vim-py314-nogetsize.patch diff --git a/sources b/sources index 29399985..be4a7a18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1435.tar.bz2) = 467a45ddbaa24639e307e1a135852a77326f467d44d6863d94e85487b5b16e6ca8b0b6da0ac70aba7c25754f04f85a5c6a64baa7ca878741d244c3afc8efb5a9 +SHA512 (vim-9.1-1484.tar.bz2) = 0c11afd56b0d2d1be61be3be401d30850a2172da52b50ad1a8919bcf59d3a29eeb9a92153f077d7e2596e32f0c2c53ea68a299b2bb36caa5e73ec29859a9d346 diff --git a/vim-py314-nogetsize.patch b/vim-py314-nogetsize.patch deleted file mode 100644 index e5a1c194..00000000 --- a/vim-py314-nogetsize.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/if_py_both.h b/src/if_py_both.h -index ed66254ff..7fc055db5 100644 ---- a/src/if_py_both.h -+++ b/src/if_py_both.h -@@ -2409,18 +2409,18 @@ DictionaryUpdate(DictionaryObject *self, PyObject *args, PyObject *kwargs) - - Py_DECREF(item); - -- if (PySequence_Fast_GET_SIZE(fast) != 2) -+ if (PySequence_Size(fast) != 2) - { - Py_DECREF(iterator); - Py_DECREF(fast); - PyErr_FORMAT(PyExc_ValueError, - N_("expected sequence element of size 2, " - "but got sequence of size %d"), -- (int) PySequence_Fast_GET_SIZE(fast)); -+ (int) PySequence_Size(fast)); - return NULL; - } - -- keyObject = PySequence_Fast_GET_ITEM(fast, 0); -+ keyObject = PySequence_GetItem(fast, 0); - - if (!(key = StringToChars(keyObject, &todecref))) - { -@@ -2442,7 +2442,7 @@ DictionaryUpdate(DictionaryObject *self, PyObject *args, PyObject *kwargs) - } - di->di_tv.v_type = VAR_UNKNOWN; - -- valObject = PySequence_Fast_GET_ITEM(fast, 1); -+ valObject = PySequence_GetItem(fast, 1); - - if (ConvertFromPyObject(valObject, &di->di_tv) == -1) - { diff --git a/vim.spec b/vim.spec index fa25cf7e..4d039c36 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1435 +%define patchlevel 1484 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -99,9 +99,6 @@ Patch3003: vim-python3-tests.patch Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) Patch3005: vim-8.0-copy-paste.patch -# PySequence_Fast_{GET_ITEM,GET_SIZE} removed from stable API -# https://github.com/vim/vim/pull/17575 -Patch3006: vim-py314-nogetsize.patch # uses autoconf in spec file @@ -429,7 +426,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch -P 3003 -p1 -b .python-tests %patch -P 3004 -p1 -b .fips-warning %patch -P 3005 -p1 -b .copypaste -%patch -P 3006 -p1 -b .py314-noget %build @@ -1062,6 +1058,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Fri Jun 27 2025 Zdenek Dohnal - 2:9.1.1484-1 +- patchlevel 1484 + * Thu Jun 19 2025 Zdenek Dohnal - 2:9.1.1435-2 - FTBFS with Python 3.14 (fedora#2373314) From 97b3fbd6e5d2d085cd4df00129267a6a9bceac7e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 11 Jul 2025 08:59:31 +0200 Subject: [PATCH 293/324] - patchlevel 1537 --- sources | 2 +- vim-8.0-copy-paste.patch | 34 +++++++++++++++++----------------- vim.spec | 5 ++++- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/sources b/sources index be4a7a18..4c8cb72d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1484.tar.bz2) = 0c11afd56b0d2d1be61be3be401d30850a2172da52b50ad1a8919bcf59d3a29eeb9a92153f077d7e2596e32f0c2c53ea68a299b2bb36caa5e73ec29859a9d346 +SHA512 (vim-9.1-1537.tar.bz2) = dc2b58eb4868ccdea3ee35de617e4e4fae85b44d26c3d7fd72b8762a8e20cd7d0c7d5fdbc4af170ed2ecd900a9027b14a27e2d73180b21c9066df21dd569daa0 diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch index c85f1544..07f1e5a6 100644 --- a/vim-8.0-copy-paste.patch +++ b/vim-8.0-copy-paste.patch @@ -1,6 +1,6 @@ diff -up vim91/runtime/defaults.vim.copypaste vim91/runtime/defaults.vim ---- vim91/runtime/defaults.vim.copypaste 2025-05-30 09:49:31.000000000 +0200 -+++ vim91/runtime/defaults.vim 2025-05-30 09:57:03.715615959 +0200 +--- 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 " Revert with ":iunmap ". inoremap u @@ -21,10 +21,10 @@ diff -up vim91/runtime/defaults.vim.copypaste vim91/runtime/defaults.vim 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-05-30 09:57:03.715773219 +0200 -+++ vim91/src/testdir/test_balloon.vim 2025-05-30 09:58:51.344389890 +0200 -@@ -8,6 +8,7 @@ CheckFeature balloon_eval_term - source screendump.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 @@ -32,9 +32,9 @@ diff -up vim91/src/testdir/test_balloon.vim.copypaste vim91/src/testdir/test_bal 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-05-30 09:49:32.000000000 +0200 -+++ vim91/src/testdir/test_popup.vim 2025-05-30 09:57:03.716006063 +0200 -@@ -959,6 +959,7 @@ func Test_mouse_popup_position() +--- 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 @@ -43,9 +43,9 @@ diff -up vim91/src/testdir/test_popup.vim.copypaste vim91/src/testdir/test_popup 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-05-30 09:49:32.000000000 +0200 -+++ vim91/src/testdir/test_popupwin.vim 2025-05-30 09:57:03.716358043 +0200 -@@ -558,6 +558,7 @@ func Test_popup_drag() +--- 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)) @@ -53,7 +53,7 @@ diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_po split vsplit $wincmd w -@@ -625,6 +626,7 @@ func Test_popup_drag_minwidth() +@@ -623,6 +624,7 @@ func Test_popup_drag_minwidth() " create a popup that does not fit let lines =<< trim END @@ -61,7 +61,7 @@ diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_po call range(40) \ ->map({_,i -> string(i)}) \ ->popup_create({ -@@ -672,6 +674,7 @@ func Test_popup_drag_termwin() +@@ -670,6 +672,7 @@ func Test_popup_drag_termwin() let lines =<< trim END set foldmethod=marker call setline(1, range(100)) @@ -69,7 +69,7 @@ diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_po for nr in range(7) call setline(nr * 12 + 1, "fold {{{") call setline(nr * 12 + 11, "end }}}") -@@ -724,6 +727,7 @@ func Test_popup_close_with_mouse() +@@ -722,6 +725,7 @@ func Test_popup_close_with_mouse() let lines =<< trim END call setline(1, range(1, 20)) @@ -77,7 +77,7 @@ diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_po " With border, can click on X let winid = popup_create('foobar', #{ \ close: 'button', -@@ -1560,6 +1564,7 @@ func Test_popup_beval() +@@ -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') @@ -85,7 +85,7 @@ diff -up vim91/src/testdir/test_popupwin.vim.copypaste vim91/src/testdir/test_po set balloonevalterm set balloonexpr=BalloonExpr() set balloondelay=100 -@@ -2270,6 +2275,7 @@ func Test_popup_scrollbar() +@@ -2269,6 +2274,7 @@ func Test_popup_scrollbar() let lines =<< trim END call setline(1, range(1, 20)) diff --git a/vim.spec b/vim.spec index 4d039c36..5f8199c5 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1484 +%define patchlevel 1537 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1058,6 +1058,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Fri Jul 11 2025 Zdenek Dohnal - 2:9.1.1537-1 +- patchlevel 1537 + * Fri Jun 27 2025 Zdenek Dohnal - 2:9.1.1484-1 - patchlevel 1484 From dc29a314a521f809ec916fdcf44c08665292162c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 14 Jul 2025 09:47:17 +0200 Subject: [PATCH 294/324] 2379759 - remove wayland-libs from vim and vi (fedora#2379759) --- vim.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 5f8199c5..c8af8497 100644 --- a/vim.spec +++ b/vim.spec @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -470,6 +470,8 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --enable-fips-warning \ --enable-fail-if-missing \ --disable-canberra \ + --without-wayland \ + --enable-year2038 \ --disable-libsodium %make_build @@ -532,6 +534,8 @@ mv -f os_unix.h.save os_unix.h --disable-libsodium \ %endif --enable-fail-if-missing \ + --with-wayland \ + --enable-year2038 \ --enable-canberra %make_build @@ -587,6 +591,8 @@ make clean --disable-libsodium \ %endif --enable-fail-if-missing \ + --without-wayland \ + --enable-year2038 \ --disable-canberra %make_build @@ -1058,6 +1064,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Mon Jul 14 2025 Zdenek Dohnal - 2:9.1.1537-2 +- 2379759 - remove wayland-libs from vim and vi (fedora#2379759) + * Fri Jul 11 2025 Zdenek Dohnal - 2:9.1.1537-1 - patchlevel 1537 From c1048c79306136dc40751198bb7f814fc3adf1cc Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 16 Jul 2025 07:24:18 +0200 Subject: [PATCH 295/324] - patchlevel 1552 --- sources | 2 +- vim.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 4c8cb72d..929cae9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1537.tar.bz2) = dc2b58eb4868ccdea3ee35de617e4e4fae85b44d26c3d7fd72b8762a8e20cd7d0c7d5fdbc4af170ed2ecd900a9027b14a27e2d73180b21c9066df21dd569daa0 +SHA512 (vim-9.1-1552.tar.bz2) = f4a4ce55f1472087e0ecbd5c20b7802d08692836282fe063accd5c7503ef57057aa2e56d1d5ced329e4417148e4e4019898930ac822f872e60fd8891feedc008 diff --git a/vim.spec b/vim.spec index c8af8497..f622dab9 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1537 +%define patchlevel 1552 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -1064,6 +1064,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Wed Jul 16 2025 Zdenek Dohnal - 2:9.1.1552-1 +- patchlevel 1552 + * Mon Jul 14 2025 Zdenek Dohnal - 2:9.1.1537-2 - 2379759 - remove wayland-libs from vim and vi (fedora#2379759) From 7c60feb6e2a915e7321e84c58c2382fd1a286ae4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:05:12 +0000 Subject: [PATCH 296/324] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index f622dab9..da4fa8fb 100644 --- a/vim.spec +++ b/vim.spec @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -1064,6 +1064,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2:9.1.1552-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 16 2025 Zdenek Dohnal - 2:9.1.1552-1 - patchlevel 1552 From 4e61579ba39d433af5c335d43075c12b0ed59813 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 1 Aug 2025 07:31:30 +0200 Subject: [PATCH 297/324] - patchlevel 1591 --- sources | 2 +- vim.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 929cae9a..9f32a8ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1552.tar.bz2) = f4a4ce55f1472087e0ecbd5c20b7802d08692836282fe063accd5c7503ef57057aa2e56d1d5ced329e4417148e4e4019898930ac822f872e60fd8891feedc008 +SHA512 (vim-9.1-1591.tar.bz2) = 9bddb2089e90de0aa57ae4541f8a9771e39847731e5661b00aadae2de6d62ebc0b505a3bc0a7fed36a00ad633d02367880122413bc56a24d8689613b4f0d063f diff --git a/vim.spec b/vim.spec index da4fa8fb..912be6aa 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1552 +%define patchlevel 1591 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -51,7 +51,7 @@ Summary: The VIM editor URL: http://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 @@ -1064,6 +1064,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Fri Aug 01 2025 Zdenek Dohnal - 2:9.1.1591-1 +- patchlevel 1591 + * Fri Jul 25 2025 Fedora Release Engineering - 2:9.1.1552-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 9e0e978fbb6197af2706f1012d0f3325ae0e944f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 11 Aug 2025 11:33:32 +0200 Subject: [PATCH 298/324] - patchlevel 1623 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9f32a8ad..e3183ba7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1591.tar.bz2) = 9bddb2089e90de0aa57ae4541f8a9771e39847731e5661b00aadae2de6d62ebc0b505a3bc0a7fed36a00ad633d02367880122413bc56a24d8689613b4f0d063f +SHA512 (vim-9.1-1623.tar.bz2) = dc8bf5abe856e50a43c1eb7d5f0797665bc14443738748075365cbdc6c89330d6fd4a61136d4d47078bcad6ab099e719f3a38ebe8eb6852d891127debb025faa diff --git a/vim.spec b/vim.spec index 912be6aa..05b37eb8 100644 --- a/vim.spec +++ b/vim.spec @@ -10,7 +10,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1591 +%define patchlevel 1623 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -1064,6 +1064,9 @@ rm %{buildroot}%{_datadir}/%{name}/%{vimdir}/README.txt %changelog +* Mon Aug 11 2025 Zdenek Dohnal - 2:9.1.1623-1 +- patchlevel 1623 + * Fri Aug 01 2025 Zdenek Dohnal - 2:9.1.1591-1 - patchlevel 1591 From 7d940e947b366f50aa2f5a8356d9430ff3ba4006 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 12 Aug 2025 08:41:08 +0200 Subject: [PATCH 299/324] 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 698ce32e164adbb1333dc5ccd7bf2a8b73590ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= Date: Tue, 12 Aug 2025 10:15:09 +0200 Subject: [PATCH 300/324] 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 dbca97ea2417684d6842d8926c4739a8aca4cb6e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 12 Aug 2025 11:55:11 +0200 Subject: [PATCH 301/324] 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 beb553458e031a8eaa90c5f87de09d9617fdbfeb Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 12 Aug 2025 12:24:50 +0200 Subject: [PATCH 302/324] 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 d957d1e818dcbc5240086028ac36b334921f3cac Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 14 Aug 2025 14:37:56 -0500 Subject: [PATCH 303/324] 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 66e29232183f010f436e96d1e28ba4c364fc5222 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 29 Aug 2025 09:12:07 +0200 Subject: [PATCH 304/324] 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 fd5559a02c11023a0eb6c6c52b7de8aa0d0b3fba Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 29 Aug 2025 09:13:35 +0200 Subject: [PATCH 305/324] - 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 f114e7eb6592af68ec1f258876ec700d71ba0d5b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 1 Sep 2025 10:52:44 +0200 Subject: [PATCH 306/324] broken /usr/bin/ex symlink in vim-9.1.1706-1.fc42 (fedora#2392249) --- vim.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vim.spec b/vim.spec index 0ff8cf2e..8487228c 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 @@ -687,9 +687,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 @@ -988,6 +988,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Mon Sep 01 2025 Zdenek Dohnal - 2:9.1.1706-2 +- 2392249 - broken /usr/bin/ex symlink in vim-9.1.1706-1.fc42 + * Fri Aug 29 2025 Zdenek Dohnal - 2:9.1.1706-1 - patchlevel 1706 From d38db4ff3c9c79c9a18e7dc74913cc9de1d57999 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 1 Sep 2025 17:23:12 +0200 Subject: [PATCH 307/324] vim-common has broken manpages (fedora#2392178) --- vim.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/vim.spec b/vim.spec index 8487228c..38c18063 100644 --- a/vim.spec +++ b/vim.spec @@ -180,6 +180,8 @@ 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} Requires: %{name}-filesystem @@ -301,6 +303,8 @@ This subpackage contains files needed to set Vim as the default editor. %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 @@ -674,10 +678,12 @@ EOF appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml -for i in gvim.1 gex.1 gview.1 vimx.1 eview.1 rgvim.1 rgview.1; do +# 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/vimdiff.1" > %{buildroot}/%{_mandir}/man1/gvimdiff.1 + echo ".so man1/vimtutor.1" > %{buildroot}/%{_mandir}/man1/gvimtutor.1 %else # Remove files included in X11 subpackage, but built by default: @@ -875,6 +881,7 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %if %{with gui} %{_mandir}/man1/eview.* +%{_mandir}/man1/evim.* %{_mandir}/man1/gex.* %{_mandir}/man1/gview.* %{_mandir}/man1/gvim* @@ -955,7 +962,6 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %{_bindir}/eview %{_bindir}/rgvim %{_bindir}/rgview -%{_mandir}/man1/evim.* %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/* %dir %{_datadir}/icons/hicolor/*/apps @@ -989,7 +995,8 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog * Mon Sep 01 2025 Zdenek Dohnal - 2:9.1.1706-2 -- 2392249 - broken /usr/bin/ex symlink in vim-9.1.1706-1.fc42 +- 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 - 2:9.1.1706-1 - patchlevel 1706 From b97a8f097790855656c98c077104eede49f2e02a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 1 Sep 2025 17:25:26 +0200 Subject: [PATCH 308/324] - patchlevel 1723 --- sources | 2 +- vim.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index c20b1ad4..299c0369 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1706.tar.bz2) = 4b936add54c8068202dedc532202af6d78d951144b74dcc5015e4f7fcf8c4c384509c14f1036579b39c176110cd78eea257601d8e16bd63a410f7290a9d1174b +SHA512 (vim-9.1-1723.tar.bz2) = 8e4474f5b693c517658779e31d884f4c74bc2ff424975cfc745680817e007f90e9dd4d860342c8a31a2186a3f3d7ccb1b7b4d23c2dd60c6131056d67d8b2b06b diff --git a/vim.spec b/vim.spec index 38c18063..e7649e6a 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1706 +%define patchlevel 1723 %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 @@ -994,6 +994,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Mon Sep 01 2025 Zdenek Dohnal - 2:9.1.1723-1 +- patchlevel 1723 + * Mon Sep 01 2025 Zdenek Dohnal - 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) From bc2a0c97ccc8f8eeabfc415b7f09358a0a41872c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 10 Sep 2025 15:01:43 +0200 Subject: [PATCH 309/324] 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 07b3394cbc35a12185f2594be965995ad872e81b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 19 Sep 2025 08:58:02 +0200 Subject: [PATCH 310/324] - 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 c8b1dc94984dfbe47cf8df31628f48062f1bf6c4 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 29 Sep 2025 18:21:43 +0200 Subject: [PATCH 311/324] remove XPM support - GVim icons work without it --- vim.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/vim.spec b/vim.spec index 93277fed..8368c3b8 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 @@ -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,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* 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 ae2db1ff1df2067f7e2ecb561548a328616a5a50 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 3 Oct 2025 10:25:29 +0200 Subject: [PATCH 312/324] - patchlevel 1818 --- sources | 2 +- vim.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 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 8368c3b8..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 @@ -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 @@ -988,6 +988,9 @@ 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 From 61cfcde9ded5a39484ba9b55a60db34de1b71a40 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 10 Oct 2025 07:17:01 +0200 Subject: [PATCH 313/324] - patchlevel 1845 --- sources | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f8e7f622..7e2ad4d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1818.tar.bz2) = 15633ab4ceac42312d411daa791cc923e51145826816ca73abd638c99c63efe5f0ba7341e10e8c087c0fb5a324814a8c2cac3d9ead23248371e95039f724901d +SHA512 (vim-9.1-1845.tar.bz2) = 54926df4c97319e638358fec3a8994154f27dd7e6201d721e99f6f7042ef5c9240b34fd26b8ae3c66dae83d0a6a281a6f840102a4d9dda2f6005329c9a286eeb diff --git a/vim.spec b/vim.spec index cd6d76a5..251c2937 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1818 +%define patchlevel 1845 %define withnetbeans 1 %define withhunspell 0 @@ -988,6 +988,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %changelog +* Fri Oct 10 2025 Zdenek Dohnal - 2:9.1.1845-1 +- patchlevel 1845 + * Fri Oct 03 2025 Zdenek Dohnal - 2:9.1.1818-1 - patchlevel 1818 From 0c4cede346063dced0e4e2b1e9ca4f6f50f38932 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 10 Oct 2025 11:42:54 +0200 Subject: [PATCH 314/324] Fix building without wayland Currently, due broken dependency generation, wayland support is hardcoded in Makefile. We have to run dependency generation and auto generation at every `make` call. Additionally, function prototypes are now generated by python3 and its clang module during build - added buildrequires for it. --- vim.spec | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/vim.spec b/vim.spec index 251c2937..6ba8ee6f 100644 --- a/vim.spec +++ b/vim.spec @@ -122,6 +122,10 @@ BuildRequires: make # screen handling library BuildRequires: ncurses-devel +# for building function prototypes +BuildRequires: python3 +BuildRequires: python3-clang + # for python plugin BuildRequires: python3-devel @@ -444,6 +448,15 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --enable-year2038 \ --disable-libsodium +# related to the previous issue with `make depend`, auto/osdef.h +# has to be generated +make auto/osdef.h +# wayland is hardwired in Makefile dependencies +# to work around it call `make depend` before build +# problem fixed by https://github.com/vim/vim/pull/18538 +# remove once it is merged +make depend + %make_build cp vim minimal-vim make clean @@ -503,6 +516,15 @@ mv -f os_unix.h.save os_unix.h --enable-year2038 \ --disable-canberra +## related to the previous issue with `make depend`, auto/osdef.h +## has to be generated +make auto/osdef.h +# wayland is hardwired in Makefile dependencies +# to work around it call `make depend` before build +# problem fixed by https://github.com/vim/vim/pull/18538 +# remove once it is merged +make depend + %make_build cp vim enhanced-vim @@ -566,6 +588,15 @@ cp vim enhanced-vim --enable-socketserver \ --enable-canberra +# 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 +# wayland is hardwired in Makefile dependencies +# to work around it call `make depend` before build +# problem fixed by https://github.com/vim/vim/pull/18538 +# remove once it is merged +make depend + %make_build cp vim gvim make clean @@ -581,6 +612,9 @@ cp -f %{SOURCE7} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec 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 From 5ee4f534a6331a7edc774786fd555704145ce7ec Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 17 Oct 2025 08:59:22 +0200 Subject: [PATCH 315/324] Remove make depend workaround --- vim.spec | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/vim.spec b/vim.spec index 6ba8ee6f..20df7d1f 100644 --- a/vim.spec +++ b/vim.spec @@ -448,15 +448,6 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --enable-year2038 \ --disable-libsodium -# related to the previous issue with `make depend`, auto/osdef.h -# has to be generated -make auto/osdef.h -# wayland is hardwired in Makefile dependencies -# to work around it call `make depend` before build -# problem fixed by https://github.com/vim/vim/pull/18538 -# remove once it is merged -make depend - %make_build cp vim minimal-vim make clean @@ -516,15 +507,6 @@ mv -f os_unix.h.save os_unix.h --enable-year2038 \ --disable-canberra -## related to the previous issue with `make depend`, auto/osdef.h -## has to be generated -make auto/osdef.h -# wayland is hardwired in Makefile dependencies -# to work around it call `make depend` before build -# problem fixed by https://github.com/vim/vim/pull/18538 -# remove once it is merged -make depend - %make_build cp vim enhanced-vim @@ -588,15 +570,6 @@ cp vim enhanced-vim --enable-socketserver \ --enable-canberra -# 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 -# wayland is hardwired in Makefile dependencies -# to work around it call `make depend` before build -# problem fixed by https://github.com/vim/vim/pull/18538 -# remove once it is merged -make depend - %make_build cp vim gvim make clean From 71c059abc540577924906cf0eabcd67e233d827a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 17 Oct 2025 09:00:02 +0200 Subject: [PATCH 316/324] - 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 7e2ad4d6..432ae958 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.1-1845.tar.bz2) = 54926df4c97319e638358fec3a8994154f27dd7e6201d721e99f6f7042ef5c9240b34fd26b8ae3c66dae83d0a6a281a6f840102a4d9dda2f6005329c9a286eeb +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 20df7d1f..babc26a7 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1845 +%define patchlevel 1863 %define withnetbeans 1 %define withhunspell 0 @@ -995,6 +995,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 10 2025 Zdenek Dohnal - 2:9.1.1845-1 - patchlevel 1845 From c8b04c80dd1fcafe208a7969ab40c584e320d5f3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 31 Oct 2025 08:08:06 +0100 Subject: [PATCH 317/324] vimrc: Use RestoreCursor from defaults.vim (fedora#2404651) Fixes setting the cursor at the start of file when committing in Git --- vimrc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vimrc b/vimrc index 4842faf2..4ef9d92d 100644 --- a/vimrc +++ b/vimrc @@ -54,10 +54,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 * - \ if line("'\"") > 0 && line ("'\"") <= line("$") | - \ exe "normal! g'\"" | - \ endif + \ let line = line("'\"") + \ | if line >= 1 && line <= line("$") && &filetype !~# 'commit' + \ && index(['xxd', 'gitrebase', 'tutor'], &filetype) == -1 + \ && !&diff + \ | execute "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 From e847a50297a216229050bf4db3d06a139104e7cf Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 31 Oct 2025 08:10:55 +0100 Subject: [PATCH 318/324] - 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 babc26a7..3ae52ae3 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1863 +%define patchlevel 1888 %define withnetbeans 1 %define withhunspell 0 @@ -995,6 +995,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 fef106b849d1bf4859ded298abb857b5cc349cf0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 14 Nov 2025 07:38:58 +0100 Subject: [PATCH 319/324] - 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 19faaa187ee2c85fff2f6b0627b2e9d813cd1cfe Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 28 Nov 2025 07:56:40 +0100 Subject: [PATCH 320/324] F41 is EOL --- vim-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 4961ece1..fc37e160 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,12 +1,12 @@ #!/bin/bash debug="" #debug="echo " -branches=( "rawhide" "f43" "f42" "f41" ) -releases=( "fc44" "fc43" "fc42" "fc41" ) +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" "\|fc41" ) -bodhi_enabled=( "0" "1" "1" "1" ) +regexps=( "fc44" "fc43" "\|fc42" ) +bodhi_enabled=( "0" "1" "1" ) needs_update=() #releases_regexp=fc28\\\|fc27\\\|fc28 From 6bbeb2d904d9f16c28826d1fc571c507f1cda226 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 5 Dec 2025 06:58:19 +0100 Subject: [PATCH 321/324] - 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 f5ce5d8b..436d0402 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1914 +%define patchlevel 1952 %define withnetbeans 1 %define withhunspell 0 @@ -995,6 +995,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 07501bca7aa17b5cdefcadc5a140b01219b83253 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 12 Dec 2025 07:37:49 +0100 Subject: [PATCH 322/324] - 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 436d0402..4f3323e8 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1952 +%define patchlevel 1972 %define withnetbeans 1 %define withhunspell 0 @@ -995,6 +995,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 676006795a0c7adb9bd0a4d042b529cf4688be8d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 19 Dec 2025 07:07:16 +0100 Subject: [PATCH 323/324] - 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 4f3323e8..5769758a 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1972 +%define patchlevel 1999 %define withnetbeans 1 %define withhunspell 0 @@ -995,6 +995,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 eae4b5cd79320755554c8b22cb2b77cbaded0e82 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 9 Jan 2026 12:59:59 +0100 Subject: [PATCH 324/324] - 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 5769758a..b2c29f97 100644 --- a/vim.spec +++ b/vim.spec @@ -12,7 +12,7 @@ %endif -%define patchlevel 1999 +%define patchlevel 2068 %define withnetbeans 1 %define withhunspell 0 @@ -995,6 +995,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