From e8072bd02846e12e6061352eb97bb95b988e00ca Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 17 May 2018 09:29:45 +0200 Subject: [PATCH 001/584] - patchlevel 1848 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c74d73f1..7aa64f14 100644 --- a/.gitignore +++ b/.gitignore @@ -193,3 +193,4 @@ /vim-8.0-1806.tar.bz2 /vim-8.0-1813.tar.bz2 /vim-8.0-1842.tar.bz2 +/vim-8.0-1848.tar.bz2 diff --git a/sources b/sources index f5a3eb7a..c3d696ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.0-1842.tar.bz2) = 5cfe52d11ebd534d50b0e2979bf5e503910b17ff5dd7d4a96fcaf04b4e848573088b834d7ac0e0d5d5a2925b9c4d53709b56c82b96d695078739f82e19bf83aa +SHA512 (vim-8.0-1848.tar.bz2) = 72a59b117dc901ddee51424d7ee19fe1ba63e078589db7ec99618715988ac1f5a92bb0366e8ef6f91564822185e32f0559b3d6f87a749c66afab260cee70e94e diff --git a/vim.spec b/vim.spec index 6c244243..82668875 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1842 +%define patchlevel 1848 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu May 17 2018 Karsten Hopp 8.0.1848-1 +- patchlevel 1848 + * Tue May 15 2018 Zdenek Dohnal - 8.0.1842-2 - do not update F26 anymore - EOL in 2 weeks From 59beea4849ea03fd8c7f0f4c64a7a9001b94d05b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 18 May 2018 13:27:01 +0200 Subject: [PATCH 002/584] vim-update.sh - update vimdir and baseversion --- vim-update.sh | 5 ++++- vim.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index e9b6f1fe..142446cf 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -36,6 +36,7 @@ if [ $? -ne 0 ]; then fi MAJORVERSION=`grep "define baseversion" vim.spec | cut -d ' ' -f 3` +MAJORVERDIR=$(echo $MAJORVERSION | sed -e 's/\.//') ORIGPL=`grep "define patchlevel" vim.spec | cut -d ' ' -f 3 | sed -e "s/^0*//g"` ORIGPLFILLED=`printf "%03d" $ORIGPL` @@ -54,6 +55,7 @@ LASTTAG=$(git describe --tags $(git rev-list --tags --max-count=1)) # vim upstream tags have the form v7.4.123. Remove the 'v' and get major release and patchlevel: UPSTREAMMAJOR=$(echo $LASTTAG | sed -e 's/v\([0-9]*\.[0-9]*\).*/\1/') +UPSTREAMMAJORDIR=$(echo $UPSTREAMMAJOR | sed -e 's/\.//') LASTPL=`echo $LASTTAG| sed -e 's/.*\.//;s/^0*//'` LASTPLFILLED=`printf "%03d" $LASTPL` if [ $force -ne 1 -a "$ORIGPLFILLED" == "$LASTPLFILLED" ]; then @@ -77,7 +79,8 @@ if [ $CHANGES -ne 0 ]; then CHLOG="* $DATE Karsten Hopp $UPSTREAMMAJOR" $debug sed -i -e "/Release: /cRelease: 1%{?dist}" $SPEC if [ "x$MAJORVERSION" != "x$UPSTREAMMAJOR" ]; then - $debug sed -i -s "s/define baseversion: $MAJORVERSION/define baseversion: $UPSTREAMMAJOR=/" $SPEC + $debug sed -i -s "s/define baseversion $MAJORVERSION/define baseversion $UPSTREAMMAJOR/" $SPEC + $debug sed -i -s "s/define vimdir vim$MAJORVERDIR/define vimdir vim$UPSTREAMMAJORDIR/" $SPEC fi $debug sed -i -e "s/define patchlevel $ORIGPLFILLED/define patchlevel $LASTPLFILLED/" $SPEC $debug sed -i -e "/\%changelog/a$CHLOG.$LASTPLFILLED-1\n- patchlevel $LASTPLFILLED\n" $SPEC diff --git a/vim.spec b/vim.spec index 82668875..5abf509f 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri May 18 2018 Zdenek Dohnal - 2:8.0.1848-2 +- vim-update.sh - update vimdir and baseversion + * Thu May 17 2018 Karsten Hopp 8.0.1848-1 - patchlevel 1848 From 6e7834fef23dab5bf9caf7d2ce749d6de51e4fbf Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 18 May 2018 13:30:12 +0200 Subject: [PATCH 003/584] vim-update.sh - enhance debugging of vim-update script --- vim-update.sh | 8 ++++---- vim.spec | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 142446cf..dc3a892c 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -27,7 +27,7 @@ if [ "x$1" == "x--force" ]; then fi DATE=`date +"%a %b %d %Y"` -fedpkg switch-branch "${branches[@]: $branches_index: 1}" +$debug fedpkg switch-branch "${branches[@]: $branches_index: 1}" if [ $? -ne 0 ]; then @@ -110,7 +110,7 @@ if [ $CHANGES -ne 0 ]; then | grep $releases_regexp` if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then - fedpkg build + $debug fedpkg build if [ $? -eq 0 ]; then done_build=1 else @@ -163,11 +163,11 @@ if [ $CHANGES -ne 0 ]; then testing_update=`bodhi updates query --packages vim --status testing \ | grep $releases_regexp` if [ "$testing_update" == "" ] && [ $done_build -eq 1 ]; then - fedpkg build + $debug fedpkg build if [ $? -eq 0 ]; then # if branch isn't master or branch is enabled in bodhi, create update if [ $branch != "master" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then - bodhi updates new --user zdohnal --type enhancement --notes "The newest upstream commit" --request testing --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1} + $debug bodhi updates new --user zdohnal --type enhancement --notes "The newest upstream commit" --request testing --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1} fi else echo "Error when building package for $branch" diff --git a/vim.spec b/vim.spec index 5abf509f..13845491 100644 --- a/vim.spec +++ b/vim.spec @@ -759,8 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog -* Fri May 18 2018 Zdenek Dohnal - 2:8.0.1848-2 -- vim-update.sh - update vimdir and baseversion +* Fri May 18 2018 Zdenek Dohnal - 8.0.1848-2 +- vim-update.sh - update vimdir and baseversion(for major rebases) +- vim-update.sh - enhance debugging of vim-update script * Thu May 17 2018 Karsten Hopp 8.0.1848-1 - patchlevel 1848 From b84d74a883f8adc671d748ad8ccf7960c2ee66d5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 18 May 2018 13:33:42 +0200 Subject: [PATCH 004/584] - patchlevel 1 --- .gitignore | 1 + sources | 2 +- vim.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7aa64f14..1e791710 100644 --- a/.gitignore +++ b/.gitignore @@ -194,3 +194,4 @@ /vim-8.0-1813.tar.bz2 /vim-8.0-1842.tar.bz2 /vim-8.0-1848.tar.bz2 +/vim-8.1-001.tar.bz2 diff --git a/sources b/sources index c3d696ce..8124b7d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.0-1848.tar.bz2) = 72a59b117dc901ddee51424d7ee19fe1ba63e078589db7ec99618715988ac1f5a92bb0366e8ef6f91564822185e32f0559b3d6f87a749c66afab260cee70e94e +SHA512 (vim-8.1-001.tar.bz2) = 9d4481f22c9eebfe168f8417338ff2245824cbb5e0f9b26e815d1a0e024f40b60ce25535e0614de78fce99bcc12d7c1d9eca5ccef5a931a13f75ccb7906f9cbc diff --git a/vim.spec b/vim.spec index 13845491..fc559cae 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1848 +%define patchlevel 001 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -17,14 +17,14 @@ %define python3 python3.6m %define python3path %{_includedir}/%{python3} -%define baseversion 8.0 -%define vimdir vim80 +%define baseversion 8.1 +%define vimdir vim81 Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri May 18 2018 Karsten Hopp 8.1.001-1 +- patchlevel 001 + * Fri May 18 2018 Zdenek Dohnal - 8.0.1848-2 - vim-update.sh - update vimdir and baseversion(for major rebases) - vim-update.sh - enhance debugging of vim-update script From 49d54a41ea99e3bd02608ffca9d002c501c9daa5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 21 May 2018 12:42:30 +0200 Subject: [PATCH 005/584] - patchlevel 10 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1e791710..4fc3f706 100644 --- a/.gitignore +++ b/.gitignore @@ -195,3 +195,4 @@ /vim-8.0-1842.tar.bz2 /vim-8.0-1848.tar.bz2 /vim-8.1-001.tar.bz2 +/vim-8.1-010.tar.bz2 diff --git a/sources b/sources index 8124b7d2..6d4e8baf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-001.tar.bz2) = 9d4481f22c9eebfe168f8417338ff2245824cbb5e0f9b26e815d1a0e024f40b60ce25535e0614de78fce99bcc12d7c1d9eca5ccef5a931a13f75ccb7906f9cbc +SHA512 (vim-8.1-010.tar.bz2) = 33759b594735ae013f9a46559572be8938b5dcb021dc1b230f61d5ecefeb8fdbd16b381fff5aa89c1a6afb54693bacd679238be60fe1edb0996ab57b91960e4b diff --git a/vim.spec b/vim.spec index fc559cae..48bd16cc 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 001 +%define patchlevel 010 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon May 21 2018 Karsten Hopp 8.1.010-1 +- patchlevel 010 + * Fri May 18 2018 Karsten Hopp 8.1.001-1 - patchlevel 001 From e0c1729ec91c2b004adc755b9a5a7f875d49b1e6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 22 May 2018 11:54:20 +0200 Subject: [PATCH 006/584] - patchlevel 16 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4fc3f706..51070062 100644 --- a/.gitignore +++ b/.gitignore @@ -196,3 +196,4 @@ /vim-8.0-1848.tar.bz2 /vim-8.1-001.tar.bz2 /vim-8.1-010.tar.bz2 +/vim-8.1-016.tar.bz2 diff --git a/sources b/sources index 6d4e8baf..36e2753b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-010.tar.bz2) = 33759b594735ae013f9a46559572be8938b5dcb021dc1b230f61d5ecefeb8fdbd16b381fff5aa89c1a6afb54693bacd679238be60fe1edb0996ab57b91960e4b +SHA512 (vim-8.1-016.tar.bz2) = 44099610643241a63da98b1a41dee772f8f5b26d6b252700472ce6daed982ac228d3faff8c3e627ae2f27f3a711649e38a08a4ef5e449e9f2550d3d76fe9a91a diff --git a/vim.spec b/vim.spec index 48bd16cc..16e8d3e2 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 010 +%define patchlevel 016 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue May 22 2018 Karsten Hopp 8.1.016-1 +- patchlevel 016 + * Mon May 21 2018 Karsten Hopp 8.1.010-1 - patchlevel 010 From 60dd93bd345b7db2ea87f4793c0d2d2fe98d10fc Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 23 May 2018 13:35:31 +0200 Subject: [PATCH 007/584] - patchlevel 20 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 51070062..12d1734d 100644 --- a/.gitignore +++ b/.gitignore @@ -197,3 +197,4 @@ /vim-8.1-001.tar.bz2 /vim-8.1-010.tar.bz2 /vim-8.1-016.tar.bz2 +/vim-8.1-020.tar.bz2 diff --git a/sources b/sources index 36e2753b..c505ab2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-016.tar.bz2) = 44099610643241a63da98b1a41dee772f8f5b26d6b252700472ce6daed982ac228d3faff8c3e627ae2f27f3a711649e38a08a4ef5e449e9f2550d3d76fe9a91a +SHA512 (vim-8.1-020.tar.bz2) = 2cf1b3c56f4891114230c26a713282e90ed4e2cee9e19529505092ef33e6e16f5d4c519a89f74d46f9ef2a29dfad01daafee5f974c427d8261fb3e5365b97b13 diff --git a/vim.spec b/vim.spec index 16e8d3e2..106357e3 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 016 +%define patchlevel 020 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed May 23 2018 Karsten Hopp 8.1.020-1 +- patchlevel 020 + * Tue May 22 2018 Karsten Hopp 8.1.016-1 - patchlevel 016 From 67bffce9ef96e62ff25c114ff54cd87a46292c32 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 24 May 2018 09:28:21 +0200 Subject: [PATCH 008/584] - patchlevel 22 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 12d1734d..4f85e315 100644 --- a/.gitignore +++ b/.gitignore @@ -198,3 +198,4 @@ /vim-8.1-010.tar.bz2 /vim-8.1-016.tar.bz2 /vim-8.1-020.tar.bz2 +/vim-8.1-022.tar.bz2 diff --git a/sources b/sources index c505ab2f..ac603446 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-020.tar.bz2) = 2cf1b3c56f4891114230c26a713282e90ed4e2cee9e19529505092ef33e6e16f5d4c519a89f74d46f9ef2a29dfad01daafee5f974c427d8261fb3e5365b97b13 +SHA512 (vim-8.1-022.tar.bz2) = 61444166dbdb6a9039f4689e0471b0cdddc0f032ce3bb8f23d87f116000e51918720e1cc1f079d7c3600b78849ffb4b5ca68c28fa0db71d94fd6f3fb77307c3a diff --git a/vim.spec b/vim.spec index 106357e3..86600111 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 020 +%define patchlevel 022 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu May 24 2018 Karsten Hopp 8.1.022-1 +- patchlevel 022 + * Wed May 23 2018 Karsten Hopp 8.1.020-1 - patchlevel 020 From 0e6539ab139b166584d6491b5af2fb8bc88858ce Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 28 May 2018 12:18:08 +0200 Subject: [PATCH 009/584] - patchlevel 26 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4f85e315..4c06c18a 100644 --- a/.gitignore +++ b/.gitignore @@ -199,3 +199,4 @@ /vim-8.1-016.tar.bz2 /vim-8.1-020.tar.bz2 /vim-8.1-022.tar.bz2 +/vim-8.1-026.tar.bz2 diff --git a/sources b/sources index ac603446..f9042a5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-022.tar.bz2) = 61444166dbdb6a9039f4689e0471b0cdddc0f032ce3bb8f23d87f116000e51918720e1cc1f079d7c3600b78849ffb4b5ca68c28fa0db71d94fd6f3fb77307c3a +SHA512 (vim-8.1-026.tar.bz2) = 98c371f91974a633e90cca75c672a581648dc017beeccca749906480f7bd507ccd694e003c8470278990199d124cdb54fd9506cefa6cc9a4166691e03c376286 diff --git a/vim.spec b/vim.spec index 86600111..0703b78d 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 022 +%define patchlevel 026 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon May 28 2018 Karsten Hopp 8.1.026-1 +- patchlevel 026 + * Thu May 24 2018 Karsten Hopp 8.1.022-1 - patchlevel 022 From 21d86aa669794d87515e7e04dbc15460b2cd5c9b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 5 Jun 2018 14:40:13 +0200 Subject: [PATCH 010/584] - patchlevel 34 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4c06c18a..2eca1538 100644 --- a/.gitignore +++ b/.gitignore @@ -200,3 +200,4 @@ /vim-8.1-020.tar.bz2 /vim-8.1-022.tar.bz2 /vim-8.1-026.tar.bz2 +/vim-8.1-034.tar.bz2 diff --git a/sources b/sources index f9042a5d..e7c207a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-026.tar.bz2) = 98c371f91974a633e90cca75c672a581648dc017beeccca749906480f7bd507ccd694e003c8470278990199d124cdb54fd9506cefa6cc9a4166691e03c376286 +SHA512 (vim-8.1-034.tar.bz2) = de5c0211caa6b2f86b46fe61882479e9fd38caea1a83ae78ce4bbe3b71155cebf00b8a955a9ed8af03a971402b9d894b1aed3206e7dd722604de4443c9678e95 diff --git a/vim.spec b/vim.spec index 0703b78d..f293c9b9 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 026 +%define patchlevel 034 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jun 05 2018 Karsten Hopp 8.1.034-1 +- patchlevel 034 + * Mon May 28 2018 Karsten Hopp 8.1.026-1 - patchlevel 026 From 28b53c83a60efd23bb772c5423daf9a6c5648908 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 6 Jun 2018 12:17:05 +0200 Subject: [PATCH 011/584] - patchlevel 35 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2eca1538..cab88a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -201,3 +201,4 @@ /vim-8.1-022.tar.bz2 /vim-8.1-026.tar.bz2 /vim-8.1-034.tar.bz2 +/vim-8.1-035.tar.bz2 diff --git a/sources b/sources index e7c207a7..49e6dd4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-034.tar.bz2) = de5c0211caa6b2f86b46fe61882479e9fd38caea1a83ae78ce4bbe3b71155cebf00b8a955a9ed8af03a971402b9d894b1aed3206e7dd722604de4443c9678e95 +SHA512 (vim-8.1-035.tar.bz2) = 1909c61aaebad57cc8bc47929bdd6bc451fb3130bcb4f3c4440b62e8e3489e16e21006e232fa519338897899b6a6b7fc2258045f44c4ceb278ab1136e795ce35 diff --git a/vim.spec b/vim.spec index f293c9b9..dc421bd9 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 034 +%define patchlevel 035 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jun 06 2018 Karsten Hopp 8.1.035-1 +- patchlevel 035 + * Tue Jun 05 2018 Karsten Hopp 8.1.034-1 - patchlevel 034 From fc6d7783b1c948f2fe410c1cf271c08bada028ad Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 8 Jun 2018 07:52:22 +0200 Subject: [PATCH 012/584] - patchlevel 39 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cab88a8d..2e70d98f 100644 --- a/.gitignore +++ b/.gitignore @@ -202,3 +202,4 @@ /vim-8.1-026.tar.bz2 /vim-8.1-034.tar.bz2 /vim-8.1-035.tar.bz2 +/vim-8.1-039.tar.bz2 diff --git a/sources b/sources index 49e6dd4d..d6eb9ad7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-035.tar.bz2) = 1909c61aaebad57cc8bc47929bdd6bc451fb3130bcb4f3c4440b62e8e3489e16e21006e232fa519338897899b6a6b7fc2258045f44c4ceb278ab1136e795ce35 +SHA512 (vim-8.1-039.tar.bz2) = 65b188aadd60d0f2a3fecf64e4fc22bfe457bf1ac8f377c75e07eef85fc7753611f95c62875931e21db42ea1b318d373a3e1403a82b9dfab8e4f87727d5cec63 diff --git a/vim.spec b/vim.spec index dc421bd9..7cd19bb0 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 035 +%define patchlevel 039 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jun 08 2018 Karsten Hopp 8.1.039-1 +- patchlevel 039 + * Wed Jun 06 2018 Karsten Hopp 8.1.035-1 - patchlevel 035 From 69c5be50614f9eacd93a310f80ba4a64352ea239 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 11 Jun 2018 18:37:43 +0200 Subject: [PATCH 013/584] - patchlevel 42 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2e70d98f..f8e52302 100644 --- a/.gitignore +++ b/.gitignore @@ -203,3 +203,4 @@ /vim-8.1-034.tar.bz2 /vim-8.1-035.tar.bz2 /vim-8.1-039.tar.bz2 +/vim-8.1-042.tar.bz2 diff --git a/sources b/sources index d6eb9ad7..f4912cd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-039.tar.bz2) = 65b188aadd60d0f2a3fecf64e4fc22bfe457bf1ac8f377c75e07eef85fc7753611f95c62875931e21db42ea1b318d373a3e1403a82b9dfab8e4f87727d5cec63 +SHA512 (vim-8.1-042.tar.bz2) = 8896d0ee91540f311396d7f9cd916bb59ea233500beca8eca1e818bfdaac434e708adbfa366fc2dfe359e5fe8943b2f6554e0db123254286f8d18c50a90af981 diff --git a/vim.spec b/vim.spec index 7cd19bb0..281dfcc5 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 039 +%define patchlevel 042 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jun 11 2018 Karsten Hopp 8.1.042-1 +- patchlevel 042 + * Fri Jun 08 2018 Karsten Hopp 8.1.039-1 - patchlevel 039 From 6bf5e25b8c693f5cd9b80115bcfc0eedeecb08cb Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 15 Jun 2018 07:22:09 +0200 Subject: [PATCH 014/584] - patchlevel 55 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f8e52302..2854a83b 100644 --- a/.gitignore +++ b/.gitignore @@ -204,3 +204,4 @@ /vim-8.1-035.tar.bz2 /vim-8.1-039.tar.bz2 /vim-8.1-042.tar.bz2 +/vim-8.1-055.tar.bz2 diff --git a/sources b/sources index f4912cd7..3b3dc5a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-042.tar.bz2) = 8896d0ee91540f311396d7f9cd916bb59ea233500beca8eca1e818bfdaac434e708adbfa366fc2dfe359e5fe8943b2f6554e0db123254286f8d18c50a90af981 +SHA512 (vim-8.1-055.tar.bz2) = 15454597d2c147baa4951a8a289892e781a45da1e2b4713b416e73a58a27be1f98009543b4914dc1365c107d6422881efe7e2fa360741b6c71cc40ca2ccfc080 diff --git a/vim.spec b/vim.spec index 281dfcc5..664a8d5c 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 042 +%define patchlevel 055 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jun 15 2018 Karsten Hopp 8.1.055-1 +- patchlevel 055 + * Mon Jun 11 2018 Karsten Hopp 8.1.042-1 - patchlevel 042 From f3b7b5a905e9c9388bd2f4ee123feaf9d11f5680 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 18 Jun 2018 07:22:37 +0200 Subject: [PATCH 015/584] - patchlevel 72 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2854a83b..5b7f1f3b 100644 --- a/.gitignore +++ b/.gitignore @@ -205,3 +205,4 @@ /vim-8.1-039.tar.bz2 /vim-8.1-042.tar.bz2 /vim-8.1-055.tar.bz2 +/vim-8.1-072.tar.bz2 diff --git a/sources b/sources index 3b3dc5a6..8e7c08f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-055.tar.bz2) = 15454597d2c147baa4951a8a289892e781a45da1e2b4713b416e73a58a27be1f98009543b4914dc1365c107d6422881efe7e2fa360741b6c71cc40ca2ccfc080 +SHA512 (vim-8.1-072.tar.bz2) = 66d272957412071c2eea7fd1d9ad71e1bd0a1d59a892f0516349151b18b9927197e3adbd31c73582f98540c79917f49862cd916b7c4744b98e98b4955a1e99d9 diff --git a/vim.spec b/vim.spec index 664a8d5c..b44bcfb1 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 055 +%define patchlevel 072 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jun 18 2018 Karsten Hopp 8.1.072-1 +- patchlevel 072 + * Fri Jun 15 2018 Karsten Hopp 8.1.055-1 - patchlevel 055 From 7b0d7a8f68ead90134798de757a0d0ef28a52ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 11:30:16 +0200 Subject: [PATCH 016/584] Rebuilt for Python 3.7 --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index b44bcfb1..7838af67 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jun 19 2018 Miro Hrončok - 2:8.1.072-2 +- Rebuilt for Python 3.7 + * Mon Jun 18 2018 Karsten Hopp 8.1.072-1 - patchlevel 072 From b58a6916a7726d7ff7abc88d81885afbf03281d3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 22 Jun 2018 13:09:52 +0200 Subject: [PATCH 017/584] - patchlevel 95 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5b7f1f3b..510e6f58 100644 --- a/.gitignore +++ b/.gitignore @@ -206,3 +206,4 @@ /vim-8.1-042.tar.bz2 /vim-8.1-055.tar.bz2 /vim-8.1-072.tar.bz2 +/vim-8.1-095.tar.bz2 diff --git a/sources b/sources index 8e7c08f9..6d9120e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-072.tar.bz2) = 66d272957412071c2eea7fd1d9ad71e1bd0a1d59a892f0516349151b18b9927197e3adbd31c73582f98540c79917f49862cd916b7c4744b98e98b4955a1e99d9 +SHA512 (vim-8.1-095.tar.bz2) = a4a089cf16507a45ca07e974aac73819558e0b63105ac22bc98957ee339a27d919d6b4593719d55bcbae43e717c1e7b291af46741d8be33e5ce61ab003e2bf2e diff --git a/vim.spec b/vim.spec index 7838af67..8aa3135c 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 072 +%define patchlevel 095 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -759,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jun 22 2018 Karsten Hopp 8.1.095-1 +- patchlevel 095 + * Tue Jun 19 2018 Miro Hrončok - 2:8.1.072-2 - Rebuilt for Python 3.7 From 79ba75c76b651fb67b9b5c1ec0c7ee2867544dca Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 25 Jun 2018 11:37:16 +0200 Subject: [PATCH 018/584] - patchlevel 115 --- .gitignore | 1 + sources | 2 +- vim.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 510e6f58..2f7902eb 100644 --- a/.gitignore +++ b/.gitignore @@ -207,3 +207,4 @@ /vim-8.1-055.tar.bz2 /vim-8.1-072.tar.bz2 /vim-8.1-095.tar.bz2 +/vim-8.1-115.tar.bz2 diff --git a/sources b/sources index 6d9120e9..e67d6a84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-095.tar.bz2) = a4a089cf16507a45ca07e974aac73819558e0b63105ac22bc98957ee339a27d919d6b4593719d55bcbae43e717c1e7b291af46741d8be33e5ce61ab003e2bf2e +SHA512 (vim-8.1-115.tar.bz2) = 34df55ed69f44850f2de839dcb20f234dd03f112762dee99d5fc97ee1a59d2fed75c143b57c88540e41a3ff8078755c81fa7fac678c6351a09d186d220101199 diff --git a/vim.spec b/vim.spec index 8aa3135c..3bf151ea 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 095 +%define patchlevel 115 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -587,6 +587,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %lang(ca) %{_datadir}/%{name}/%{vimdir}/lang/ca %lang(cs) %{_datadir}/%{name}/%{vimdir}/lang/cs %lang(cs.cp1250) %{_datadir}/%{name}/%{vimdir}/lang/cs.cp1250 +%lang(da) %{_datadir}/%{name}/%{vimdir}/lang/da %lang(de) %{_datadir}/%{name}/%{vimdir}/lang/de %lang(en_GB) %{_datadir}/%{name}/%{vimdir}/lang/en_GB %lang(eo) %{_datadir}/%{name}/%{vimdir}/lang/eo @@ -759,6 +760,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jun 25 2018 Karsten Hopp 8.1.115-1 +- patchlevel 115 + * Fri Jun 22 2018 Karsten Hopp 8.1.095-1 - patchlevel 095 From 834a7cdb23732681d1fb3329e66358ef7bf8b8f9 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 27 Jun 2018 16:24:57 +0200 Subject: [PATCH 019/584] - patchlevel 117 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2f7902eb..c65c6385 100644 --- a/.gitignore +++ b/.gitignore @@ -208,3 +208,4 @@ /vim-8.1-072.tar.bz2 /vim-8.1-095.tar.bz2 /vim-8.1-115.tar.bz2 +/vim-8.1-117.tar.bz2 diff --git a/sources b/sources index e67d6a84..b662cb30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-115.tar.bz2) = 34df55ed69f44850f2de839dcb20f234dd03f112762dee99d5fc97ee1a59d2fed75c143b57c88540e41a3ff8078755c81fa7fac678c6351a09d186d220101199 +SHA512 (vim-8.1-117.tar.bz2) = f6755ec21b553eb13de4fe1010756035bd6f06450b6573083bc32f3aea920bb9fcd81b605e668bee1fa1ac345ac86ee3fa4ef59ca91416bf4e799cc40c51ada0 diff --git a/vim.spec b/vim.spec index 3bf151ea..ecd92fd9 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 115 +%define patchlevel 117 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -760,6 +760,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jun 27 2018 Karsten Hopp 8.1.117-1 +- patchlevel 117 + * Mon Jun 25 2018 Karsten Hopp 8.1.115-1 - patchlevel 115 From cfbba75c81886d2e9f27be3e3f48b8f5e3b908f8 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 28 Jun 2018 02:57:29 +0200 Subject: [PATCH 020/584] Perl 5.28 rebuild --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index ecd92fd9..b334a1a6 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -760,6 +760,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jun 28 2018 Jitka Plesnikova - 2:8.1.117-2 +- Perl 5.28 rebuild + * Wed Jun 27 2018 Karsten Hopp 8.1.117-1 - patchlevel 117 From 1be2992bf2abd753a1c0dbae3f4032f75591ae85 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 28 Jun 2018 10:53:43 +0200 Subject: [PATCH 021/584] - patchlevel 119 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c65c6385..99921c9c 100644 --- a/.gitignore +++ b/.gitignore @@ -209,3 +209,4 @@ /vim-8.1-095.tar.bz2 /vim-8.1-115.tar.bz2 /vim-8.1-117.tar.bz2 +/vim-8.1-119.tar.bz2 diff --git a/sources b/sources index b662cb30..3022bfd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-117.tar.bz2) = f6755ec21b553eb13de4fe1010756035bd6f06450b6573083bc32f3aea920bb9fcd81b605e668bee1fa1ac345ac86ee3fa4ef59ca91416bf4e799cc40c51ada0 +SHA512 (vim-8.1-119.tar.bz2) = cde0a6adf4bd52b4d19396d1c81787702667fe7dabb20672303f78e6b5ce5de09e3531b83231585ee98e64b14a7132a8d9d2f1329bb154944717075dbf593e11 diff --git a/vim.spec b/vim.spec index b334a1a6..f6b1cba4 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 117 +%define patchlevel 119 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -760,6 +760,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jun 28 2018 Karsten Hopp 8.1.119-1 +- patchlevel 119 + * Thu Jun 28 2018 Jitka Plesnikova - 2:8.1.117-2 - Perl 5.28 rebuild From 9647e2f7b081c8e8bb0a4f79bc1fceee0ddc07ac Mon Sep 17 00:00:00 2001 From: Andrei Stepanov Date: Thu, 21 Jun 2018 11:59:42 +0000 Subject: [PATCH 022/584] Remove requirements for vim in Makefile beakerlib tests. There are requirements for explicit vim-enhanced and vim-minimal. Signed-off-by: Andrei Stepanov --- tests/netrw-plugin-delete-command-broken/Makefile | 1 - tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/netrw-plugin-delete-command-broken/Makefile b/tests/netrw-plugin-delete-command-broken/Makefile index 8e1ea105..5e02ce37 100644 --- a/tests/netrw-plugin-delete-command-broken/Makefile +++ b/tests/netrw-plugin-delete-command-broken/Makefile @@ -54,7 +54,6 @@ $(METADATA): Makefile @echo "Type: Regression" >> $(METADATA) @echo "TestTime: 5m" >> $(METADATA) @echo "RunFor: vim" >> $(METADATA) - @echo "Requires: vim" >> $(METADATA) @echo "Priority: Normal" >> $(METADATA) @echo "License: GPLv2" >> $(METADATA) @echo "Confidential: no" >> $(METADATA) diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile index d442496b..45099dde 100644 --- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile +++ b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile @@ -54,7 +54,7 @@ $(METADATA): Makefile @echo "Type: Regression" >> $(METADATA) @echo "TestTime: 5m" >> $(METADATA) @echo "RunFor: vim" >> $(METADATA) - @echo "Requires: vim vim-minimal" >> $(METADATA) + @echo "Requires: vim-minimal" >> $(METADATA) @echo "Priority: Normal" >> $(METADATA) @echo "License: GPLv2" >> $(METADATA) @echo "Confidential: no" >> $(METADATA) From 236cd8ac36da4e65e9741c3f144bc9c7454152fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Jul 2018 18:24:37 +0200 Subject: [PATCH 023/584] Rebuilt for Python 3.7 --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index f6b1cba4..b7e6f684 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -760,6 +760,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jul 02 2018 Miro Hrončok - 2:8.1.119-2 +- Rebuilt for Python 3.7 + * Thu Jun 28 2018 Karsten Hopp 8.1.119-1 - patchlevel 119 From 1acffb4e9bc334a5cc8917cbee0b81be3002d778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 3 Jul 2018 13:02:53 +0200 Subject: [PATCH 024/584] Perl 5.28 rebuild --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index b7e6f684..f149c99e 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 3%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -760,6 +760,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jul 03 2018 Petr Pisar - 2:8.1.119-3 +- Perl 5.28 rebuild + * Mon Jul 02 2018 Miro Hrončok - 2:8.1.119-2 - Rebuilt for Python 3.7 From eec3257e4c931941cf4184d4c4fbad015b58c942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 4 Jul 2018 14:15:10 +0200 Subject: [PATCH 025/584] Backport patch 8.1.0121: crash when using ballooneval related to 'vartabstop' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commited on behalf of Zdeněk Dohnal Resolves: rhbz#1597842 Signed-off-by: Jaroslav Škarvada --- ...rash-when-using-ballooneval-related-.patch | 130 ++++++++++++++++++ vim.spec | 10 +- 2 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 0001-patch-8.1.0121-crash-when-using-ballooneval-related-.patch diff --git a/0001-patch-8.1.0121-crash-when-using-ballooneval-related-.patch b/0001-patch-8.1.0121-crash-when-using-ballooneval-related-.patch new file mode 100644 index 00000000..608349e3 --- /dev/null +++ b/0001-patch-8.1.0121-crash-when-using-ballooneval-related-.patch @@ -0,0 +1,130 @@ +From 1e36677f8d4c57bb0e90b8a1136c392cc3b301c7 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar +Date: Thu, 28 Jun 2018 12:05:11 +0200 +Subject: [PATCH] patch 8.1.0121: crash when using ballooneval related to + 'vartabstop' + +Problem: Crash when using ballooneval related to 'vartabstop'. +Solution: Initialize balloonEval->vts to NULL. (Markus Braun) +--- + src/ex_cmds2.c | 2 +- + src/gui.c | 5 +++++ + src/gui_beval.c | 11 +---------- + src/gui_w32.c | 9 +-------- + src/version.c | 2 ++ + 5 files changed, 10 insertions(+), 19 deletions(-) + +diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c +index 01bc357f4..5f58fedfb 100644 +--- a/src/ex_cmds2.c ++++ b/src/ex_cmds2.c +@@ -1419,7 +1419,7 @@ check_due_timer(void) + bevalexpr_due_set = FALSE; + if (balloonEval == NULL) + { +- balloonEval = (BalloonEval *)alloc(sizeof(BalloonEval)); ++ balloonEval = (BalloonEval *)alloc_clear(sizeof(BalloonEval)); + balloonEvalForTerm = TRUE; + } + if (balloonEval != NULL) +diff --git a/src/gui.c b/src/gui.c +index 87ea5ce2b..f51b81f86 100644 +--- a/src/gui.c ++++ b/src/gui.c +@@ -745,7 +745,12 @@ gui_init(void) + /* Always create the Balloon Evaluation area, but disable it when + * 'ballooneval' is off. */ + if (balloonEval != NULL) ++ { ++# ifdef FEAT_VARTABS ++ vim_free(balloonEval->vts); ++# endif + vim_free(balloonEval); ++ } + balloonEvalForTerm = FALSE; + # ifdef FEAT_GUI_GTK + balloonEval = gui_mch_create_beval_area(gui.drawarea, NULL, +diff --git a/src/gui_beval.c b/src/gui_beval.c +index 7e4625080..49694cfdd 100644 +--- a/src/gui_beval.c ++++ b/src/gui_beval.c +@@ -111,28 +111,19 @@ gui_mch_create_beval_area( + return NULL; + } + +- beval = (BalloonEval *)alloc(sizeof(BalloonEval)); ++ beval = (BalloonEval *)alloc_clear(sizeof(BalloonEval)); + if (beval != NULL) + { + #ifdef FEAT_GUI_GTK + beval->target = GTK_WIDGET(target); +- beval->balloonShell = NULL; +- beval->timerID = 0; + #else + beval->target = (Widget)target; +- beval->balloonShell = NULL; +- beval->timerID = (XtIntervalId)NULL; + beval->appContext = XtWidgetToApplicationContext((Widget)target); + #endif + beval->showState = ShS_NEUTRAL; +- beval->x = 0; +- beval->y = 0; + beval->msg = mesg; + beval->msgCB = mesgCB; + beval->clientData = clientData; +-#ifdef FEAT_VARTABS +- beval->vts = NULL; +-#endif + + /* + * Set up event handler which will keep its eyes on the pointer, +diff --git a/src/gui_w32.c b/src/gui_w32.c +index 855381108..147d98b39 100644 +--- a/src/gui_w32.c ++++ b/src/gui_w32.c +@@ -8922,28 +8922,21 @@ gui_mch_create_beval_area( + return NULL; + } + +- beval = (BalloonEval *)alloc(sizeof(BalloonEval)); ++ beval = (BalloonEval *)alloc_clear(sizeof(BalloonEval)); + if (beval != NULL) + { + beval->target = s_textArea; +- beval->balloon = NULL; + + beval->showState = ShS_NEUTRAL; +- beval->x = 0; +- beval->y = 0; + beval->msg = mesg; + beval->msgCB = mesgCB; + beval->clientData = clientData; +-#ifdef FEAT_VARTABS +- beval->vts = NULL; +-#endif + + InitCommonControls(); + cur_beval = beval; + + if (p_beval) + gui_mch_enable_beval_area(beval); +- + } + return beval; + } +diff --git a/src/version.c b/src/version.c +index a7a96b396..563a70be6 100644 +--- a/src/version.c ++++ b/src/version.c +@@ -789,6 +789,8 @@ static char *(features[]) = + + static int included_patches[] = + { /* Add new patch number below this line */ ++/**/ ++ 121, + /**/ + 119, + /**/ +-- +2.14.4 + diff --git a/vim.spec b/vim.spec index f149c99e..2d703864 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 3%{?dist} +Release: 4%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -68,6 +68,9 @@ 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 +# Upstream patch: +Patch3018: 0001-patch-8.1.0121-crash-when-using-ballooneval-related-.patch + # gcc is no longer in buildroot by default BuildRequires: gcc @@ -241,6 +244,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 %patch3017 -p1 +%patch3018 -p1 %build %if 0%{?rhel} > 7 @@ -760,6 +764,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jul 04 2018 Ondřej Lysoněk - 2:8.1.119-4 +- Backport patch 8.1.0121: crash when using ballooneval related to 'vartabstop' +- Resolves: rhbz#1597842 + * Tue Jul 03 2018 Petr Pisar - 2:8.1.119-3 - Perl 5.28 rebuild From 1dc6d2965fd207e329e3c2f32138dc9bbacdf5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 6 Jul 2018 09:36:36 +0200 Subject: [PATCH 026/584] Perl 5.28 rebuild --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 2d703864..48c4728a 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 4%{?dist} +Release: 5%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -764,6 +764,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jul 06 2018 Petr Pisar - 2:8.1.119-5 +- Perl 5.28 rebuild + * Wed Jul 04 2018 Ondřej Lysoněk - 2:8.1.119-4 - Backport patch 8.1.0121: crash when using ballooneval related to 'vartabstop' - Resolves: rhbz#1597842 From ac9812aaec08d55c3dc9614bd982fba4332fece5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 10 Jul 2018 13:16:45 +0200 Subject: [PATCH 027/584] 1599663 - Conflicting manpages rvi.1.gz and vi.1.gz during update --- vim.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 48c4728a..19fc62ed 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 5%{?dist} +Release: 6%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -107,6 +107,8 @@ Conflicts: man-pages-fr < 0.9.7-14 Conflicts: man-pages-it < 0.3.0-17 Conflicts: man-pages-pl < 0.24-2 Requires: %{name}-filesystem +# conflicts in package because of manpage move (bug #1599663) +Conflicts: %{name}-minimal < 8.0.1428-4 %description common VIM (VIsual editor iMproved) is an updated and improved version of the @@ -131,6 +133,8 @@ many different languages. Summary: A minimal version of the VIM editor Provides: vi = %{version}-%{release} Provides: %{_bindir}/vi +# conflicts in package because of manpage move (bug #1599663) +Conflicts: %{name}-common < 8.0.1428-4 %description minimal VIM (VIsual editor iMproved) is an updated and improved version of the @@ -764,6 +768,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jul 10 2018 Zdenek Dohnal - 2:8.1.119-6 +- 1599663 - Conflicting manpages rvi.1.gz and vi.1.gz during update + * Fri Jul 06 2018 Petr Pisar - 2:8.1.119-5 - Perl 5.28 rebuild From 0344e4cda04130f1a84e3c26c44d753d6a229d0f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 11 Jul 2018 08:12:43 +0200 Subject: [PATCH 028/584] use %{__python3} macro for defining shebang in python3 tests --- vim.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 19fc62ed..324b4e8d 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 6%{?dist} +Release: 7%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -220,6 +220,10 @@ vim-common package. %prep %setup -q -b 0 -n %{vimdir} + +# use %%{__python3} macro for defining shebangs in python3 tests +sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3017} + # fix rogue dependencies from sample code chmod -x runtime/tools/mve.awk %patch2002 -p1 @@ -768,6 +772,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jul 11 2018 Zdenek Dohnal - 2:8.1.119-7 +- use %%{__python3} macro for defining shebang in python3 tests + * Tue Jul 10 2018 Zdenek Dohnal - 2:8.1.119-6 - 1599663 - Conflicting manpages rvi.1.gz and vi.1.gz during update From c331934aaba00964d4290fd2ac211b740e515313 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 11 Jul 2018 10:28:18 +0200 Subject: [PATCH 029/584] add packager and epoch into update script to have better changelog --- vim-update.sh | 4 +++- vim.spec | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index dc3a892c..c0854a95 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -37,6 +37,8 @@ fi MAJORVERSION=`grep "define baseversion" vim.spec | cut -d ' ' -f 3` MAJORVERDIR=$(echo $MAJORVERSION | sed -e 's/\.//') +EPOCH=`grep "Epoch:" vim.spec | cut -d ':' -f 2` +PACKAGER=`rpmdev-packager` ORIGPL=`grep "define patchlevel" vim.spec | cut -d ' ' -f 3 | sed -e "s/^0*//g"` ORIGPLFILLED=`printf "%03d" $ORIGPL` @@ -76,7 +78,7 @@ cp -f vim-upstream/dist/vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2 . #wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/ftplugin/spec.vim -O ftplugin-spec.vim #wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/syntax/spec.vim -O syntax-spec.vim if [ $CHANGES -ne 0 ]; then - CHLOG="* $DATE Karsten Hopp $UPSTREAMMAJOR" + CHLOG="* $DATE $PACKAGER - $EPOCH:$UPSTREAMMAJOR" $debug sed -i -e "/Release: /cRelease: 1%{?dist}" $SPEC if [ "x$MAJORVERSION" != "x$UPSTREAMMAJOR" ]; then $debug sed -i -s "s/define baseversion $MAJORVERSION/define baseversion $UPSTREAMMAJOR/" $SPEC diff --git a/vim.spec b/vim.spec index 324b4e8d..ee4d1d93 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 7%{?dist} +Release: 8%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -772,6 +772,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jul 11 2018 Zdenek Dohnal - 2:8.1.119-8 +- add packager and epoch into update script to have better changelog + * Wed Jul 11 2018 Zdenek Dohnal - 2:8.1.119-7 - use %%{__python3} macro for defining shebang in python3 tests From f55f5976df0109578d118a9ad27830e3cab1f38b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 11 Jul 2018 10:29:22 +0200 Subject: [PATCH 030/584] - patchlevel 177 --- .gitignore | 1 + ...rash-when-using-ballooneval-related-.patch | 130 ------------------ sources | 2 +- vim-update.sh | 2 +- vim.spec | 17 +-- 5 files changed, 12 insertions(+), 140 deletions(-) delete mode 100644 0001-patch-8.1.0121-crash-when-using-ballooneval-related-.patch diff --git a/.gitignore b/.gitignore index 99921c9c..13555a1e 100644 --- a/.gitignore +++ b/.gitignore @@ -210,3 +210,4 @@ /vim-8.1-115.tar.bz2 /vim-8.1-117.tar.bz2 /vim-8.1-119.tar.bz2 +/vim-8.1-177.tar.bz2 diff --git a/0001-patch-8.1.0121-crash-when-using-ballooneval-related-.patch b/0001-patch-8.1.0121-crash-when-using-ballooneval-related-.patch deleted file mode 100644 index 608349e3..00000000 --- a/0001-patch-8.1.0121-crash-when-using-ballooneval-related-.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 1e36677f8d4c57bb0e90b8a1136c392cc3b301c7 Mon Sep 17 00:00:00 2001 -From: Bram Moolenaar -Date: Thu, 28 Jun 2018 12:05:11 +0200 -Subject: [PATCH] patch 8.1.0121: crash when using ballooneval related to - 'vartabstop' - -Problem: Crash when using ballooneval related to 'vartabstop'. -Solution: Initialize balloonEval->vts to NULL. (Markus Braun) ---- - src/ex_cmds2.c | 2 +- - src/gui.c | 5 +++++ - src/gui_beval.c | 11 +---------- - src/gui_w32.c | 9 +-------- - src/version.c | 2 ++ - 5 files changed, 10 insertions(+), 19 deletions(-) - -diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c -index 01bc357f4..5f58fedfb 100644 ---- a/src/ex_cmds2.c -+++ b/src/ex_cmds2.c -@@ -1419,7 +1419,7 @@ check_due_timer(void) - bevalexpr_due_set = FALSE; - if (balloonEval == NULL) - { -- balloonEval = (BalloonEval *)alloc(sizeof(BalloonEval)); -+ balloonEval = (BalloonEval *)alloc_clear(sizeof(BalloonEval)); - balloonEvalForTerm = TRUE; - } - if (balloonEval != NULL) -diff --git a/src/gui.c b/src/gui.c -index 87ea5ce2b..f51b81f86 100644 ---- a/src/gui.c -+++ b/src/gui.c -@@ -745,7 +745,12 @@ gui_init(void) - /* Always create the Balloon Evaluation area, but disable it when - * 'ballooneval' is off. */ - if (balloonEval != NULL) -+ { -+# ifdef FEAT_VARTABS -+ vim_free(balloonEval->vts); -+# endif - vim_free(balloonEval); -+ } - balloonEvalForTerm = FALSE; - # ifdef FEAT_GUI_GTK - balloonEval = gui_mch_create_beval_area(gui.drawarea, NULL, -diff --git a/src/gui_beval.c b/src/gui_beval.c -index 7e4625080..49694cfdd 100644 ---- a/src/gui_beval.c -+++ b/src/gui_beval.c -@@ -111,28 +111,19 @@ gui_mch_create_beval_area( - return NULL; - } - -- beval = (BalloonEval *)alloc(sizeof(BalloonEval)); -+ beval = (BalloonEval *)alloc_clear(sizeof(BalloonEval)); - if (beval != NULL) - { - #ifdef FEAT_GUI_GTK - beval->target = GTK_WIDGET(target); -- beval->balloonShell = NULL; -- beval->timerID = 0; - #else - beval->target = (Widget)target; -- beval->balloonShell = NULL; -- beval->timerID = (XtIntervalId)NULL; - beval->appContext = XtWidgetToApplicationContext((Widget)target); - #endif - beval->showState = ShS_NEUTRAL; -- beval->x = 0; -- beval->y = 0; - beval->msg = mesg; - beval->msgCB = mesgCB; - beval->clientData = clientData; --#ifdef FEAT_VARTABS -- beval->vts = NULL; --#endif - - /* - * Set up event handler which will keep its eyes on the pointer, -diff --git a/src/gui_w32.c b/src/gui_w32.c -index 855381108..147d98b39 100644 ---- a/src/gui_w32.c -+++ b/src/gui_w32.c -@@ -8922,28 +8922,21 @@ gui_mch_create_beval_area( - return NULL; - } - -- beval = (BalloonEval *)alloc(sizeof(BalloonEval)); -+ beval = (BalloonEval *)alloc_clear(sizeof(BalloonEval)); - if (beval != NULL) - { - beval->target = s_textArea; -- beval->balloon = NULL; - - beval->showState = ShS_NEUTRAL; -- beval->x = 0; -- beval->y = 0; - beval->msg = mesg; - beval->msgCB = mesgCB; - beval->clientData = clientData; --#ifdef FEAT_VARTABS -- beval->vts = NULL; --#endif - - InitCommonControls(); - cur_beval = beval; - - if (p_beval) - gui_mch_enable_beval_area(beval); -- - } - return beval; - } -diff --git a/src/version.c b/src/version.c -index a7a96b396..563a70be6 100644 ---- a/src/version.c -+++ b/src/version.c -@@ -789,6 +789,8 @@ static char *(features[]) = - - static int included_patches[] = - { /* Add new patch number below this line */ -+/**/ -+ 121, - /**/ - 119, - /**/ --- -2.14.4 - diff --git a/sources b/sources index 3022bfd2..8aac74f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-119.tar.bz2) = cde0a6adf4bd52b4d19396d1c81787702667fe7dabb20672303f78e6b5ce5de09e3531b83231585ee98e64b14a7132a8d9d2f1329bb154944717075dbf593e11 +SHA512 (vim-8.1-177.tar.bz2) = 82e76c147cdf814812b4e423d79e5f80658f31b9b26fb1eadfa2f8e59d4f0536447f89ce8a68ef3a7aba2945d25e98b556a33bc650212bb981b921fb51cd528c diff --git a/vim-update.sh b/vim-update.sh index c0854a95..ebae0bad 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -78,7 +78,7 @@ cp -f vim-upstream/dist/vim-${UPSTREAMMAJOR}-${LASTPLFILLED}.tar.bz2 . #wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/ftplugin/spec.vim -O ftplugin-spec.vim #wget https://raw.githubusercontent.com/ignatenkobrain/vim-spec-plugin/master/syntax/spec.vim -O syntax-spec.vim if [ $CHANGES -ne 0 ]; then - CHLOG="* $DATE $PACKAGER - $EPOCH:$UPSTREAMMAJOR" + CHLOG="* $DATE $PACKAGER -$EPOCH:$UPSTREAMMAJOR" $debug sed -i -e "/Release: /cRelease: 1%{?dist}" $SPEC if [ "x$MAJORVERSION" != "x$UPSTREAMMAJOR" ]; then $debug sed -i -s "s/define baseversion $MAJORVERSION/define baseversion $UPSTREAMMAJOR/" $SPEC diff --git a/vim.spec b/vim.spec index ee4d1d93..0b667563 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 119 +%define patchlevel 177 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 8%{?dist} +Release: 1%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -68,9 +68,6 @@ 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 -# Upstream patch: -Patch3018: 0001-patch-8.1.0121-crash-when-using-ballooneval-related-.patch - # gcc is no longer in buildroot by default BuildRequires: gcc @@ -252,7 +249,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 %patch3017 -p1 -%patch3018 -p1 %build %if 0%{?rhel} > 7 @@ -534,7 +530,7 @@ rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/tutor/tutor.gr.utf-8~ ) # Remove not UTF-8 manpages -for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1; do +for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1 da.ISO8859-1 de.ISO8859-1; do rm -rf %{buildroot}/%{_mandir}/$i done @@ -542,7 +538,7 @@ done mv %{buildroot}/%{_mandir}/ru.UTF-8 %{buildroot}/%{_mandir}/ru # Remove duplicate man pages -for i in fr.UTF-8 it.UTF-8 pl.UTF-8; do +for i in fr.UTF-8 it.UTF-8 pl.UTF-8 da.UTF-8 de.UTF-8; do rm -rf %{buildroot}/%{_mandir}/$i done @@ -647,6 +643,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_mandir}/man1/xxd.* %{_mandir}/man5/vimrc.* %lang(fr) %{_mandir}/fr/man1/* +%lang(da) %{_mandir}/da/man1/* +%lang(de) %{_mandir}/de/man1/* %lang(it) %{_mandir}/it/man1/* %lang(ja) %{_mandir}/ja/man1/* %lang(pl) %{_mandir}/pl/man1/* @@ -772,6 +770,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jul 11 2018 Zdenek Dohnal - 2:8.1.177-1 +- patchlevel 177 + * Wed Jul 11 2018 Zdenek Dohnal - 2:8.1.119-8 - add packager and epoch into update script to have better changelog From c03762373ba8911c8c7e500e27ab8bf4815f3d16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:32:21 +0000 Subject: [PATCH 031/584] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 0b667563..2897438e 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -770,6 +770,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2:8.1.177-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jul 11 2018 Zdenek Dohnal - 2:8.1.177-1 - patchlevel 177 From 822b0d60114c76249c6e24691a29ae7a77c49e51 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 16 Jul 2018 07:39:46 +0200 Subject: [PATCH 032/584] remove disable-gtk3-check configure option --- vim.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index 2897438e..766c0f5d 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 3%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -295,7 +295,6 @@ mv -f ex_cmds.c.save ex_cmds.c --disable-tclinterp --with-x=yes \ --enable-xim --enable-multibyte \ --with-tlib=ncurses \ - --disable-gtk3-check \ --enable-gtk3-check --enable-gui=gtk3 \ --with-compiledby="" --enable-cscope \ --with-modified-by="" \ @@ -770,6 +769,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jul 16 2018 Zdenek Dohnal - 2:8.1.177-3 +- remove disable-gtk3-check configure option + * Sat Jul 14 2018 Fedora Release Engineering - 2:8.1.177-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From fae43154a5527d591bf026a646e4b94143150439 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 16 Jul 2018 07:41:24 +0200 Subject: [PATCH 033/584] - patchlevel 189 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 13555a1e..b15009cb 100644 --- a/.gitignore +++ b/.gitignore @@ -211,3 +211,4 @@ /vim-8.1-117.tar.bz2 /vim-8.1-119.tar.bz2 /vim-8.1-177.tar.bz2 +/vim-8.1-189.tar.bz2 diff --git a/sources b/sources index 8aac74f2..c723643a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-177.tar.bz2) = 82e76c147cdf814812b4e423d79e5f80658f31b9b26fb1eadfa2f8e59d4f0536447f89ce8a68ef3a7aba2945d25e98b556a33bc650212bb981b921fb51cd528c +SHA512 (vim-8.1-189.tar.bz2) = a4159bec4f0f28f90fe33b422f69f607d7932afd60918b8a179b5e59ce8c0789ff78060bdd6c4c1efd0eb658cbf4685db428b00bda388ce42eb6c2ed603e0eb8 diff --git a/vim.spec b/vim.spec index 766c0f5d..de9460fe 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 177 +%define patchlevel 189 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 3%{?dist} +Release: 1%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -769,6 +769,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jul 16 2018 Zdenek Dohnal - 2:8.1.189-1 +- patchlevel 189 + * Mon Jul 16 2018 Zdenek Dohnal - 2:8.1.177-3 - remove disable-gtk3-check configure option From 27a7f86c6a9111ff50b5c7c82ac5ba29e70c7bcc Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 19 Jul 2018 16:41:59 +0200 Subject: [PATCH 034/584] 1603272 - vim-X11 doesn't provide the gui when certain devel packages missing from buildroot --- vim.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index de9460fe..d412938d 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -184,6 +184,14 @@ 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) +BuildRequires: gtk3-devel +BuildRequires: libX11-devel +BuildRequires: libSM-devel +BuildRequires: libXt-devel +BuildRequires: libXpm-devel +BuildRequires: libICE-devel + Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk3 Provides: gvim = %{version}-%{release} Provides: %{_bindir}/mergetool @@ -769,6 +777,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jul 19 2018 Zdenek Dohnal - 2:8.1.189-2 +- 1603272 - vim-X11 doesn't provide the gui when certain devel packages missing from buildroot + * Mon Jul 16 2018 Zdenek Dohnal - 2:8.1.189-1 - patchlevel 189 From 8b1897224c5d112b08c5eafe3be9d3bb6c5c4468 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 20 Jul 2018 12:04:36 +0200 Subject: [PATCH 035/584] - patchlevel 197 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b15009cb..d532f5eb 100644 --- a/.gitignore +++ b/.gitignore @@ -212,3 +212,4 @@ /vim-8.1-119.tar.bz2 /vim-8.1-177.tar.bz2 /vim-8.1-189.tar.bz2 +/vim-8.1-197.tar.bz2 diff --git a/sources b/sources index c723643a..4f44062d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-189.tar.bz2) = a4159bec4f0f28f90fe33b422f69f607d7932afd60918b8a179b5e59ce8c0789ff78060bdd6c4c1efd0eb658cbf4685db428b00bda388ce42eb6c2ed603e0eb8 +SHA512 (vim-8.1-197.tar.bz2) = 2613710a36a59f88ab98d9164ef29da476232311b785b75f44f518cc45baccdad9526434bfe832b8494553e3e8b879bb989396fa0adbf4f94336591f3b9f42e4 diff --git a/vim.spec b/vim.spec index d412938d..de262f5b 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 189 +%define patchlevel 197 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -777,6 +777,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jul 20 2018 Zdenek Dohnal - 2:8.1.197-1 +- patchlevel 197 + * Thu Jul 19 2018 Zdenek Dohnal - 2:8.1.189-2 - 1603272 - vim-X11 doesn't provide the gui when certain devel packages missing from buildroot From d93c7aa7b374c690a2e20750cb0c06be96cd0f05 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 23 Jul 2018 17:11:37 +0200 Subject: [PATCH 036/584] - patchlevel 207 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d532f5eb..0db289ca 100644 --- a/.gitignore +++ b/.gitignore @@ -213,3 +213,4 @@ /vim-8.1-177.tar.bz2 /vim-8.1-189.tar.bz2 /vim-8.1-197.tar.bz2 +/vim-8.1-207.tar.bz2 diff --git a/sources b/sources index 4f44062d..e7a05143 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-197.tar.bz2) = 2613710a36a59f88ab98d9164ef29da476232311b785b75f44f518cc45baccdad9526434bfe832b8494553e3e8b879bb989396fa0adbf4f94336591f3b9f42e4 +SHA512 (vim-8.1-207.tar.bz2) = 9561f213fed301f5b9a3dcad57a84abc47e1b4ec01337773f80832485981a8851476c28f317aea51250fdbcfcd34a261085a7223fabe5a1e2efa70a9eaf1abb3 diff --git a/vim.spec b/vim.spec index de262f5b..5ebbb974 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 197 +%define patchlevel 207 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -777,6 +777,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jul 23 2018 Zdenek Dohnal - 2:8.1.207-1 +- patchlevel 207 + * Fri Jul 20 2018 Zdenek Dohnal - 2:8.1.197-1 - patchlevel 197 From 4d1eca2f3f4a65634248d2d7b1e992ae48d7daa3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 24 Jul 2018 16:17:38 +0200 Subject: [PATCH 037/584] correcting license --- vim.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index 5ebbb974..f54b2677 100644 --- a/vim.spec +++ b/vim.spec @@ -24,8 +24,8 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} -License: Vim +Release: 2%{?dist} +License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh Source2: vim.csh @@ -777,6 +777,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jul 24 2018 Zdenek Dohnal - 2:8.1.207-2 +- correcting license + * Mon Jul 23 2018 Zdenek Dohnal - 2:8.1.207-1 - patchlevel 207 From 626eb2def937d507233a08f49781527862ada5ab Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 25 Jul 2018 08:39:30 +0200 Subject: [PATCH 038/584] - patchlevel 209 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0db289ca..22b7229e 100644 --- a/.gitignore +++ b/.gitignore @@ -214,3 +214,4 @@ /vim-8.1-189.tar.bz2 /vim-8.1-197.tar.bz2 /vim-8.1-207.tar.bz2 +/vim-8.1-209.tar.bz2 diff --git a/sources b/sources index e7a05143..bb108c9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-207.tar.bz2) = 9561f213fed301f5b9a3dcad57a84abc47e1b4ec01337773f80832485981a8851476c28f317aea51250fdbcfcd34a261085a7223fabe5a1e2efa70a9eaf1abb3 +SHA512 (vim-8.1-209.tar.bz2) = f7d426e9e57308b8f436d3e7263adecd72d5261b3a55bea7b1c8e34d6bed30ea614adc9f0c46c53a55e408af0da99959bc674aeb51b04353ec5269c790489b3f diff --git a/vim.spec b/vim.spec index f54b2677..3a0e3321 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 207 +%define patchlevel 209 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -777,6 +777,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jul 25 2018 Zdenek Dohnal - 2:8.1.209-1 +- patchlevel 209 + * Tue Jul 24 2018 Zdenek Dohnal - 2:8.1.207-2 - correcting license From 3ac894cfda947aab81cff339e7889c7b755e9286 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 27 Jul 2018 13:26:01 +0200 Subject: [PATCH 039/584] fail if configure option isn't satisfied --- vim.spec | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/vim.spec b/vim.spec index 3a0e3321..5e1e42cc 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -275,6 +275,18 @@ export CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOU 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 +# --with-features - for setting how big amount of features is enabled +# --enable-multibyte - enabling multibyte editing support - for editing files in languages, which one character +# cannot be represented by one byte - Asian languages, Unicode +# --disable-netbeans - disabling socket interface for integrating Vim into NetBeans IDE +# --enable-selinux - enabling selinux support +# --enable-Ninterp - enabling internal interpreter +# --with-x - yes if we want X11 support (graphical Vim for X11) +# --with-tlib - which terminal library to use +# --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 \ --enable-multibyte \ @@ -287,7 +299,8 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --disable-pythoninterp --disable-perlinterp --disable-tclinterp \ --with-tlib=ncurses --enable-gui=no --disable-gpm --exec-prefix=/ \ --with-compiledby="" \ - --with-modified-by="" + --with-modified-by="" \ + --enable-fail-if-missing make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags} cp vim minimal-vim @@ -296,6 +309,11 @@ 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 \ --enable-pythoninterp=dynamic \ --enable-python3interp=dynamic \ @@ -326,7 +344,7 @@ mv -f ex_cmds.c.save ex_cmds.c %else --disable-luainterp \ %endif - --enable-termtruecolor + --enable-fail-if-missing make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags} cp vim gvim @@ -362,7 +380,7 @@ make clean %else --disable-luainterp \ %endif - --enable-termtruecolor + --enable-fail-if-missing make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags} cp vim enhanced-vim @@ -777,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jul 27 2018 Zdenek Dohnal - 2:8.1.209-2 +- fail if configure option isn't satisfied + * Wed Jul 25 2018 Zdenek Dohnal - 2:8.1.209-1 - patchlevel 209 From c306b12f8aeb6ed3cda81333795d1b487e3341ee Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 27 Jul 2018 13:28:00 +0200 Subject: [PATCH 040/584] - patchlevel 213 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 22b7229e..75b521fd 100644 --- a/.gitignore +++ b/.gitignore @@ -215,3 +215,4 @@ /vim-8.1-197.tar.bz2 /vim-8.1-207.tar.bz2 /vim-8.1-209.tar.bz2 +/vim-8.1-213.tar.bz2 diff --git a/sources b/sources index bb108c9a..d72a7fe8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-209.tar.bz2) = f7d426e9e57308b8f436d3e7263adecd72d5261b3a55bea7b1c8e34d6bed30ea614adc9f0c46c53a55e408af0da99959bc674aeb51b04353ec5269c790489b3f +SHA512 (vim-8.1-213.tar.bz2) = 05d38e4eb536731cbdd43481332e2faee313e1834b00c3ec331d1f02fbd0697badd2947e9437f41cc1035dc6499999ad123dc053a0ea81fbb730cf571304a15e diff --git a/vim.spec b/vim.spec index 5e1e42cc..d63bc01b 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 209 +%define patchlevel 213 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jul 27 2018 Zdenek Dohnal - 2:8.1.213-1 +- patchlevel 213 + * Fri Jul 27 2018 Zdenek Dohnal - 2:8.1.209-2 - fail if configure option isn't satisfied From 462cd0c71bdf7d0bc199fe8e23561c98d454ded2 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 30 Jul 2018 11:40:38 +0200 Subject: [PATCH 041/584] - patchlevel 229 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 75b521fd..2a17b2ee 100644 --- a/.gitignore +++ b/.gitignore @@ -216,3 +216,4 @@ /vim-8.1-207.tar.bz2 /vim-8.1-209.tar.bz2 /vim-8.1-213.tar.bz2 +/vim-8.1-229.tar.bz2 diff --git a/sources b/sources index d72a7fe8..3b0fba8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-213.tar.bz2) = 05d38e4eb536731cbdd43481332e2faee313e1834b00c3ec331d1f02fbd0697badd2947e9437f41cc1035dc6499999ad123dc053a0ea81fbb730cf571304a15e +SHA512 (vim-8.1-229.tar.bz2) = 4803cf0cc5e3dc9dd1fb95e54e0f6e6c67025ff4a43973e3c343fc8e9f55ad7ed6d384b4f663f3f47d7301c4640c52d00d151da9962149903ab8f9d75cb563cf diff --git a/vim.spec b/vim.spec index d63bc01b..aac470ed 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 213 +%define patchlevel 229 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jul 30 2018 Zdenek Dohnal - 2:8.1.229-1 +- patchlevel 229 + * Fri Jul 27 2018 Zdenek Dohnal - 2:8.1.213-1 - patchlevel 213 From 91459c7d903f8277af5cee422972790ad2f4ca80 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 31 Jul 2018 12:05:43 +0200 Subject: [PATCH 042/584] Rebuild with fixed binutils --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index aac470ed..3b7593d4 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jul 31 2018 Florian Weimer - 2:8.1.229-2 +- Rebuild with fixed binutils + * Mon Jul 30 2018 Zdenek Dohnal - 2:8.1.229-1 - patchlevel 229 From 79740ab13a748e7f926c0779bf9f417b66e7cb6f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 2 Aug 2018 12:40:49 +0200 Subject: [PATCH 043/584] - patchlevel 233 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2a17b2ee..66dc02cb 100644 --- a/.gitignore +++ b/.gitignore @@ -217,3 +217,4 @@ /vim-8.1-209.tar.bz2 /vim-8.1-213.tar.bz2 /vim-8.1-229.tar.bz2 +/vim-8.1-233.tar.bz2 diff --git a/sources b/sources index 3b0fba8a..ff67a346 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-229.tar.bz2) = 4803cf0cc5e3dc9dd1fb95e54e0f6e6c67025ff4a43973e3c343fc8e9f55ad7ed6d384b4f663f3f47d7301c4640c52d00d151da9962149903ab8f9d75cb563cf +SHA512 (vim-8.1-233.tar.bz2) = 1d80b9a4b08808f5099a7975cdcdb72d7f58ea83112fa56b782d8721e333323c291f01b8f507130fe5271d3cac79a99e6484905dd5c17a2d326f397b5b7dbace diff --git a/vim.spec b/vim.spec index 3b7593d4..ed00e6ac 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 229 +%define patchlevel 233 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Aug 02 2018 Zdenek Dohnal - 2:8.1.233-1 +- patchlevel 233 + * Tue Jul 31 2018 Florian Weimer - 2:8.1.229-2 - Rebuild with fixed binutils From da5527b543f4cd2201af52214280704b797097f6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 6 Aug 2018 12:41:57 +0200 Subject: [PATCH 044/584] - patchlevel 240 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 66dc02cb..297871f4 100644 --- a/.gitignore +++ b/.gitignore @@ -218,3 +218,4 @@ /vim-8.1-213.tar.bz2 /vim-8.1-229.tar.bz2 /vim-8.1-233.tar.bz2 +/vim-8.1-240.tar.bz2 diff --git a/sources b/sources index ff67a346..19db4a68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-233.tar.bz2) = 1d80b9a4b08808f5099a7975cdcdb72d7f58ea83112fa56b782d8721e333323c291f01b8f507130fe5271d3cac79a99e6484905dd5c17a2d326f397b5b7dbace +SHA512 (vim-8.1-240.tar.bz2) = 3824e672a5c4b618408cf2a69961e35e8f824a0f09e8a2913557dd31b9a47dd2986374f66c2711b27451918a618df693fab8d2664c10a55d45f6a9cbdd49f0f0 diff --git a/vim.spec b/vim.spec index ed00e6ac..5d9280bc 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 233 +%define patchlevel 240 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Aug 06 2018 Zdenek Dohnal - 2:8.1.240-1 +- patchlevel 240 + * Thu Aug 02 2018 Zdenek Dohnal - 2:8.1.233-1 - patchlevel 233 From 93f90ad577f2439eeaa9e6040e1c022abe751f48 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 8 Aug 2018 09:50:55 +0200 Subject: [PATCH 045/584] - patchlevel 254 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 297871f4..0837efb6 100644 --- a/.gitignore +++ b/.gitignore @@ -219,3 +219,4 @@ /vim-8.1-229.tar.bz2 /vim-8.1-233.tar.bz2 /vim-8.1-240.tar.bz2 +/vim-8.1-254.tar.bz2 diff --git a/sources b/sources index 19db4a68..cac4d810 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-240.tar.bz2) = 3824e672a5c4b618408cf2a69961e35e8f824a0f09e8a2913557dd31b9a47dd2986374f66c2711b27451918a618df693fab8d2664c10a55d45f6a9cbdd49f0f0 +SHA512 (vim-8.1-254.tar.bz2) = 5408d377754006ecc8547ea727056c7a0e1801455ebded9befb597e268ffcf4a4c090e891b05e15f855c4828c500eb6c0c362209ce7fd1c5bd780dd242c79a97 diff --git a/vim.spec b/vim.spec index 5d9280bc..d3fab298 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 240 +%define patchlevel 254 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Aug 08 2018 Zdenek Dohnal - 2:8.1.254-1 +- patchlevel 254 + * Mon Aug 06 2018 Zdenek Dohnal - 2:8.1.240-1 - patchlevel 240 From 816b3c67a4e19b42989f4404a67782969d0e03d7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 9 Aug 2018 07:34:37 +0200 Subject: [PATCH 046/584] - patchlevel 258 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0837efb6..8f65bc5f 100644 --- a/.gitignore +++ b/.gitignore @@ -220,3 +220,4 @@ /vim-8.1-233.tar.bz2 /vim-8.1-240.tar.bz2 /vim-8.1-254.tar.bz2 +/vim-8.1-258.tar.bz2 diff --git a/sources b/sources index cac4d810..aca69346 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-254.tar.bz2) = 5408d377754006ecc8547ea727056c7a0e1801455ebded9befb597e268ffcf4a4c090e891b05e15f855c4828c500eb6c0c362209ce7fd1c5bd780dd242c79a97 +SHA512 (vim-8.1-258.tar.bz2) = e6ffd43b1e553a219a975189f04e004e2cfbbb737ce6e8dbfc70c683bd81f3f9ab8d9fe324b87fa8fe0a81c9e7712306813614e7349ca8ebfe4688f04b47088c diff --git a/vim.spec b/vim.spec index d3fab298..201ece46 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 254 +%define patchlevel 258 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Aug 09 2018 Zdenek Dohnal - 2:8.1.258-1 +- patchlevel 258 + * Wed Aug 08 2018 Zdenek Dohnal - 2:8.1.254-1 - patchlevel 254 From 4ba755aa4e21a5370bd350f1732d14460188b10e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 10 Aug 2018 13:37:56 +0200 Subject: [PATCH 047/584] - patchlevel 264 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8f65bc5f..ab07dea8 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,4 @@ /vim-8.1-240.tar.bz2 /vim-8.1-254.tar.bz2 /vim-8.1-258.tar.bz2 +/vim-8.1-264.tar.bz2 diff --git a/sources b/sources index aca69346..3844d07a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-258.tar.bz2) = e6ffd43b1e553a219a975189f04e004e2cfbbb737ce6e8dbfc70c683bd81f3f9ab8d9fe324b87fa8fe0a81c9e7712306813614e7349ca8ebfe4688f04b47088c +SHA512 (vim-8.1-264.tar.bz2) = f219f7148872a8a59a28bb420f4a2ec22862c64a6f252b7728498215ea52f45580d483e2a52a02fced735feef77bed88b8913193c1d34fc60ceaadf775731aa1 diff --git a/vim.spec b/vim.spec index 201ece46..254d13c3 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 258 +%define patchlevel 264 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Aug 10 2018 Zdenek Dohnal - 2:8.1.264-1 +- patchlevel 264 + * Thu Aug 09 2018 Zdenek Dohnal - 2:8.1.258-1 - patchlevel 258 From ded1030f1186b3c3b114ade845f7dccb3b19b7df Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 13 Aug 2018 14:22:31 +0200 Subject: [PATCH 048/584] - patchlevel 279 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ab07dea8..75dc85f8 100644 --- a/.gitignore +++ b/.gitignore @@ -222,3 +222,4 @@ /vim-8.1-254.tar.bz2 /vim-8.1-258.tar.bz2 /vim-8.1-264.tar.bz2 +/vim-8.1-279.tar.bz2 diff --git a/sources b/sources index 3844d07a..4162fadb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-264.tar.bz2) = f219f7148872a8a59a28bb420f4a2ec22862c64a6f252b7728498215ea52f45580d483e2a52a02fced735feef77bed88b8913193c1d34fc60ceaadf775731aa1 +SHA512 (vim-8.1-279.tar.bz2) = 79b4588be3f8b9b832ddb964bd1393ead250389c7047cdea0da16aa37cc857d2832c6507c725ac6f368a95a380ac464348b30a15f7df782a4a4503262e81b9d6 diff --git a/vim.spec b/vim.spec index 254d13c3..830826bc 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 264 +%define patchlevel 279 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Aug 13 2018 Zdenek Dohnal - 2:8.1.279-1 +- patchlevel 279 + * Fri Aug 10 2018 Zdenek Dohnal - 2:8.1.264-1 - patchlevel 264 From 7a096be39fd136fb8748be8a66fe02d0404298b7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 15 Aug 2018 08:53:42 +0200 Subject: [PATCH 049/584] - patchlevel 287 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 75dc85f8..ffcab0f2 100644 --- a/.gitignore +++ b/.gitignore @@ -223,3 +223,4 @@ /vim-8.1-258.tar.bz2 /vim-8.1-264.tar.bz2 /vim-8.1-279.tar.bz2 +/vim-8.1-287.tar.bz2 diff --git a/sources b/sources index 4162fadb..e12ee0df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-279.tar.bz2) = 79b4588be3f8b9b832ddb964bd1393ead250389c7047cdea0da16aa37cc857d2832c6507c725ac6f368a95a380ac464348b30a15f7df782a4a4503262e81b9d6 +SHA512 (vim-8.1-287.tar.bz2) = c5eb10806e1a25fad5e983345498a6d33bce9d2f59d7e72f5bae0ceea1e6ffeca73cfa7155c8d710b0d0039b0e6e7cd73394dd58f909383e70f7c693562b017e diff --git a/vim.spec b/vim.spec index 830826bc..e3366f9e 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 279 +%define patchlevel 287 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Aug 15 2018 Zdenek Dohnal - 2:8.1.287-1 +- patchlevel 287 + * Mon Aug 13 2018 Zdenek Dohnal - 2:8.1.279-1 - patchlevel 279 From 7725dffc9af5c52cdcdc6f4daf16a35e05bf7198 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 15 Aug 2018 12:01:03 +0200 Subject: [PATCH 050/584] vim-update.sh - add f29 branch --- vim-update.sh | 8 ++++---- vim.spec | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index ebae0bad..3f6e84cc 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,10 +1,10 @@ #!/bin/bash debug="" #debug="echo " -branches=( "master" "f28" "f27" ) -releases=( "fc29" "fc28" "fc27" ) -regexps=( "fc29" "\|fc28" "\|fc27" ) -bodhi_enabled=( "0" "1" "1") +branches=( "master" "f29" "f28" "f27" ) +releases=( "fc30" "fc29" "fc28" "fc27" ) +regexps=( "fc30" "\|fc29" "\|fc28" "\|fc27" ) +bodhi_enabled=( "0" "0" "1" "1") branches_count=3 #releases_regexp=fc28\\\|fc27\\\|fc28 diff --git a/vim.spec b/vim.spec index e3366f9e..7147fd84 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Aug 15 2018 Zdenek Dohnal - 2:8.1.287-2 +- vim-update.sh - add f29 branch + * Wed Aug 15 2018 Zdenek Dohnal - 2:8.1.287-1 - patchlevel 287 From 618e6bec51225c84a22fba4acb4620155a8a09ea Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 27 Aug 2018 12:08:49 +0200 Subject: [PATCH 051/584] - patchlevel 328 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ffcab0f2..fe1fcf33 100644 --- a/.gitignore +++ b/.gitignore @@ -224,3 +224,4 @@ /vim-8.1-264.tar.bz2 /vim-8.1-279.tar.bz2 /vim-8.1-287.tar.bz2 +/vim-8.1-328.tar.bz2 diff --git a/sources b/sources index e12ee0df..40c9aa2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-287.tar.bz2) = c5eb10806e1a25fad5e983345498a6d33bce9d2f59d7e72f5bae0ceea1e6ffeca73cfa7155c8d710b0d0039b0e6e7cd73394dd58f909383e70f7c693562b017e +SHA512 (vim-8.1-328.tar.bz2) = 512950340c4dd9538af397f894e6af3a7f423f661c46324863321fcd05552e55c7f6f8e592442bf73c6c7b1ae12252add60e51cb9fc6061f6d1e5a91df48f05f diff --git a/vim.spec b/vim.spec index 7147fd84..8c492659 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 287 +%define patchlevel 328 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Aug 27 2018 Zdenek Dohnal - 2:8.1.328-1 +- patchlevel 328 + * Wed Aug 15 2018 Zdenek Dohnal - 2:8.1.287-2 - vim-update.sh - add f29 branch From 4c4239744c69683f63ba991c6521a2a29f495a4e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 31 Aug 2018 09:37:37 +0200 Subject: [PATCH 052/584] vim-update.sh - F29 got enabled in bodhi --- vim-update.sh | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 3f6e84cc..b53e6fb6 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -4,7 +4,7 @@ debug="" branches=( "master" "f29" "f28" "f27" ) releases=( "fc30" "fc29" "fc28" "fc27" ) regexps=( "fc30" "\|fc29" "\|fc28" "\|fc27" ) -bodhi_enabled=( "0" "0" "1" "1") +bodhi_enabled=( "0" "1" "1" "1") branches_count=3 #releases_regexp=fc28\\\|fc27\\\|fc28 diff --git a/vim.spec b/vim.spec index 8c492659..c2d0927e 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Aug 31 2018 Zdenek Dohnal - 2:8.1.328-2 +- vim-update.sh - F29 got enabled in bodhi + * Mon Aug 27 2018 Zdenek Dohnal - 2:8.1.328-1 - patchlevel 328 From a4a91f32a0ca42b9eb67e3dd2bcc33395d416cf6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 7 Sep 2018 09:34:52 +0200 Subject: [PATCH 053/584] - patchlevel 351 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fe1fcf33..a503f667 100644 --- a/.gitignore +++ b/.gitignore @@ -225,3 +225,4 @@ /vim-8.1-279.tar.bz2 /vim-8.1-287.tar.bz2 /vim-8.1-328.tar.bz2 +/vim-8.1-351.tar.bz2 diff --git a/sources b/sources index 40c9aa2f..b52cb66b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-328.tar.bz2) = 512950340c4dd9538af397f894e6af3a7f423f661c46324863321fcd05552e55c7f6f8e592442bf73c6c7b1ae12252add60e51cb9fc6061f6d1e5a91df48f05f +SHA512 (vim-8.1-351.tar.bz2) = 320c91eb7eab8d87c45fa9843e31d058a424ad5ad4685cdf419b7e268bad35451881f2d94f3cfb9999a560fd21cc63a8c5416362e6fabaac23d2f3a6a7daf6bf diff --git a/vim.spec b/vim.spec index c2d0927e..508ef4af 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 328 +%define patchlevel 351 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Sep 07 2018 Zdenek Dohnal - 2:8.1.351-1 +- patchlevel 351 + * Fri Aug 31 2018 Zdenek Dohnal - 2:8.1.328-2 - vim-update.sh - F29 got enabled in bodhi From 978bc64580742087bf5becd4a3802bc9f12ce70b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 19 Sep 2018 08:32:12 +0200 Subject: [PATCH 054/584] - src/libvterm/src/termscreen.c is missing --- .gitignore | 1 + sources | 2 +- vim-missing-file.patch | 939 +++++++++++++++++++++++++++++++++++++++++ vim.spec | 9 +- 4 files changed, 949 insertions(+), 2 deletions(-) create mode 100644 vim-missing-file.patch diff --git a/.gitignore b/.gitignore index a503f667..4b29608d 100644 --- a/.gitignore +++ b/.gitignore @@ -226,3 +226,4 @@ /vim-8.1-287.tar.bz2 /vim-8.1-328.tar.bz2 /vim-8.1-351.tar.bz2 +/vim-8.1-408.tar.bz2 diff --git a/sources b/sources index b52cb66b..f1ccb208 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-351.tar.bz2) = 320c91eb7eab8d87c45fa9843e31d058a424ad5ad4685cdf419b7e268bad35451881f2d94f3cfb9999a560fd21cc63a8c5416362e6fabaac23d2f3a6a7daf6bf +SHA512 (vim-8.1-408.tar.bz2) = b2f90aa2b6463d1a0ff21294a26ea93c142190cc2376e562ba99a32b4dafe166648a6bf10f63ac7335d601d74259ea48b3f723da91bf735c20ec20190468e399 diff --git a/vim-missing-file.patch b/vim-missing-file.patch new file mode 100644 index 00000000..4634fa00 --- /dev/null +++ b/vim-missing-file.patch @@ -0,0 +1,939 @@ +diff -up vim81/src/libvterm/src/termscreen.c.missing-file vim81/src/libvterm/src/termscreen.c +--- vim81/src/libvterm/src/termscreen.c.missing-file 2018-09-19 09:26:00.601523830 +0200 ++++ vim81/src/libvterm/src/termscreen.c 2018-09-19 09:26:56.448031158 +0200 +@@ -0,0 +1,935 @@ ++#include "vterm_internal.h" ++ ++#include ++#include ++ ++#include "rect.h" ++#include "utf8.h" ++ ++#define UNICODE_SPACE 0x20 ++#define UNICODE_LINEFEED 0x0a ++ ++/* State of the pen at some moment in time, also used in a cell */ ++typedef struct ++{ ++ /* After the bitfield */ ++ VTermColor fg, bg; ++ ++ unsigned int bold : 1; ++ unsigned int underline : 2; ++ unsigned int italic : 1; ++ unsigned int blink : 1; ++ unsigned int reverse : 1; ++ unsigned int strike : 1; ++ unsigned int font : 4; /* 0 to 9 */ ++ ++ /* Extra state storage that isn't strictly pen-related */ ++ unsigned int protected_cell : 1; ++ unsigned int dwl : 1; /* on a DECDWL or DECDHL line */ ++ unsigned int dhl : 2; /* on a DECDHL line (1=top 2=bottom) */ ++} ScreenPen; ++ ++/* Internal representation of a screen cell */ ++typedef struct ++{ ++ uint32_t chars[VTERM_MAX_CHARS_PER_CELL]; ++ ScreenPen pen; ++} ScreenCell; ++ ++static int vterm_screen_set_cell(VTermScreen *screen, VTermPos pos, const VTermScreenCell *cell); ++ ++struct VTermScreen ++{ ++ VTerm *vt; ++ VTermState *state; ++ ++ const VTermScreenCallbacks *callbacks; ++ void *cbdata; ++ ++ VTermDamageSize damage_merge; ++ /* start_row == -1 => no damage */ ++ VTermRect damaged; ++ VTermRect pending_scrollrect; ++ int pending_scroll_downward, pending_scroll_rightward; ++ ++ int rows; ++ int cols; ++ int global_reverse; ++ ++ /* Primary and Altscreen. buffers[1] is lazily allocated as needed */ ++ ScreenCell *buffers[2]; ++ ++ /* buffer will == buffers[0] or buffers[1], depending on altscreen */ ++ ScreenCell *buffer; ++ ++ /* buffer for a single screen row used in scrollback storage callbacks */ ++ VTermScreenCell *sb_buffer; ++ ++ ScreenPen pen; ++}; ++ ++static ScreenCell *getcell(const VTermScreen *screen, int row, int col) ++{ ++ if(row < 0 || row >= screen->rows) ++ return NULL; ++ if(col < 0 || col >= screen->cols) ++ return NULL; ++ return screen->buffer + (screen->cols * row) + col; ++} ++ ++static ScreenCell *realloc_buffer(VTermScreen *screen, ScreenCell *buffer, int new_rows, int new_cols) ++{ ++ ScreenCell *new_buffer = vterm_allocator_malloc(screen->vt, sizeof(ScreenCell) * new_rows * new_cols); ++ int row, col; ++ ++ for(row = 0; row < new_rows; row++) { ++ for(col = 0; col < new_cols; col++) { ++ ScreenCell *new_cell = new_buffer + row*new_cols + col; ++ ++ if(buffer && row < screen->rows && col < screen->cols) ++ *new_cell = buffer[row * screen->cols + col]; ++ else { ++ new_cell->chars[0] = 0; ++ new_cell->pen = screen->pen; ++ } ++ } ++ } ++ ++ if(buffer) ++ vterm_allocator_free(screen->vt, buffer); ++ ++ return new_buffer; ++} ++ ++static void damagerect(VTermScreen *screen, VTermRect rect) ++{ ++ VTermRect emit; ++ ++ switch(screen->damage_merge) { ++ case VTERM_DAMAGE_CELL: ++ /* Always emit damage event */ ++ emit = rect; ++ break; ++ ++ case VTERM_DAMAGE_ROW: ++ /* Emit damage longer than one row. Try to merge with existing damage in ++ * the same row */ ++ if(rect.end_row > rect.start_row + 1) { ++ // Bigger than 1 line - flush existing, emit this ++ vterm_screen_flush_damage(screen); ++ emit = rect; ++ } ++ else if(screen->damaged.start_row == -1) { ++ // None stored yet ++ screen->damaged = rect; ++ return; ++ } ++ else if(rect.start_row == screen->damaged.start_row) { ++ // Merge with the stored line ++ if(screen->damaged.start_col > rect.start_col) ++ screen->damaged.start_col = rect.start_col; ++ if(screen->damaged.end_col < rect.end_col) ++ screen->damaged.end_col = rect.end_col; ++ return; ++ } ++ else { ++ // Emit the currently stored line, store a new one ++ emit = screen->damaged; ++ screen->damaged = rect; ++ } ++ break; ++ ++ case VTERM_DAMAGE_SCREEN: ++ case VTERM_DAMAGE_SCROLL: ++ /* Never emit damage event */ ++ if(screen->damaged.start_row == -1) ++ screen->damaged = rect; ++ else { ++ rect_expand(&screen->damaged, &rect); ++ } ++ return; ++ ++ default: ++ DEBUG_LOG1("TODO: Maybe merge damage for level %d\n", screen->damage_merge); ++ return; ++ } ++ ++ if(screen->callbacks && screen->callbacks->damage) ++ (*screen->callbacks->damage)(emit, screen->cbdata); ++} ++ ++static void damagescreen(VTermScreen *screen) ++{ ++ VTermRect rect = {0,0,0,0}; ++ rect.end_row = screen->rows; ++ rect.end_col = screen->cols; ++ ++ damagerect(screen, rect); ++} ++ ++static int putglyph(VTermGlyphInfo *info, VTermPos pos, void *user) ++{ ++ int i; ++ int col; ++ VTermRect rect; ++ ++ VTermScreen *screen = user; ++ ScreenCell *cell = getcell(screen, pos.row, pos.col); ++ ++ if(!cell) ++ return 0; ++ ++ for(i = 0; i < VTERM_MAX_CHARS_PER_CELL && info->chars[i]; i++) { ++ cell->chars[i] = info->chars[i]; ++ cell->pen = screen->pen; ++ } ++ if(i < VTERM_MAX_CHARS_PER_CELL) ++ cell->chars[i] = 0; ++ ++ for(col = 1; col < info->width; col++) ++ getcell(screen, pos.row, pos.col + col)->chars[0] = (uint32_t)-1; ++ ++ rect.start_row = pos.row; ++ rect.end_row = pos.row+1; ++ rect.start_col = pos.col; ++ rect.end_col = pos.col+info->width; ++ ++ cell->pen.protected_cell = info->protected_cell; ++ cell->pen.dwl = info->dwl; ++ cell->pen.dhl = info->dhl; ++ ++ damagerect(screen, rect); ++ ++ return 1; ++} ++ ++static int moverect_internal(VTermRect dest, VTermRect src, void *user) ++{ ++ VTermScreen *screen = user; ++ ++ if(screen->callbacks && screen->callbacks->sb_pushline && ++ dest.start_row == 0 && dest.start_col == 0 && // starts top-left corner ++ dest.end_col == screen->cols && // full width ++ screen->buffer == screen->buffers[0]) { // not altscreen ++ VTermPos pos; ++ for(pos.row = 0; pos.row < src.start_row; pos.row++) { ++ for(pos.col = 0; pos.col < screen->cols; pos.col++) ++ (void)vterm_screen_get_cell(screen, pos, screen->sb_buffer + pos.col); ++ ++ (screen->callbacks->sb_pushline)(screen->cols, screen->sb_buffer, screen->cbdata); ++ } ++ } ++ ++ { ++ int cols = src.end_col - src.start_col; ++ int downward = src.start_row - dest.start_row; ++ int init_row, test_row, inc_row; ++ int row; ++ ++ if(downward < 0) { ++ init_row = dest.end_row - 1; ++ test_row = dest.start_row - 1; ++ inc_row = -1; ++ } ++ else { ++ init_row = dest.start_row; ++ test_row = dest.end_row; ++ inc_row = +1; ++ } ++ ++ for(row = init_row; row != test_row; row += inc_row) ++ memmove(getcell(screen, row, dest.start_col), ++ getcell(screen, row + downward, src.start_col), ++ cols * sizeof(ScreenCell)); ++ } ++ ++ return 1; ++} ++ ++static int moverect_user(VTermRect dest, VTermRect src, void *user) ++{ ++ VTermScreen *screen = user; ++ ++ if(screen->callbacks && screen->callbacks->moverect) { ++ if(screen->damage_merge != VTERM_DAMAGE_SCROLL) ++ // Avoid an infinite loop ++ vterm_screen_flush_damage(screen); ++ ++ if((*screen->callbacks->moverect)(dest, src, screen->cbdata)) ++ return 1; ++ } ++ ++ damagerect(screen, dest); ++ ++ return 1; ++} ++ ++static int erase_internal(VTermRect rect, int selective, void *user) ++{ ++ VTermScreen *screen = user; ++ int row, col; ++ ++ for(row = rect.start_row; row < screen->state->rows && row < rect.end_row; row++) { ++ const VTermLineInfo *info = vterm_state_get_lineinfo(screen->state, row); ++ ++ for(col = rect.start_col; col < rect.end_col; col++) { ++ ScreenCell *cell = getcell(screen, row, col); ++ ++ if(selective && cell->pen.protected_cell) ++ continue; ++ ++ cell->chars[0] = 0; ++ cell->pen = screen->pen; ++ cell->pen.dwl = info->doublewidth; ++ cell->pen.dhl = info->doubleheight; ++ } ++ } ++ ++ return 1; ++} ++ ++static int erase_user(VTermRect rect, int selective UNUSED, void *user) ++{ ++ VTermScreen *screen = user; ++ ++ damagerect(screen, rect); ++ ++ return 1; ++} ++ ++static int erase(VTermRect rect, int selective, void *user) ++{ ++ erase_internal(rect, selective, user); ++ return erase_user(rect, 0, user); ++} ++ ++static int scrollrect(VTermRect rect, int downward, int rightward, void *user) ++{ ++ VTermScreen *screen = user; ++ ++ if(screen->damage_merge != VTERM_DAMAGE_SCROLL) { ++ vterm_scroll_rect(rect, downward, rightward, ++ moverect_internal, erase_internal, screen); ++ ++ vterm_screen_flush_damage(screen); ++ ++ vterm_scroll_rect(rect, downward, rightward, ++ moverect_user, erase_user, screen); ++ ++ return 1; ++ } ++ ++ if(screen->damaged.start_row != -1 && ++ !rect_intersects(&rect, &screen->damaged)) { ++ vterm_screen_flush_damage(screen); ++ } ++ ++ if(screen->pending_scrollrect.start_row == -1) { ++ screen->pending_scrollrect = rect; ++ screen->pending_scroll_downward = downward; ++ screen->pending_scroll_rightward = rightward; ++ } ++ else if(rect_equal(&screen->pending_scrollrect, &rect) && ++ ((screen->pending_scroll_downward == 0 && downward == 0) || ++ (screen->pending_scroll_rightward == 0 && rightward == 0))) { ++ screen->pending_scroll_downward += downward; ++ screen->pending_scroll_rightward += rightward; ++ } ++ else { ++ vterm_screen_flush_damage(screen); ++ ++ screen->pending_scrollrect = rect; ++ screen->pending_scroll_downward = downward; ++ screen->pending_scroll_rightward = rightward; ++ } ++ ++ vterm_scroll_rect(rect, downward, rightward, ++ moverect_internal, erase_internal, screen); ++ ++ if(screen->damaged.start_row == -1) ++ return 1; ++ ++ if(rect_contains(&rect, &screen->damaged)) { ++ /* Scroll region entirely contains the damage; just move it */ ++ vterm_rect_move(&screen->damaged, -downward, -rightward); ++ rect_clip(&screen->damaged, &rect); ++ } ++ /* There are a number of possible cases here, but lets restrict this to only ++ * the common case where we might actually gain some performance by ++ * optimising it. Namely, a vertical scroll that neatly cuts the damage ++ * region in half. ++ */ ++ else if(rect.start_col <= screen->damaged.start_col && ++ rect.end_col >= screen->damaged.end_col && ++ rightward == 0) { ++ if(screen->damaged.start_row >= rect.start_row && ++ screen->damaged.start_row < rect.end_row) { ++ screen->damaged.start_row -= downward; ++ if(screen->damaged.start_row < rect.start_row) ++ screen->damaged.start_row = rect.start_row; ++ if(screen->damaged.start_row > rect.end_row) ++ screen->damaged.start_row = rect.end_row; ++ } ++ if(screen->damaged.end_row >= rect.start_row && ++ screen->damaged.end_row < rect.end_row) { ++ screen->damaged.end_row -= downward; ++ if(screen->damaged.end_row < rect.start_row) ++ screen->damaged.end_row = rect.start_row; ++ if(screen->damaged.end_row > rect.end_row) ++ screen->damaged.end_row = rect.end_row; ++ } ++ } ++ else { ++ DEBUG_LOG2("TODO: Just flush and redo damaged=" STRFrect " rect=" STRFrect "\n", ++ ARGSrect(screen->damaged), ARGSrect(rect)); ++ } ++ ++ return 1; ++} ++ ++static int movecursor(VTermPos pos, VTermPos oldpos, int visible, void *user) ++{ ++ VTermScreen *screen = user; ++ ++ if(screen->callbacks && screen->callbacks->movecursor) ++ return (*screen->callbacks->movecursor)(pos, oldpos, visible, screen->cbdata); ++ ++ return 0; ++} ++ ++static int setpenattr(VTermAttr attr, VTermValue *val, void *user) ++{ ++ VTermScreen *screen = user; ++ ++ switch(attr) { ++ case VTERM_ATTR_BOLD: ++ screen->pen.bold = val->boolean; ++ return 1; ++ case VTERM_ATTR_UNDERLINE: ++ screen->pen.underline = val->number; ++ return 1; ++ case VTERM_ATTR_ITALIC: ++ screen->pen.italic = val->boolean; ++ return 1; ++ case VTERM_ATTR_BLINK: ++ screen->pen.blink = val->boolean; ++ return 1; ++ case VTERM_ATTR_REVERSE: ++ screen->pen.reverse = val->boolean; ++ return 1; ++ case VTERM_ATTR_STRIKE: ++ screen->pen.strike = val->boolean; ++ return 1; ++ case VTERM_ATTR_FONT: ++ screen->pen.font = val->number; ++ return 1; ++ case VTERM_ATTR_FOREGROUND: ++ screen->pen.fg = val->color; ++ return 1; ++ case VTERM_ATTR_BACKGROUND: ++ screen->pen.bg = val->color; ++ return 1; ++ ++ case VTERM_N_ATTRS: ++ return 0; ++ } ++ ++ return 0; ++} ++ ++static int settermprop(VTermProp prop, VTermValue *val, void *user) ++{ ++ VTermScreen *screen = user; ++ ++ switch(prop) { ++ case VTERM_PROP_ALTSCREEN: ++ if(val->boolean && !screen->buffers[1]) ++ return 0; ++ ++ screen->buffer = val->boolean ? screen->buffers[1] : screen->buffers[0]; ++ /* only send a damage event on disable; because during enable there's an ++ * erase that sends a damage anyway ++ */ ++ if(!val->boolean) ++ damagescreen(screen); ++ break; ++ case VTERM_PROP_REVERSE: ++ screen->global_reverse = val->boolean; ++ damagescreen(screen); ++ break; ++ default: ++ ; /* ignore */ ++ } ++ ++ if(screen->callbacks && screen->callbacks->settermprop) ++ return (*screen->callbacks->settermprop)(prop, val, screen->cbdata); ++ ++ return 1; ++} ++ ++static int bell(void *user) ++{ ++ VTermScreen *screen = user; ++ ++ if(screen->callbacks && screen->callbacks->bell) ++ return (*screen->callbacks->bell)(screen->cbdata); ++ ++ return 0; ++} ++ ++static int resize(int new_rows, int new_cols, VTermPos *delta, void *user) ++{ ++ VTermScreen *screen = user; ++ ++ int is_altscreen = (screen->buffers[1] && screen->buffer == screen->buffers[1]); ++ ++ int old_rows = screen->rows; ++ int old_cols = screen->cols; ++ int first_blank_row; ++ ++ if(!is_altscreen && new_rows < old_rows) { ++ // Fewer rows - determine if we're going to scroll at all, and if so, push ++ // those lines to scrollback ++ VTermPos pos = { 0, 0 }; ++ VTermPos cursor = screen->state->pos; ++ // Find the first blank row after the cursor. ++ for(pos.row = old_rows - 1; pos.row >= new_rows; pos.row--) ++ if(!vterm_screen_is_eol(screen, pos) || cursor.row == pos.row) ++ break; ++ ++ first_blank_row = pos.row + 1; ++ if(first_blank_row > new_rows) { ++ VTermRect rect = {0,0,0,0}; ++ rect.end_row = old_rows; ++ rect.end_col = old_cols; ++ scrollrect(rect, first_blank_row - new_rows, 0, user); ++ vterm_screen_flush_damage(screen); ++ ++ delta->row -= first_blank_row - new_rows; ++ } ++ } ++ ++ screen->buffers[0] = realloc_buffer(screen, screen->buffers[0], new_rows, new_cols); ++ if(screen->buffers[1]) ++ screen->buffers[1] = realloc_buffer(screen, screen->buffers[1], new_rows, new_cols); ++ ++ screen->buffer = is_altscreen ? screen->buffers[1] : screen->buffers[0]; ++ ++ screen->rows = new_rows; ++ screen->cols = new_cols; ++ ++ if(screen->sb_buffer) ++ vterm_allocator_free(screen->vt, screen->sb_buffer); ++ ++ screen->sb_buffer = vterm_allocator_malloc(screen->vt, sizeof(VTermScreenCell) * new_cols); ++ ++ if(new_cols > old_cols) { ++ VTermRect rect; ++ rect.start_row = 0; ++ rect.end_row = old_rows; ++ rect.start_col = old_cols; ++ rect.end_col = new_cols; ++ damagerect(screen, rect); ++ } ++ ++ if(new_rows > old_rows) { ++ if(!is_altscreen && screen->callbacks && screen->callbacks->sb_popline) { ++ int rows = new_rows - old_rows; ++ while(rows) { ++ VTermRect rect = {0,0,0,0}; ++ VTermPos pos = { 0, 0 }; ++ if(!(screen->callbacks->sb_popline(screen->cols, screen->sb_buffer, screen->cbdata))) ++ break; ++ ++ rect.end_row = screen->rows; ++ rect.end_col = screen->cols; ++ scrollrect(rect, -1, 0, user); ++ ++ for(pos.col = 0; pos.col < screen->cols; pos.col += screen->sb_buffer[pos.col].width) ++ vterm_screen_set_cell(screen, pos, screen->sb_buffer + pos.col); ++ ++ rect.end_row = 1; ++ damagerect(screen, rect); ++ ++ vterm_screen_flush_damage(screen); ++ ++ rows--; ++ delta->row++; ++ } ++ } ++ ++ { ++ VTermRect rect; ++ rect.start_row = old_rows; ++ rect.end_row = new_rows; ++ rect.start_col = 0; ++ rect.end_col = new_cols; ++ damagerect(screen, rect); ++ } ++ } ++ ++ if(screen->callbacks && screen->callbacks->resize) ++ return (*screen->callbacks->resize)(new_rows, new_cols, screen->cbdata); ++ ++ return 1; ++} ++ ++static int setlineinfo(int row, const VTermLineInfo *newinfo, const VTermLineInfo *oldinfo, void *user) ++{ ++ VTermScreen *screen = user; ++ int col; ++ VTermRect rect; ++ ++ if(newinfo->doublewidth != oldinfo->doublewidth || ++ newinfo->doubleheight != oldinfo->doubleheight) { ++ for(col = 0; col < screen->cols; col++) { ++ ScreenCell *cell = getcell(screen, row, col); ++ cell->pen.dwl = newinfo->doublewidth; ++ cell->pen.dhl = newinfo->doubleheight; ++ } ++ ++ rect.start_row = row; ++ rect.end_row = row + 1; ++ rect.start_col = 0; ++ rect.end_col = newinfo->doublewidth ? screen->cols / 2 : screen->cols; ++ damagerect(screen, rect); ++ ++ if(newinfo->doublewidth) { ++ rect.start_col = screen->cols / 2; ++ rect.end_col = screen->cols; ++ ++ erase_internal(rect, 0, user); ++ } ++ } ++ ++ return 1; ++} ++ ++static VTermStateCallbacks state_cbs = { ++ &putglyph, /* putglyph */ ++ &movecursor, /* movecursor */ ++ &scrollrect, /* scrollrect */ ++ NULL, /* moverect */ ++ &erase, /* erase */ ++ NULL, /* initpen */ ++ &setpenattr, /* setpenattr */ ++ &settermprop, /* settermprop */ ++ &bell, /* bell */ ++ &resize, /* resize */ ++ &setlineinfo /* setlineinfo */ ++}; ++ ++static VTermScreen *screen_new(VTerm *vt) ++{ ++ VTermState *state = vterm_obtain_state(vt); ++ VTermScreen *screen; ++ int rows, cols; ++ ++ if(!state) ++ return NULL; ++ ++ screen = vterm_allocator_malloc(vt, sizeof(VTermScreen)); ++ ++ vterm_get_size(vt, &rows, &cols); ++ ++ screen->vt = vt; ++ screen->state = state; ++ ++ screen->damage_merge = VTERM_DAMAGE_CELL; ++ screen->damaged.start_row = -1; ++ screen->pending_scrollrect.start_row = -1; ++ ++ screen->rows = rows; ++ screen->cols = cols; ++ ++ screen->callbacks = NULL; ++ screen->cbdata = NULL; ++ ++ screen->buffers[0] = realloc_buffer(screen, NULL, rows, cols); ++ ++ screen->buffer = screen->buffers[0]; ++ ++ screen->sb_buffer = vterm_allocator_malloc(screen->vt, sizeof(VTermScreenCell) * cols); ++ ++ vterm_state_set_callbacks(screen->state, &state_cbs, screen); ++ ++ return screen; ++} ++ ++INTERNAL void vterm_screen_free(VTermScreen *screen) ++{ ++ vterm_allocator_free(screen->vt, screen->buffers[0]); ++ if(screen->buffers[1]) ++ vterm_allocator_free(screen->vt, screen->buffers[1]); ++ ++ vterm_allocator_free(screen->vt, screen->sb_buffer); ++ ++ vterm_allocator_free(screen->vt, screen); ++} ++ ++void vterm_screen_reset(VTermScreen *screen, int hard) ++{ ++ screen->damaged.start_row = -1; ++ screen->pending_scrollrect.start_row = -1; ++ vterm_state_reset(screen->state, hard); ++ vterm_screen_flush_damage(screen); ++} ++ ++static size_t _get_chars(const VTermScreen *screen, const int utf8, void *buffer, size_t len, const VTermRect rect) ++{ ++ size_t outpos = 0; ++ int padding = 0; ++ int row, col; ++ ++#define PUT(c) \ ++ if(utf8) { \ ++ size_t thislen = utf8_seqlen(c); \ ++ if(buffer && outpos + thislen <= len) \ ++ outpos += fill_utf8((c), (char *)buffer + outpos); \ ++ else \ ++ outpos += thislen; \ ++ } \ ++ else { \ ++ if(buffer && outpos + 1 <= len) \ ++ ((uint32_t*)buffer)[outpos++] = (c); \ ++ else \ ++ outpos++; \ ++ } ++ ++ for(row = rect.start_row; row < rect.end_row; row++) { ++ for(col = rect.start_col; col < rect.end_col; col++) { ++ ScreenCell *cell = getcell(screen, row, col); ++ int i; ++ ++ if(cell->chars[0] == 0) ++ // Erased cell, might need a space ++ padding++; ++ else if(cell->chars[0] == (uint32_t)-1) ++ // Gap behind a double-width char, do nothing ++ ; ++ else { ++ while(padding) { ++ PUT(UNICODE_SPACE); ++ padding--; ++ } ++ for(i = 0; i < VTERM_MAX_CHARS_PER_CELL && cell->chars[i]; i++) { ++ PUT(cell->chars[i]); ++ } ++ } ++ } ++ ++ if(row < rect.end_row - 1) { ++ PUT(UNICODE_LINEFEED); ++ padding = 0; ++ } ++ } ++ ++ return outpos; ++} ++ ++size_t vterm_screen_get_chars(const VTermScreen *screen, uint32_t *chars, size_t len, const VTermRect rect) ++{ ++ return _get_chars(screen, 0, chars, len, rect); ++} ++ ++size_t vterm_screen_get_text(const VTermScreen *screen, char *str, size_t len, const VTermRect rect) ++{ ++ return _get_chars(screen, 1, str, len, rect); ++} ++ ++/* Copy internal to external representation of a screen cell */ ++int vterm_screen_get_cell(const VTermScreen *screen, VTermPos pos, VTermScreenCell *cell) ++{ ++ ScreenCell *intcell = getcell(screen, pos.row, pos.col); ++ int i; ++ ++ if(!intcell) ++ return 0; ++ ++ for(i = 0; ; i++) { ++ cell->chars[i] = intcell->chars[i]; ++ if(!intcell->chars[i]) ++ break; ++ } ++ ++ cell->attrs.bold = intcell->pen.bold; ++ cell->attrs.underline = intcell->pen.underline; ++ cell->attrs.italic = intcell->pen.italic; ++ cell->attrs.blink = intcell->pen.blink; ++ cell->attrs.reverse = intcell->pen.reverse ^ screen->global_reverse; ++ cell->attrs.strike = intcell->pen.strike; ++ cell->attrs.font = intcell->pen.font; ++ ++ cell->attrs.dwl = intcell->pen.dwl; ++ cell->attrs.dhl = intcell->pen.dhl; ++ ++ cell->fg = intcell->pen.fg; ++ cell->bg = intcell->pen.bg; ++ ++ if(pos.col < (screen->cols - 1) && ++ getcell(screen, pos.row, pos.col + 1)->chars[0] == (uint32_t)-1) ++ cell->width = 2; ++ else ++ cell->width = 1; ++ ++ return 1; ++} ++ ++/* Copy external to internal representation of a screen cell */ ++/* static because it's only used internally for sb_popline during resize */ ++static int vterm_screen_set_cell(VTermScreen *screen, VTermPos pos, const VTermScreenCell *cell) ++{ ++ ScreenCell *intcell = getcell(screen, pos.row, pos.col); ++ int i; ++ ++ if(!intcell) ++ return 0; ++ ++ for(i = 0; ; i++) { ++ intcell->chars[i] = cell->chars[i]; ++ if(!cell->chars[i]) ++ break; ++ } ++ ++ intcell->pen.bold = cell->attrs.bold; ++ intcell->pen.underline = cell->attrs.underline; ++ intcell->pen.italic = cell->attrs.italic; ++ intcell->pen.blink = cell->attrs.blink; ++ intcell->pen.reverse = cell->attrs.reverse ^ screen->global_reverse; ++ intcell->pen.strike = cell->attrs.strike; ++ intcell->pen.font = cell->attrs.font; ++ ++ intcell->pen.fg = cell->fg; ++ intcell->pen.bg = cell->bg; ++ ++ if(cell->width == 2) ++ getcell(screen, pos.row, pos.col + 1)->chars[0] = (uint32_t)-1; ++ ++ return 1; ++} ++ ++int vterm_screen_is_eol(const VTermScreen *screen, VTermPos pos) ++{ ++ /* This cell is EOL if this and every cell to the right is black */ ++ for(; pos.col < screen->cols; pos.col++) { ++ ScreenCell *cell = getcell(screen, pos.row, pos.col); ++ if(cell->chars[0] != 0) ++ return 0; ++ } ++ ++ return 1; ++} ++ ++VTermScreen *vterm_obtain_screen(VTerm *vt) ++{ ++ if(!vt->screen) ++ vt->screen = screen_new(vt); ++ return vt->screen; ++} ++ ++void vterm_screen_enable_altscreen(VTermScreen *screen, int altscreen) ++{ ++ ++ if(!screen->buffers[1] && altscreen) { ++ int rows, cols; ++ vterm_get_size(screen->vt, &rows, &cols); ++ ++ screen->buffers[1] = realloc_buffer(screen, NULL, rows, cols); ++ } ++} ++ ++void vterm_screen_set_callbacks(VTermScreen *screen, const VTermScreenCallbacks *callbacks, void *user) ++{ ++ screen->callbacks = callbacks; ++ screen->cbdata = user; ++} ++ ++void *vterm_screen_get_cbdata(VTermScreen *screen) ++{ ++ return screen->cbdata; ++} ++ ++void vterm_screen_set_unrecognised_fallbacks(VTermScreen *screen, const VTermParserCallbacks *fallbacks, void *user) ++{ ++ vterm_state_set_unrecognised_fallbacks(screen->state, fallbacks, user); ++} ++ ++void *vterm_screen_get_unrecognised_fbdata(VTermScreen *screen) ++{ ++ return vterm_state_get_unrecognised_fbdata(screen->state); ++} ++ ++void vterm_screen_flush_damage(VTermScreen *screen) ++{ ++ if(screen->pending_scrollrect.start_row != -1) { ++ vterm_scroll_rect(screen->pending_scrollrect, screen->pending_scroll_downward, screen->pending_scroll_rightward, ++ moverect_user, erase_user, screen); ++ ++ screen->pending_scrollrect.start_row = -1; ++ } ++ ++ if(screen->damaged.start_row != -1) { ++ if(screen->callbacks && screen->callbacks->damage) ++ (*screen->callbacks->damage)(screen->damaged, screen->cbdata); ++ ++ screen->damaged.start_row = -1; ++ } ++} ++ ++void vterm_screen_set_damage_merge(VTermScreen *screen, VTermDamageSize size) ++{ ++ vterm_screen_flush_damage(screen); ++ screen->damage_merge = size; ++} ++ ++static int attrs_differ(VTermAttrMask attrs, ScreenCell *a, ScreenCell *b) ++{ ++ if((attrs & VTERM_ATTR_BOLD_MASK) && (a->pen.bold != b->pen.bold)) ++ return 1; ++ if((attrs & VTERM_ATTR_UNDERLINE_MASK) && (a->pen.underline != b->pen.underline)) ++ return 1; ++ if((attrs & VTERM_ATTR_ITALIC_MASK) && (a->pen.italic != b->pen.italic)) ++ return 1; ++ if((attrs & VTERM_ATTR_BLINK_MASK) && (a->pen.blink != b->pen.blink)) ++ return 1; ++ if((attrs & VTERM_ATTR_REVERSE_MASK) && (a->pen.reverse != b->pen.reverse)) ++ return 1; ++ if((attrs & VTERM_ATTR_STRIKE_MASK) && (a->pen.strike != b->pen.strike)) ++ return 1; ++ if((attrs & VTERM_ATTR_FONT_MASK) && (a->pen.font != b->pen.font)) ++ return 1; ++ if((attrs & VTERM_ATTR_FOREGROUND_MASK) && !vterm_color_equal(a->pen.fg, b->pen.fg)) ++ return 1; ++ if((attrs & VTERM_ATTR_BACKGROUND_MASK) && !vterm_color_equal(a->pen.bg, b->pen.bg)) ++ return 1; ++ ++ return 0; ++} ++ ++int vterm_screen_get_attrs_extent(const VTermScreen *screen, VTermRect *extent, VTermPos pos, VTermAttrMask attrs) ++{ ++ int col; ++ ++ ScreenCell *target = getcell(screen, pos.row, pos.col); ++ ++ // TODO: bounds check ++ extent->start_row = pos.row; ++ extent->end_row = pos.row + 1; ++ ++ if(extent->start_col < 0) ++ extent->start_col = 0; ++ if(extent->end_col < 0) ++ extent->end_col = screen->cols; ++ ++ for(col = pos.col - 1; col >= extent->start_col; col--) ++ if(attrs_differ(attrs, target, getcell(screen, pos.row, col))) ++ break; ++ extent->start_col = col + 1; ++ ++ for(col = pos.col + 1; col < extent->end_col; col++) ++ if(attrs_differ(attrs, target, getcell(screen, pos.row, col))) ++ break; ++ extent->end_col = col - 1; ++ ++ return 1; ++} diff --git a/vim.spec b/vim.spec index 508ef4af..ed0c7949 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 351 +%define patchlevel 408 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -67,6 +67,8 @@ 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 +# reported upstream https://github.com/vim/vim/pull/3449 - missing file +Patch3018: vim-missing-file.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -257,6 +259,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 %patch3017 -p1 +%patch3018 -p1 %build %if 0%{?rhel} > 7 @@ -795,6 +798,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Sep 19 2018 Zdenek Dohnal - 2:8.1.408-1 +- patchlevel 408 +- src/libvterm/src/termscreen.c is missing + * Fri Sep 07 2018 Zdenek Dohnal - 2:8.1.351-1 - patchlevel 351 From f49446426cc8c362774e0620ee4f0e4ed3ff7953 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 3 Oct 2018 10:25:22 +0200 Subject: [PATCH 055/584] - patchlevel 450 --- .gitignore | 1 + sources | 2 +- vim-missing-file.patch | 939 ----------------------------------------- vim.spec | 8 +- 4 files changed, 6 insertions(+), 944 deletions(-) delete mode 100644 vim-missing-file.patch diff --git a/.gitignore b/.gitignore index 4b29608d..d4be9437 100644 --- a/.gitignore +++ b/.gitignore @@ -227,3 +227,4 @@ /vim-8.1-328.tar.bz2 /vim-8.1-351.tar.bz2 /vim-8.1-408.tar.bz2 +/vim-8.1-450.tar.bz2 diff --git a/sources b/sources index f1ccb208..34061453 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-408.tar.bz2) = b2f90aa2b6463d1a0ff21294a26ea93c142190cc2376e562ba99a32b4dafe166648a6bf10f63ac7335d601d74259ea48b3f723da91bf735c20ec20190468e399 +SHA512 (vim-8.1-450.tar.bz2) = 75874d54143bdbd4a452872edba5e9722f2318166b82eec477ddb6ecd8269e6f4545686d1c3e22e9525ee9470161dd40b8b4773a52d6b45cbaa7f8fe2a2a1062 diff --git a/vim-missing-file.patch b/vim-missing-file.patch deleted file mode 100644 index 4634fa00..00000000 --- a/vim-missing-file.patch +++ /dev/null @@ -1,939 +0,0 @@ -diff -up vim81/src/libvterm/src/termscreen.c.missing-file vim81/src/libvterm/src/termscreen.c ---- vim81/src/libvterm/src/termscreen.c.missing-file 2018-09-19 09:26:00.601523830 +0200 -+++ vim81/src/libvterm/src/termscreen.c 2018-09-19 09:26:56.448031158 +0200 -@@ -0,0 +1,935 @@ -+#include "vterm_internal.h" -+ -+#include -+#include -+ -+#include "rect.h" -+#include "utf8.h" -+ -+#define UNICODE_SPACE 0x20 -+#define UNICODE_LINEFEED 0x0a -+ -+/* State of the pen at some moment in time, also used in a cell */ -+typedef struct -+{ -+ /* After the bitfield */ -+ VTermColor fg, bg; -+ -+ unsigned int bold : 1; -+ unsigned int underline : 2; -+ unsigned int italic : 1; -+ unsigned int blink : 1; -+ unsigned int reverse : 1; -+ unsigned int strike : 1; -+ unsigned int font : 4; /* 0 to 9 */ -+ -+ /* Extra state storage that isn't strictly pen-related */ -+ unsigned int protected_cell : 1; -+ unsigned int dwl : 1; /* on a DECDWL or DECDHL line */ -+ unsigned int dhl : 2; /* on a DECDHL line (1=top 2=bottom) */ -+} ScreenPen; -+ -+/* Internal representation of a screen cell */ -+typedef struct -+{ -+ uint32_t chars[VTERM_MAX_CHARS_PER_CELL]; -+ ScreenPen pen; -+} ScreenCell; -+ -+static int vterm_screen_set_cell(VTermScreen *screen, VTermPos pos, const VTermScreenCell *cell); -+ -+struct VTermScreen -+{ -+ VTerm *vt; -+ VTermState *state; -+ -+ const VTermScreenCallbacks *callbacks; -+ void *cbdata; -+ -+ VTermDamageSize damage_merge; -+ /* start_row == -1 => no damage */ -+ VTermRect damaged; -+ VTermRect pending_scrollrect; -+ int pending_scroll_downward, pending_scroll_rightward; -+ -+ int rows; -+ int cols; -+ int global_reverse; -+ -+ /* Primary and Altscreen. buffers[1] is lazily allocated as needed */ -+ ScreenCell *buffers[2]; -+ -+ /* buffer will == buffers[0] or buffers[1], depending on altscreen */ -+ ScreenCell *buffer; -+ -+ /* buffer for a single screen row used in scrollback storage callbacks */ -+ VTermScreenCell *sb_buffer; -+ -+ ScreenPen pen; -+}; -+ -+static ScreenCell *getcell(const VTermScreen *screen, int row, int col) -+{ -+ if(row < 0 || row >= screen->rows) -+ return NULL; -+ if(col < 0 || col >= screen->cols) -+ return NULL; -+ return screen->buffer + (screen->cols * row) + col; -+} -+ -+static ScreenCell *realloc_buffer(VTermScreen *screen, ScreenCell *buffer, int new_rows, int new_cols) -+{ -+ ScreenCell *new_buffer = vterm_allocator_malloc(screen->vt, sizeof(ScreenCell) * new_rows * new_cols); -+ int row, col; -+ -+ for(row = 0; row < new_rows; row++) { -+ for(col = 0; col < new_cols; col++) { -+ ScreenCell *new_cell = new_buffer + row*new_cols + col; -+ -+ if(buffer && row < screen->rows && col < screen->cols) -+ *new_cell = buffer[row * screen->cols + col]; -+ else { -+ new_cell->chars[0] = 0; -+ new_cell->pen = screen->pen; -+ } -+ } -+ } -+ -+ if(buffer) -+ vterm_allocator_free(screen->vt, buffer); -+ -+ return new_buffer; -+} -+ -+static void damagerect(VTermScreen *screen, VTermRect rect) -+{ -+ VTermRect emit; -+ -+ switch(screen->damage_merge) { -+ case VTERM_DAMAGE_CELL: -+ /* Always emit damage event */ -+ emit = rect; -+ break; -+ -+ case VTERM_DAMAGE_ROW: -+ /* Emit damage longer than one row. Try to merge with existing damage in -+ * the same row */ -+ if(rect.end_row > rect.start_row + 1) { -+ // Bigger than 1 line - flush existing, emit this -+ vterm_screen_flush_damage(screen); -+ emit = rect; -+ } -+ else if(screen->damaged.start_row == -1) { -+ // None stored yet -+ screen->damaged = rect; -+ return; -+ } -+ else if(rect.start_row == screen->damaged.start_row) { -+ // Merge with the stored line -+ if(screen->damaged.start_col > rect.start_col) -+ screen->damaged.start_col = rect.start_col; -+ if(screen->damaged.end_col < rect.end_col) -+ screen->damaged.end_col = rect.end_col; -+ return; -+ } -+ else { -+ // Emit the currently stored line, store a new one -+ emit = screen->damaged; -+ screen->damaged = rect; -+ } -+ break; -+ -+ case VTERM_DAMAGE_SCREEN: -+ case VTERM_DAMAGE_SCROLL: -+ /* Never emit damage event */ -+ if(screen->damaged.start_row == -1) -+ screen->damaged = rect; -+ else { -+ rect_expand(&screen->damaged, &rect); -+ } -+ return; -+ -+ default: -+ DEBUG_LOG1("TODO: Maybe merge damage for level %d\n", screen->damage_merge); -+ return; -+ } -+ -+ if(screen->callbacks && screen->callbacks->damage) -+ (*screen->callbacks->damage)(emit, screen->cbdata); -+} -+ -+static void damagescreen(VTermScreen *screen) -+{ -+ VTermRect rect = {0,0,0,0}; -+ rect.end_row = screen->rows; -+ rect.end_col = screen->cols; -+ -+ damagerect(screen, rect); -+} -+ -+static int putglyph(VTermGlyphInfo *info, VTermPos pos, void *user) -+{ -+ int i; -+ int col; -+ VTermRect rect; -+ -+ VTermScreen *screen = user; -+ ScreenCell *cell = getcell(screen, pos.row, pos.col); -+ -+ if(!cell) -+ return 0; -+ -+ for(i = 0; i < VTERM_MAX_CHARS_PER_CELL && info->chars[i]; i++) { -+ cell->chars[i] = info->chars[i]; -+ cell->pen = screen->pen; -+ } -+ if(i < VTERM_MAX_CHARS_PER_CELL) -+ cell->chars[i] = 0; -+ -+ for(col = 1; col < info->width; col++) -+ getcell(screen, pos.row, pos.col + col)->chars[0] = (uint32_t)-1; -+ -+ rect.start_row = pos.row; -+ rect.end_row = pos.row+1; -+ rect.start_col = pos.col; -+ rect.end_col = pos.col+info->width; -+ -+ cell->pen.protected_cell = info->protected_cell; -+ cell->pen.dwl = info->dwl; -+ cell->pen.dhl = info->dhl; -+ -+ damagerect(screen, rect); -+ -+ return 1; -+} -+ -+static int moverect_internal(VTermRect dest, VTermRect src, void *user) -+{ -+ VTermScreen *screen = user; -+ -+ if(screen->callbacks && screen->callbacks->sb_pushline && -+ dest.start_row == 0 && dest.start_col == 0 && // starts top-left corner -+ dest.end_col == screen->cols && // full width -+ screen->buffer == screen->buffers[0]) { // not altscreen -+ VTermPos pos; -+ for(pos.row = 0; pos.row < src.start_row; pos.row++) { -+ for(pos.col = 0; pos.col < screen->cols; pos.col++) -+ (void)vterm_screen_get_cell(screen, pos, screen->sb_buffer + pos.col); -+ -+ (screen->callbacks->sb_pushline)(screen->cols, screen->sb_buffer, screen->cbdata); -+ } -+ } -+ -+ { -+ int cols = src.end_col - src.start_col; -+ int downward = src.start_row - dest.start_row; -+ int init_row, test_row, inc_row; -+ int row; -+ -+ if(downward < 0) { -+ init_row = dest.end_row - 1; -+ test_row = dest.start_row - 1; -+ inc_row = -1; -+ } -+ else { -+ init_row = dest.start_row; -+ test_row = dest.end_row; -+ inc_row = +1; -+ } -+ -+ for(row = init_row; row != test_row; row += inc_row) -+ memmove(getcell(screen, row, dest.start_col), -+ getcell(screen, row + downward, src.start_col), -+ cols * sizeof(ScreenCell)); -+ } -+ -+ return 1; -+} -+ -+static int moverect_user(VTermRect dest, VTermRect src, void *user) -+{ -+ VTermScreen *screen = user; -+ -+ if(screen->callbacks && screen->callbacks->moverect) { -+ if(screen->damage_merge != VTERM_DAMAGE_SCROLL) -+ // Avoid an infinite loop -+ vterm_screen_flush_damage(screen); -+ -+ if((*screen->callbacks->moverect)(dest, src, screen->cbdata)) -+ return 1; -+ } -+ -+ damagerect(screen, dest); -+ -+ return 1; -+} -+ -+static int erase_internal(VTermRect rect, int selective, void *user) -+{ -+ VTermScreen *screen = user; -+ int row, col; -+ -+ for(row = rect.start_row; row < screen->state->rows && row < rect.end_row; row++) { -+ const VTermLineInfo *info = vterm_state_get_lineinfo(screen->state, row); -+ -+ for(col = rect.start_col; col < rect.end_col; col++) { -+ ScreenCell *cell = getcell(screen, row, col); -+ -+ if(selective && cell->pen.protected_cell) -+ continue; -+ -+ cell->chars[0] = 0; -+ cell->pen = screen->pen; -+ cell->pen.dwl = info->doublewidth; -+ cell->pen.dhl = info->doubleheight; -+ } -+ } -+ -+ return 1; -+} -+ -+static int erase_user(VTermRect rect, int selective UNUSED, void *user) -+{ -+ VTermScreen *screen = user; -+ -+ damagerect(screen, rect); -+ -+ return 1; -+} -+ -+static int erase(VTermRect rect, int selective, void *user) -+{ -+ erase_internal(rect, selective, user); -+ return erase_user(rect, 0, user); -+} -+ -+static int scrollrect(VTermRect rect, int downward, int rightward, void *user) -+{ -+ VTermScreen *screen = user; -+ -+ if(screen->damage_merge != VTERM_DAMAGE_SCROLL) { -+ vterm_scroll_rect(rect, downward, rightward, -+ moverect_internal, erase_internal, screen); -+ -+ vterm_screen_flush_damage(screen); -+ -+ vterm_scroll_rect(rect, downward, rightward, -+ moverect_user, erase_user, screen); -+ -+ return 1; -+ } -+ -+ if(screen->damaged.start_row != -1 && -+ !rect_intersects(&rect, &screen->damaged)) { -+ vterm_screen_flush_damage(screen); -+ } -+ -+ if(screen->pending_scrollrect.start_row == -1) { -+ screen->pending_scrollrect = rect; -+ screen->pending_scroll_downward = downward; -+ screen->pending_scroll_rightward = rightward; -+ } -+ else if(rect_equal(&screen->pending_scrollrect, &rect) && -+ ((screen->pending_scroll_downward == 0 && downward == 0) || -+ (screen->pending_scroll_rightward == 0 && rightward == 0))) { -+ screen->pending_scroll_downward += downward; -+ screen->pending_scroll_rightward += rightward; -+ } -+ else { -+ vterm_screen_flush_damage(screen); -+ -+ screen->pending_scrollrect = rect; -+ screen->pending_scroll_downward = downward; -+ screen->pending_scroll_rightward = rightward; -+ } -+ -+ vterm_scroll_rect(rect, downward, rightward, -+ moverect_internal, erase_internal, screen); -+ -+ if(screen->damaged.start_row == -1) -+ return 1; -+ -+ if(rect_contains(&rect, &screen->damaged)) { -+ /* Scroll region entirely contains the damage; just move it */ -+ vterm_rect_move(&screen->damaged, -downward, -rightward); -+ rect_clip(&screen->damaged, &rect); -+ } -+ /* There are a number of possible cases here, but lets restrict this to only -+ * the common case where we might actually gain some performance by -+ * optimising it. Namely, a vertical scroll that neatly cuts the damage -+ * region in half. -+ */ -+ else if(rect.start_col <= screen->damaged.start_col && -+ rect.end_col >= screen->damaged.end_col && -+ rightward == 0) { -+ if(screen->damaged.start_row >= rect.start_row && -+ screen->damaged.start_row < rect.end_row) { -+ screen->damaged.start_row -= downward; -+ if(screen->damaged.start_row < rect.start_row) -+ screen->damaged.start_row = rect.start_row; -+ if(screen->damaged.start_row > rect.end_row) -+ screen->damaged.start_row = rect.end_row; -+ } -+ if(screen->damaged.end_row >= rect.start_row && -+ screen->damaged.end_row < rect.end_row) { -+ screen->damaged.end_row -= downward; -+ if(screen->damaged.end_row < rect.start_row) -+ screen->damaged.end_row = rect.start_row; -+ if(screen->damaged.end_row > rect.end_row) -+ screen->damaged.end_row = rect.end_row; -+ } -+ } -+ else { -+ DEBUG_LOG2("TODO: Just flush and redo damaged=" STRFrect " rect=" STRFrect "\n", -+ ARGSrect(screen->damaged), ARGSrect(rect)); -+ } -+ -+ return 1; -+} -+ -+static int movecursor(VTermPos pos, VTermPos oldpos, int visible, void *user) -+{ -+ VTermScreen *screen = user; -+ -+ if(screen->callbacks && screen->callbacks->movecursor) -+ return (*screen->callbacks->movecursor)(pos, oldpos, visible, screen->cbdata); -+ -+ return 0; -+} -+ -+static int setpenattr(VTermAttr attr, VTermValue *val, void *user) -+{ -+ VTermScreen *screen = user; -+ -+ switch(attr) { -+ case VTERM_ATTR_BOLD: -+ screen->pen.bold = val->boolean; -+ return 1; -+ case VTERM_ATTR_UNDERLINE: -+ screen->pen.underline = val->number; -+ return 1; -+ case VTERM_ATTR_ITALIC: -+ screen->pen.italic = val->boolean; -+ return 1; -+ case VTERM_ATTR_BLINK: -+ screen->pen.blink = val->boolean; -+ return 1; -+ case VTERM_ATTR_REVERSE: -+ screen->pen.reverse = val->boolean; -+ return 1; -+ case VTERM_ATTR_STRIKE: -+ screen->pen.strike = val->boolean; -+ return 1; -+ case VTERM_ATTR_FONT: -+ screen->pen.font = val->number; -+ return 1; -+ case VTERM_ATTR_FOREGROUND: -+ screen->pen.fg = val->color; -+ return 1; -+ case VTERM_ATTR_BACKGROUND: -+ screen->pen.bg = val->color; -+ return 1; -+ -+ case VTERM_N_ATTRS: -+ return 0; -+ } -+ -+ return 0; -+} -+ -+static int settermprop(VTermProp prop, VTermValue *val, void *user) -+{ -+ VTermScreen *screen = user; -+ -+ switch(prop) { -+ case VTERM_PROP_ALTSCREEN: -+ if(val->boolean && !screen->buffers[1]) -+ return 0; -+ -+ screen->buffer = val->boolean ? screen->buffers[1] : screen->buffers[0]; -+ /* only send a damage event on disable; because during enable there's an -+ * erase that sends a damage anyway -+ */ -+ if(!val->boolean) -+ damagescreen(screen); -+ break; -+ case VTERM_PROP_REVERSE: -+ screen->global_reverse = val->boolean; -+ damagescreen(screen); -+ break; -+ default: -+ ; /* ignore */ -+ } -+ -+ if(screen->callbacks && screen->callbacks->settermprop) -+ return (*screen->callbacks->settermprop)(prop, val, screen->cbdata); -+ -+ return 1; -+} -+ -+static int bell(void *user) -+{ -+ VTermScreen *screen = user; -+ -+ if(screen->callbacks && screen->callbacks->bell) -+ return (*screen->callbacks->bell)(screen->cbdata); -+ -+ return 0; -+} -+ -+static int resize(int new_rows, int new_cols, VTermPos *delta, void *user) -+{ -+ VTermScreen *screen = user; -+ -+ int is_altscreen = (screen->buffers[1] && screen->buffer == screen->buffers[1]); -+ -+ int old_rows = screen->rows; -+ int old_cols = screen->cols; -+ int first_blank_row; -+ -+ if(!is_altscreen && new_rows < old_rows) { -+ // Fewer rows - determine if we're going to scroll at all, and if so, push -+ // those lines to scrollback -+ VTermPos pos = { 0, 0 }; -+ VTermPos cursor = screen->state->pos; -+ // Find the first blank row after the cursor. -+ for(pos.row = old_rows - 1; pos.row >= new_rows; pos.row--) -+ if(!vterm_screen_is_eol(screen, pos) || cursor.row == pos.row) -+ break; -+ -+ first_blank_row = pos.row + 1; -+ if(first_blank_row > new_rows) { -+ VTermRect rect = {0,0,0,0}; -+ rect.end_row = old_rows; -+ rect.end_col = old_cols; -+ scrollrect(rect, first_blank_row - new_rows, 0, user); -+ vterm_screen_flush_damage(screen); -+ -+ delta->row -= first_blank_row - new_rows; -+ } -+ } -+ -+ screen->buffers[0] = realloc_buffer(screen, screen->buffers[0], new_rows, new_cols); -+ if(screen->buffers[1]) -+ screen->buffers[1] = realloc_buffer(screen, screen->buffers[1], new_rows, new_cols); -+ -+ screen->buffer = is_altscreen ? screen->buffers[1] : screen->buffers[0]; -+ -+ screen->rows = new_rows; -+ screen->cols = new_cols; -+ -+ if(screen->sb_buffer) -+ vterm_allocator_free(screen->vt, screen->sb_buffer); -+ -+ screen->sb_buffer = vterm_allocator_malloc(screen->vt, sizeof(VTermScreenCell) * new_cols); -+ -+ if(new_cols > old_cols) { -+ VTermRect rect; -+ rect.start_row = 0; -+ rect.end_row = old_rows; -+ rect.start_col = old_cols; -+ rect.end_col = new_cols; -+ damagerect(screen, rect); -+ } -+ -+ if(new_rows > old_rows) { -+ if(!is_altscreen && screen->callbacks && screen->callbacks->sb_popline) { -+ int rows = new_rows - old_rows; -+ while(rows) { -+ VTermRect rect = {0,0,0,0}; -+ VTermPos pos = { 0, 0 }; -+ if(!(screen->callbacks->sb_popline(screen->cols, screen->sb_buffer, screen->cbdata))) -+ break; -+ -+ rect.end_row = screen->rows; -+ rect.end_col = screen->cols; -+ scrollrect(rect, -1, 0, user); -+ -+ for(pos.col = 0; pos.col < screen->cols; pos.col += screen->sb_buffer[pos.col].width) -+ vterm_screen_set_cell(screen, pos, screen->sb_buffer + pos.col); -+ -+ rect.end_row = 1; -+ damagerect(screen, rect); -+ -+ vterm_screen_flush_damage(screen); -+ -+ rows--; -+ delta->row++; -+ } -+ } -+ -+ { -+ VTermRect rect; -+ rect.start_row = old_rows; -+ rect.end_row = new_rows; -+ rect.start_col = 0; -+ rect.end_col = new_cols; -+ damagerect(screen, rect); -+ } -+ } -+ -+ if(screen->callbacks && screen->callbacks->resize) -+ return (*screen->callbacks->resize)(new_rows, new_cols, screen->cbdata); -+ -+ return 1; -+} -+ -+static int setlineinfo(int row, const VTermLineInfo *newinfo, const VTermLineInfo *oldinfo, void *user) -+{ -+ VTermScreen *screen = user; -+ int col; -+ VTermRect rect; -+ -+ if(newinfo->doublewidth != oldinfo->doublewidth || -+ newinfo->doubleheight != oldinfo->doubleheight) { -+ for(col = 0; col < screen->cols; col++) { -+ ScreenCell *cell = getcell(screen, row, col); -+ cell->pen.dwl = newinfo->doublewidth; -+ cell->pen.dhl = newinfo->doubleheight; -+ } -+ -+ rect.start_row = row; -+ rect.end_row = row + 1; -+ rect.start_col = 0; -+ rect.end_col = newinfo->doublewidth ? screen->cols / 2 : screen->cols; -+ damagerect(screen, rect); -+ -+ if(newinfo->doublewidth) { -+ rect.start_col = screen->cols / 2; -+ rect.end_col = screen->cols; -+ -+ erase_internal(rect, 0, user); -+ } -+ } -+ -+ return 1; -+} -+ -+static VTermStateCallbacks state_cbs = { -+ &putglyph, /* putglyph */ -+ &movecursor, /* movecursor */ -+ &scrollrect, /* scrollrect */ -+ NULL, /* moverect */ -+ &erase, /* erase */ -+ NULL, /* initpen */ -+ &setpenattr, /* setpenattr */ -+ &settermprop, /* settermprop */ -+ &bell, /* bell */ -+ &resize, /* resize */ -+ &setlineinfo /* setlineinfo */ -+}; -+ -+static VTermScreen *screen_new(VTerm *vt) -+{ -+ VTermState *state = vterm_obtain_state(vt); -+ VTermScreen *screen; -+ int rows, cols; -+ -+ if(!state) -+ return NULL; -+ -+ screen = vterm_allocator_malloc(vt, sizeof(VTermScreen)); -+ -+ vterm_get_size(vt, &rows, &cols); -+ -+ screen->vt = vt; -+ screen->state = state; -+ -+ screen->damage_merge = VTERM_DAMAGE_CELL; -+ screen->damaged.start_row = -1; -+ screen->pending_scrollrect.start_row = -1; -+ -+ screen->rows = rows; -+ screen->cols = cols; -+ -+ screen->callbacks = NULL; -+ screen->cbdata = NULL; -+ -+ screen->buffers[0] = realloc_buffer(screen, NULL, rows, cols); -+ -+ screen->buffer = screen->buffers[0]; -+ -+ screen->sb_buffer = vterm_allocator_malloc(screen->vt, sizeof(VTermScreenCell) * cols); -+ -+ vterm_state_set_callbacks(screen->state, &state_cbs, screen); -+ -+ return screen; -+} -+ -+INTERNAL void vterm_screen_free(VTermScreen *screen) -+{ -+ vterm_allocator_free(screen->vt, screen->buffers[0]); -+ if(screen->buffers[1]) -+ vterm_allocator_free(screen->vt, screen->buffers[1]); -+ -+ vterm_allocator_free(screen->vt, screen->sb_buffer); -+ -+ vterm_allocator_free(screen->vt, screen); -+} -+ -+void vterm_screen_reset(VTermScreen *screen, int hard) -+{ -+ screen->damaged.start_row = -1; -+ screen->pending_scrollrect.start_row = -1; -+ vterm_state_reset(screen->state, hard); -+ vterm_screen_flush_damage(screen); -+} -+ -+static size_t _get_chars(const VTermScreen *screen, const int utf8, void *buffer, size_t len, const VTermRect rect) -+{ -+ size_t outpos = 0; -+ int padding = 0; -+ int row, col; -+ -+#define PUT(c) \ -+ if(utf8) { \ -+ size_t thislen = utf8_seqlen(c); \ -+ if(buffer && outpos + thislen <= len) \ -+ outpos += fill_utf8((c), (char *)buffer + outpos); \ -+ else \ -+ outpos += thislen; \ -+ } \ -+ else { \ -+ if(buffer && outpos + 1 <= len) \ -+ ((uint32_t*)buffer)[outpos++] = (c); \ -+ else \ -+ outpos++; \ -+ } -+ -+ for(row = rect.start_row; row < rect.end_row; row++) { -+ for(col = rect.start_col; col < rect.end_col; col++) { -+ ScreenCell *cell = getcell(screen, row, col); -+ int i; -+ -+ if(cell->chars[0] == 0) -+ // Erased cell, might need a space -+ padding++; -+ else if(cell->chars[0] == (uint32_t)-1) -+ // Gap behind a double-width char, do nothing -+ ; -+ else { -+ while(padding) { -+ PUT(UNICODE_SPACE); -+ padding--; -+ } -+ for(i = 0; i < VTERM_MAX_CHARS_PER_CELL && cell->chars[i]; i++) { -+ PUT(cell->chars[i]); -+ } -+ } -+ } -+ -+ if(row < rect.end_row - 1) { -+ PUT(UNICODE_LINEFEED); -+ padding = 0; -+ } -+ } -+ -+ return outpos; -+} -+ -+size_t vterm_screen_get_chars(const VTermScreen *screen, uint32_t *chars, size_t len, const VTermRect rect) -+{ -+ return _get_chars(screen, 0, chars, len, rect); -+} -+ -+size_t vterm_screen_get_text(const VTermScreen *screen, char *str, size_t len, const VTermRect rect) -+{ -+ return _get_chars(screen, 1, str, len, rect); -+} -+ -+/* Copy internal to external representation of a screen cell */ -+int vterm_screen_get_cell(const VTermScreen *screen, VTermPos pos, VTermScreenCell *cell) -+{ -+ ScreenCell *intcell = getcell(screen, pos.row, pos.col); -+ int i; -+ -+ if(!intcell) -+ return 0; -+ -+ for(i = 0; ; i++) { -+ cell->chars[i] = intcell->chars[i]; -+ if(!intcell->chars[i]) -+ break; -+ } -+ -+ cell->attrs.bold = intcell->pen.bold; -+ cell->attrs.underline = intcell->pen.underline; -+ cell->attrs.italic = intcell->pen.italic; -+ cell->attrs.blink = intcell->pen.blink; -+ cell->attrs.reverse = intcell->pen.reverse ^ screen->global_reverse; -+ cell->attrs.strike = intcell->pen.strike; -+ cell->attrs.font = intcell->pen.font; -+ -+ cell->attrs.dwl = intcell->pen.dwl; -+ cell->attrs.dhl = intcell->pen.dhl; -+ -+ cell->fg = intcell->pen.fg; -+ cell->bg = intcell->pen.bg; -+ -+ if(pos.col < (screen->cols - 1) && -+ getcell(screen, pos.row, pos.col + 1)->chars[0] == (uint32_t)-1) -+ cell->width = 2; -+ else -+ cell->width = 1; -+ -+ return 1; -+} -+ -+/* Copy external to internal representation of a screen cell */ -+/* static because it's only used internally for sb_popline during resize */ -+static int vterm_screen_set_cell(VTermScreen *screen, VTermPos pos, const VTermScreenCell *cell) -+{ -+ ScreenCell *intcell = getcell(screen, pos.row, pos.col); -+ int i; -+ -+ if(!intcell) -+ return 0; -+ -+ for(i = 0; ; i++) { -+ intcell->chars[i] = cell->chars[i]; -+ if(!cell->chars[i]) -+ break; -+ } -+ -+ intcell->pen.bold = cell->attrs.bold; -+ intcell->pen.underline = cell->attrs.underline; -+ intcell->pen.italic = cell->attrs.italic; -+ intcell->pen.blink = cell->attrs.blink; -+ intcell->pen.reverse = cell->attrs.reverse ^ screen->global_reverse; -+ intcell->pen.strike = cell->attrs.strike; -+ intcell->pen.font = cell->attrs.font; -+ -+ intcell->pen.fg = cell->fg; -+ intcell->pen.bg = cell->bg; -+ -+ if(cell->width == 2) -+ getcell(screen, pos.row, pos.col + 1)->chars[0] = (uint32_t)-1; -+ -+ return 1; -+} -+ -+int vterm_screen_is_eol(const VTermScreen *screen, VTermPos pos) -+{ -+ /* This cell is EOL if this and every cell to the right is black */ -+ for(; pos.col < screen->cols; pos.col++) { -+ ScreenCell *cell = getcell(screen, pos.row, pos.col); -+ if(cell->chars[0] != 0) -+ return 0; -+ } -+ -+ return 1; -+} -+ -+VTermScreen *vterm_obtain_screen(VTerm *vt) -+{ -+ if(!vt->screen) -+ vt->screen = screen_new(vt); -+ return vt->screen; -+} -+ -+void vterm_screen_enable_altscreen(VTermScreen *screen, int altscreen) -+{ -+ -+ if(!screen->buffers[1] && altscreen) { -+ int rows, cols; -+ vterm_get_size(screen->vt, &rows, &cols); -+ -+ screen->buffers[1] = realloc_buffer(screen, NULL, rows, cols); -+ } -+} -+ -+void vterm_screen_set_callbacks(VTermScreen *screen, const VTermScreenCallbacks *callbacks, void *user) -+{ -+ screen->callbacks = callbacks; -+ screen->cbdata = user; -+} -+ -+void *vterm_screen_get_cbdata(VTermScreen *screen) -+{ -+ return screen->cbdata; -+} -+ -+void vterm_screen_set_unrecognised_fallbacks(VTermScreen *screen, const VTermParserCallbacks *fallbacks, void *user) -+{ -+ vterm_state_set_unrecognised_fallbacks(screen->state, fallbacks, user); -+} -+ -+void *vterm_screen_get_unrecognised_fbdata(VTermScreen *screen) -+{ -+ return vterm_state_get_unrecognised_fbdata(screen->state); -+} -+ -+void vterm_screen_flush_damage(VTermScreen *screen) -+{ -+ if(screen->pending_scrollrect.start_row != -1) { -+ vterm_scroll_rect(screen->pending_scrollrect, screen->pending_scroll_downward, screen->pending_scroll_rightward, -+ moverect_user, erase_user, screen); -+ -+ screen->pending_scrollrect.start_row = -1; -+ } -+ -+ if(screen->damaged.start_row != -1) { -+ if(screen->callbacks && screen->callbacks->damage) -+ (*screen->callbacks->damage)(screen->damaged, screen->cbdata); -+ -+ screen->damaged.start_row = -1; -+ } -+} -+ -+void vterm_screen_set_damage_merge(VTermScreen *screen, VTermDamageSize size) -+{ -+ vterm_screen_flush_damage(screen); -+ screen->damage_merge = size; -+} -+ -+static int attrs_differ(VTermAttrMask attrs, ScreenCell *a, ScreenCell *b) -+{ -+ if((attrs & VTERM_ATTR_BOLD_MASK) && (a->pen.bold != b->pen.bold)) -+ return 1; -+ if((attrs & VTERM_ATTR_UNDERLINE_MASK) && (a->pen.underline != b->pen.underline)) -+ return 1; -+ if((attrs & VTERM_ATTR_ITALIC_MASK) && (a->pen.italic != b->pen.italic)) -+ return 1; -+ if((attrs & VTERM_ATTR_BLINK_MASK) && (a->pen.blink != b->pen.blink)) -+ return 1; -+ if((attrs & VTERM_ATTR_REVERSE_MASK) && (a->pen.reverse != b->pen.reverse)) -+ return 1; -+ if((attrs & VTERM_ATTR_STRIKE_MASK) && (a->pen.strike != b->pen.strike)) -+ return 1; -+ if((attrs & VTERM_ATTR_FONT_MASK) && (a->pen.font != b->pen.font)) -+ return 1; -+ if((attrs & VTERM_ATTR_FOREGROUND_MASK) && !vterm_color_equal(a->pen.fg, b->pen.fg)) -+ return 1; -+ if((attrs & VTERM_ATTR_BACKGROUND_MASK) && !vterm_color_equal(a->pen.bg, b->pen.bg)) -+ return 1; -+ -+ return 0; -+} -+ -+int vterm_screen_get_attrs_extent(const VTermScreen *screen, VTermRect *extent, VTermPos pos, VTermAttrMask attrs) -+{ -+ int col; -+ -+ ScreenCell *target = getcell(screen, pos.row, pos.col); -+ -+ // TODO: bounds check -+ extent->start_row = pos.row; -+ extent->end_row = pos.row + 1; -+ -+ if(extent->start_col < 0) -+ extent->start_col = 0; -+ if(extent->end_col < 0) -+ extent->end_col = screen->cols; -+ -+ for(col = pos.col - 1; col >= extent->start_col; col--) -+ if(attrs_differ(attrs, target, getcell(screen, pos.row, col))) -+ break; -+ extent->start_col = col + 1; -+ -+ for(col = pos.col + 1; col < extent->end_col; col++) -+ if(attrs_differ(attrs, target, getcell(screen, pos.row, col))) -+ break; -+ extent->end_col = col - 1; -+ -+ return 1; -+} diff --git a/vim.spec b/vim.spec index ed0c7949..82eb1101 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 408 +%define patchlevel 450 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -67,8 +67,6 @@ 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 -# reported upstream https://github.com/vim/vim/pull/3449 - missing file -Patch3018: vim-missing-file.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -259,7 +257,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 %patch3017 -p1 -%patch3018 -p1 %build %if 0%{?rhel} > 7 @@ -798,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Oct 03 2018 Zdenek Dohnal - 2:8.1.450-1 +- patchlevel 450 + * Wed Sep 19 2018 Zdenek Dohnal - 2:8.1.408-1 - patchlevel 408 - src/libvterm/src/termscreen.c is missing From eec412b62d5e0cb88c6329bc93a5867cf5326600 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 5 Oct 2018 16:02:41 +0200 Subject: [PATCH 056/584] - patchlevel 451 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d4be9437..2a57888a 100644 --- a/.gitignore +++ b/.gitignore @@ -228,3 +228,4 @@ /vim-8.1-351.tar.bz2 /vim-8.1-408.tar.bz2 /vim-8.1-450.tar.bz2 +/vim-8.1-451.tar.bz2 diff --git a/sources b/sources index 34061453..02688d5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-450.tar.bz2) = 75874d54143bdbd4a452872edba5e9722f2318166b82eec477ddb6ecd8269e6f4545686d1c3e22e9525ee9470161dd40b8b4773a52d6b45cbaa7f8fe2a2a1062 +SHA512 (vim-8.1-451.tar.bz2) = f7df96718613cca8b95eef8fcadb8d280554b3ecfd9c6408e8d8d8c07e6473484a504f96ca14b64766d601f6a4bf5ae46068894105afd5a9fa4b07fabd3ff379 diff --git a/vim.spec b/vim.spec index 82eb1101..a124b38a 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 450 +%define patchlevel 451 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -795,6 +795,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Oct 05 2018 Zdenek Dohnal - 2:8.1.451-1 +- patchlevel 451 + * Wed Oct 03 2018 Zdenek Dohnal - 2:8.1.450-1 - patchlevel 450 From 8300011cc9de03731645fbd6047595c3ac4212c0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 19 Oct 2018 14:51:43 +0200 Subject: [PATCH 057/584] 1640972 - vimrc/virc should reflect correct augroup --- vim.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index a124b38a..d9b0405f 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -535,6 +535,12 @@ chmod 0644 %{buildroot}/%{_sysconfdir}/profile.d/vim.* install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/virc install -p -m644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/vimrc +# if Vim isn't built for Fedora, use redhat augroup +%if 0%{?rhel} >= 7 +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 %{SOURCE16} %{buildroot}%{_rpmconfigdir}/macros.d/ @@ -795,6 +801,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Oct 19 2018 Zdenek Dohnal - 2:8.1.451-2 +- 1640972 - vimrc/virc should reflect correct augroup + * Fri Oct 05 2018 Zdenek Dohnal - 2:8.1.451-1 - patchlevel 451 From de841a8db5acdef5cfeb08b7d6a801bb30642fd9 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 19 Oct 2018 14:52:47 +0200 Subject: [PATCH 058/584] - patchlevel 483 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2a57888a..9f0d8fb8 100644 --- a/.gitignore +++ b/.gitignore @@ -229,3 +229,4 @@ /vim-8.1-408.tar.bz2 /vim-8.1-450.tar.bz2 /vim-8.1-451.tar.bz2 +/vim-8.1-483.tar.bz2 diff --git a/sources b/sources index 02688d5e..58335ea3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-451.tar.bz2) = f7df96718613cca8b95eef8fcadb8d280554b3ecfd9c6408e8d8d8c07e6473484a504f96ca14b64766d601f6a4bf5ae46068894105afd5a9fa4b07fabd3ff379 +SHA512 (vim-8.1-483.tar.bz2) = 958b26948c4a62cb889243f11d1caaaa5bffb30197b78ceecbb26238be955ef22e70aa34410b870c4fd283be400ab88199dfc651ff440216c99f8407087eaebe diff --git a/vim.spec b/vim.spec index d9b0405f..b139ae1d 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 451 +%define patchlevel 483 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -801,6 +801,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Oct 19 2018 Zdenek Dohnal - 2:8.1.483-1 +- patchlevel 483 + * Fri Oct 19 2018 Zdenek Dohnal - 2:8.1.451-2 - 1640972 - vimrc/virc should reflect correct augroup From e12d4c688f299e16e3341a52dd44e2c9dcdcd434 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Oct 2018 04:05:21 +0000 Subject: [PATCH 059/584] update vim-minimal description --- vim.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vim.spec b/vim.spec index b139ae1d..5ba3bb1c 100644 --- a/vim.spec +++ b/vim.spec @@ -138,10 +138,9 @@ VIM (VIsual editor iMproved) is an updated and improved version of the vi editor. Vi was the first real screen-based editor for UNIX, and is still very popular. VIM improves on vi by adding new features: multiple windows, multi-level undo, block highlighting and more. The -vim-minimal package includes a minimal version of VIM, which is -installed into /bin/vi for use when only the root partition is -present. NOTE: The online help is only available when the vim-common -package is installed. +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 From e2fe0a3a1025814508672b257098875070316b2d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 26 Oct 2018 15:50:21 +0200 Subject: [PATCH 060/584] - patchlevel 497 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9f0d8fb8..c72490ad 100644 --- a/.gitignore +++ b/.gitignore @@ -230,3 +230,4 @@ /vim-8.1-450.tar.bz2 /vim-8.1-451.tar.bz2 /vim-8.1-483.tar.bz2 +/vim-8.1-497.tar.bz2 diff --git a/sources b/sources index 58335ea3..24f78211 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-483.tar.bz2) = 958b26948c4a62cb889243f11d1caaaa5bffb30197b78ceecbb26238be955ef22e70aa34410b870c4fd283be400ab88199dfc651ff440216c99f8407087eaebe +SHA512 (vim-8.1-497.tar.bz2) = 98140ababe72b7a97127d1c36fa0aff216936a052edf7176d57a1af87ffb67d4bfc193c09e0b31099c07eb68d6709daf40586a32b0af0ff0a1672942f1152eae diff --git a/vim.spec b/vim.spec index 5ba3bb1c..452e83c0 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 483 +%define patchlevel 497 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -800,6 +800,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Oct 26 2018 Zdenek Dohnal - 2:8.1.497-1 +- patchlevel 497 + * Fri Oct 19 2018 Zdenek Dohnal - 2:8.1.483-1 - patchlevel 483 From a43afa5c5d530846fe7194c6c39be533f753c18f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 5 Nov 2018 12:39:04 +0100 Subject: [PATCH 061/584] 1646183 - Man file conflict for vim-minimal and vim-enhanced --- vim.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vim.spec b/vim.spec index 452e83c0..2b62257f 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -105,7 +105,7 @@ Conflicts: man-pages-it < 0.3.0-17 Conflicts: man-pages-pl < 0.24-2 Requires: %{name}-filesystem # conflicts in package because of manpage move (bug #1599663) -Conflicts: %{name}-minimal < 8.0.1428-4 +Conflicts: %{name}-minimal < %{version}-%{release} %description common VIM (VIsual editor iMproved) is an updated and improved version of the @@ -131,7 +131,7 @@ Summary: A minimal version of the VIM editor Provides: vi = %{version}-%{release} Provides: %{_bindir}/vi # conflicts in package because of manpage move (bug #1599663) -Conflicts: %{name}-common < 8.0.1428-4 +Conflicts: %{name}-common < %{version}-%{release} %description minimal VIM (VIsual editor iMproved) is an updated and improved version of the @@ -800,6 +800,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Nov 05 2018 Zdenek Dohnal - 2:8.1.497-2 +- 1646183 - Man file conflict for vim-minimal and vim-enhanced + * Fri Oct 26 2018 Zdenek Dohnal - 2:8.1.497-1 - patchlevel 497 From c003130cde0e3d7cfeba9120f99630e74dd2f213 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 5 Nov 2018 12:40:36 +0100 Subject: [PATCH 062/584] - patchlevel 511 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c72490ad..9679feed 100644 --- a/.gitignore +++ b/.gitignore @@ -231,3 +231,4 @@ /vim-8.1-451.tar.bz2 /vim-8.1-483.tar.bz2 /vim-8.1-497.tar.bz2 +/vim-8.1-511.tar.bz2 diff --git a/sources b/sources index 24f78211..634a30ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-497.tar.bz2) = 98140ababe72b7a97127d1c36fa0aff216936a052edf7176d57a1af87ffb67d4bfc193c09e0b31099c07eb68d6709daf40586a32b0af0ff0a1672942f1152eae +SHA512 (vim-8.1-511.tar.bz2) = d1505b9b0f56b6bc020fc8dcc490ea9c307f04b59d00d0f9ec55ef722becdd1c3868aedca39c5ee38be2092cad81f8579a5f970abe7cb5c893950ab08201a5d4 diff --git a/vim.spec b/vim.spec index 2b62257f..c5801cbc 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 497 +%define patchlevel 511 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -800,6 +800,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Nov 05 2018 Zdenek Dohnal - 2:8.1.511-1 +- patchlevel 511 + * Mon Nov 05 2018 Zdenek Dohnal - 2:8.1.497-2 - 1646183 - Man file conflict for vim-minimal and vim-enhanced From f143a8ec5a8a11c87034f6fc67aad47ee47143ab Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 8 Nov 2018 13:29:51 +0100 Subject: [PATCH 063/584] fix #1646183 properly - we need to conflict with vim-enhanced, not vim-common --- vim.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vim.spec b/vim.spec index c5801cbc..09a51b8b 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -104,8 +104,6 @@ Conflicts: man-pages-fr < 0.9.7-14 Conflicts: man-pages-it < 0.3.0-17 Conflicts: man-pages-pl < 0.24-2 Requires: %{name}-filesystem -# conflicts in package because of manpage move (bug #1599663) -Conflicts: %{name}-minimal < %{version}-%{release} %description common VIM (VIsual editor iMproved) is an updated and improved version of the @@ -131,7 +129,7 @@ Summary: A minimal version of the VIM editor Provides: vi = %{version}-%{release} Provides: %{_bindir}/vi # conflicts in package because of manpage move (bug #1599663) -Conflicts: %{name}-common < %{version}-%{release} +Conflicts: %{name}-enhanced < %{version}-%{release} %description minimal VIM (VIsual editor iMproved) is an updated and improved version of the @@ -148,6 +146,8 @@ Requires: vim-common = %{epoch}:%{version}-%{release} which Provides: vim = %{version}-%{release} Provides: %{_bindir}/mergetool Provides: %{_bindir}/vim +# conflicts in package because of manpage move (bug #1599663) +Conflicts: %{name}-minimal < %{version}-%{release} # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim Suggests: python2 python2-libs @@ -800,6 +800,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Nov 08 2018 Zdenek Dohnal - 2:8.1.511-2 +- fix #1646183 properly - we need to conflict with vim-enhanced, not vim-common + * Mon Nov 05 2018 Zdenek Dohnal - 2:8.1.511-1 - patchlevel 511 From 2cfa1a3e7d8f4777e46a59145003dec9f6433a56 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 8 Nov 2018 13:30:45 +0100 Subject: [PATCH 064/584] - patchlevel 513 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9679feed..50df73c8 100644 --- a/.gitignore +++ b/.gitignore @@ -232,3 +232,4 @@ /vim-8.1-483.tar.bz2 /vim-8.1-497.tar.bz2 /vim-8.1-511.tar.bz2 +/vim-8.1-513.tar.bz2 diff --git a/sources b/sources index 634a30ec..de5193ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-511.tar.bz2) = d1505b9b0f56b6bc020fc8dcc490ea9c307f04b59d00d0f9ec55ef722becdd1c3868aedca39c5ee38be2092cad81f8579a5f970abe7cb5c893950ab08201a5d4 +SHA512 (vim-8.1-513.tar.bz2) = 55e95ee94d2aba72e2e7f5a3608d48abdcd2408d6f982de8701e0f5d41ca95f29c26e4c9b88cdae04cabcb0fae6cc6ef4c7c922d88d4b2ed8ba780249b2388b9 diff --git a/vim.spec b/vim.spec index 09a51b8b..f0d03f34 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 511 +%define patchlevel 513 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -800,6 +800,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Nov 08 2018 Zdenek Dohnal - 2:8.1.513-1 +- patchlevel 513 + * Thu Nov 08 2018 Zdenek Dohnal - 2:8.1.511-2 - fix #1646183 properly - we need to conflict with vim-enhanced, not vim-common From 121eb9c132b45563c052ae48cf34ab693614dda5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 8 Nov 2018 20:03:00 +0100 Subject: [PATCH 065/584] #1646183 - do not forget the epoch --- vim.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/vim.spec b/vim.spec index f0d03f34..e09abb66 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -104,6 +104,7 @@ Conflicts: man-pages-fr < 0.9.7-14 Conflicts: man-pages-it < 0.3.0-17 Conflicts: man-pages-pl < 0.24-2 Requires: %{name}-filesystem +Conflicts: %{name}-minimal < %{epoch}:8.1.1-1 %description common VIM (VIsual editor iMproved) is an updated and improved version of the @@ -129,7 +130,7 @@ Summary: A minimal version of the VIM editor Provides: vi = %{version}-%{release} Provides: %{_bindir}/vi # conflicts in package because of manpage move (bug #1599663) -Conflicts: %{name}-enhanced < %{version}-%{release} +Conflicts: %{name}-common < %{epoch}:8.1.1-1 %description minimal VIM (VIsual editor iMproved) is an updated and improved version of the @@ -146,8 +147,6 @@ Requires: vim-common = %{epoch}:%{version}-%{release} which Provides: vim = %{version}-%{release} Provides: %{_bindir}/mergetool Provides: %{_bindir}/vim -# conflicts in package because of manpage move (bug #1599663) -Conflicts: %{name}-minimal < %{version}-%{release} # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim Suggests: python2 python2-libs @@ -800,6 +799,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Nov 08 2018 Zdenek Dohnal - 2:8.1.513-2 +- #1646183 - do not forget the epoch + * Thu Nov 08 2018 Zdenek Dohnal - 2:8.1.513-1 - patchlevel 513 From acdbb8f6b8396078c2777bc90bcde2e85cef60f5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 16 Nov 2018 12:36:18 +0100 Subject: [PATCH 066/584] - patchlevel 527 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 50df73c8..398d7d48 100644 --- a/.gitignore +++ b/.gitignore @@ -233,3 +233,4 @@ /vim-8.1-497.tar.bz2 /vim-8.1-511.tar.bz2 /vim-8.1-513.tar.bz2 +/vim-8.1-527.tar.bz2 diff --git a/sources b/sources index de5193ff..b009b5fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-513.tar.bz2) = 55e95ee94d2aba72e2e7f5a3608d48abdcd2408d6f982de8701e0f5d41ca95f29c26e4c9b88cdae04cabcb0fae6cc6ef4c7c922d88d4b2ed8ba780249b2388b9 +SHA512 (vim-8.1-527.tar.bz2) = 2fa5889dba3267d6c0b547df5adde836a58f2b2a09f60573c0d06ef480b5381d304fa04fd6a535087595e93ae244223c96dc3974036a7eaa3c039a52967c6960 diff --git a/vim.spec b/vim.spec index e09abb66..b31ae6e8 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 513 +%define patchlevel 527 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -799,6 +799,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Nov 16 2018 Zdenek Dohnal - 2:8.1.527-1 +- patchlevel 527 + * Thu Nov 08 2018 Zdenek Dohnal - 2:8.1.513-2 - #1646183 - do not forget the epoch From d195887cd825db5405eac3a5a808fb57c5b28dc5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 27 Nov 2018 10:48:53 +0100 Subject: [PATCH 067/584] update vim-update.sh - F27 EOL --- vim-update.sh | 8 ++++---- vim.spec | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index b53e6fb6..c68b2678 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,10 +1,10 @@ #!/bin/bash debug="" #debug="echo " -branches=( "master" "f29" "f28" "f27" ) -releases=( "fc30" "fc29" "fc28" "fc27" ) -regexps=( "fc30" "\|fc29" "\|fc28" "\|fc27" ) -bodhi_enabled=( "0" "1" "1" "1") +branches=( "master" "f29" "f28" ) +releases=( "fc30" "fc29" "fc28" ) +regexps=( "fc30" "\|fc29" "\|fc28" ) +bodhi_enabled=( "0" "1" "1" ) branches_count=3 #releases_regexp=fc28\\\|fc27\\\|fc28 diff --git a/vim.spec b/vim.spec index b31ae6e8..42635e21 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -799,6 +799,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Nov 27 2018 Zdenek Dohnal - 2:8.1.527-2 +- update vim-update.sh - F27 EOL + * Fri Nov 16 2018 Zdenek Dohnal - 2:8.1.527-1 - patchlevel 527 From 0602d3f5e511c5c1319ceb0cf82a5d37eb6839c0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 27 Nov 2018 11:56:46 +0100 Subject: [PATCH 068/584] - patchlevel 549 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 398d7d48..6f68bacf 100644 --- a/.gitignore +++ b/.gitignore @@ -234,3 +234,4 @@ /vim-8.1-511.tar.bz2 /vim-8.1-513.tar.bz2 /vim-8.1-527.tar.bz2 +/vim-8.1-549.tar.bz2 diff --git a/sources b/sources index b009b5fc..e73c4145 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-527.tar.bz2) = 2fa5889dba3267d6c0b547df5adde836a58f2b2a09f60573c0d06ef480b5381d304fa04fd6a535087595e93ae244223c96dc3974036a7eaa3c039a52967c6960 +SHA512 (vim-8.1-549.tar.bz2) = 2a98e2f6af9b9748b8658c4e8b0e000e7e9eb6767b81b025d8e03574597dbf2f6300d4a89ae0ac52ed9a0138e8ebd53715bdf6ee2fdfd56b1d6fe0c1b752afe1 diff --git a/vim.spec b/vim.spec index 42635e21..6e3878fb 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 527 +%define patchlevel 549 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -799,6 +799,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Nov 27 2018 Zdenek Dohnal - 2:8.1.549-1 +- patchlevel 549 + * Tue Nov 27 2018 Zdenek Dohnal - 2:8.1.527-2 - update vim-update.sh - F27 EOL From c364e6ff28dff42fa6ece7b2a871153242bde461 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 6 Dec 2018 10:30:01 +0100 Subject: [PATCH 069/584] do not strip binaries before build system strips it --- vim.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index 6e3878fb..593aa462 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -399,7 +399,10 @@ rm -f README*.info cd src -make install DESTDIR=%{buildroot} BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} +# 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 DESTDIR=%{buildroot} BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} STRIP=/bin/true make installgtutorbin DESTDIR=%{buildroot} BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps install -m755 minimal-vim %{buildroot}%{_bindir}/vi @@ -799,6 +802,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Dec 05 2018 Zdenek Dohnal - 2:8.1.549-2 +- do not strip binaries before build system strips it + * Tue Nov 27 2018 Zdenek Dohnal - 2:8.1.549-1 - patchlevel 549 From fd5e45dfc7e9c048e02089d2e087593cfe0973a0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 10 Dec 2018 12:19:15 +0100 Subject: [PATCH 070/584] - patchlevel 575 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6f68bacf..b2e2ccef 100644 --- a/.gitignore +++ b/.gitignore @@ -235,3 +235,4 @@ /vim-8.1-513.tar.bz2 /vim-8.1-527.tar.bz2 /vim-8.1-549.tar.bz2 +/vim-8.1-575.tar.bz2 diff --git a/sources b/sources index e73c4145..e0ce782e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-549.tar.bz2) = 2a98e2f6af9b9748b8658c4e8b0e000e7e9eb6767b81b025d8e03574597dbf2f6300d4a89ae0ac52ed9a0138e8ebd53715bdf6ee2fdfd56b1d6fe0c1b752afe1 +SHA512 (vim-8.1-575.tar.bz2) = cab35be1f5e532984a8f5b6630997af06a780357b96444be6dc13ae3b3d74bc9c49a1d7221aa1e3d1eac231a1d30998bf16de7e4d72a40409a2b7ea76b0d646c diff --git a/vim.spec b/vim.spec index 593aa462..aaf9aa91 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 549 +%define patchlevel 575 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -802,6 +802,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Dec 10 2018 Zdenek Dohnal - 2:8.1.575-1 +- patchlevel 575 + * Wed Dec 05 2018 Zdenek Dohnal - 2:8.1.549-2 - do not strip binaries before build system strips it From 494e7c9d508d8a2854941494dcea497f22513cbb Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 8 Jan 2019 08:30:52 +0100 Subject: [PATCH 071/584] - patchlevel 702 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b2e2ccef..6d0fcfbe 100644 --- a/.gitignore +++ b/.gitignore @@ -236,3 +236,4 @@ /vim-8.1-527.tar.bz2 /vim-8.1-549.tar.bz2 /vim-8.1-575.tar.bz2 +/vim-8.1-702.tar.bz2 diff --git a/sources b/sources index e0ce782e..1c2ba2a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-575.tar.bz2) = cab35be1f5e532984a8f5b6630997af06a780357b96444be6dc13ae3b3d74bc9c49a1d7221aa1e3d1eac231a1d30998bf16de7e4d72a40409a2b7ea76b0d646c +SHA512 (vim-8.1-702.tar.bz2) = 666dc9197d17e082c5cb316b165b5b5b6e2502ec85fed7c0bce6956dfaeb2f9007b7dd56973e20a12ff38673ca641e9704e3dedef0f6ca4f10714f8135c54248 diff --git a/vim.spec b/vim.spec index aaf9aa91..12342e3d 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 575 +%define patchlevel 702 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -802,6 +802,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jan 08 2019 Zdenek Dohnal - 2:8.1.702-1 +- patchlevel 702 + * Mon Dec 10 2018 Zdenek Dohnal - 2:8.1.575-1 - patchlevel 575 From e9ecb42d26a1d03e678aa92d1cde7bd7eb7b3823 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 11 Jan 2019 08:55:44 +0100 Subject: [PATCH 072/584] - patchlevel 714 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6d0fcfbe..a946f5fa 100644 --- a/.gitignore +++ b/.gitignore @@ -237,3 +237,4 @@ /vim-8.1-549.tar.bz2 /vim-8.1-575.tar.bz2 /vim-8.1-702.tar.bz2 +/vim-8.1-714.tar.bz2 diff --git a/sources b/sources index 1c2ba2a0..6c1afe9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-702.tar.bz2) = 666dc9197d17e082c5cb316b165b5b5b6e2502ec85fed7c0bce6956dfaeb2f9007b7dd56973e20a12ff38673ca641e9704e3dedef0f6ca4f10714f8135c54248 +SHA512 (vim-8.1-714.tar.bz2) = fa42534c7220cfa49836e7c269a5a92be9b47099dcee32d169397f685f8ac36439378d66e9583fb79371732e9d4d32e07b6a4feb927496f98d93b6f8d3e3a734 diff --git a/vim.spec b/vim.spec index 12342e3d..8fa354d4 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 702 +%define patchlevel 714 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -802,6 +802,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jan 11 2019 Zdenek Dohnal - 2:8.1.714-1 +- patchlevel 714 + * Tue Jan 08 2019 Zdenek Dohnal - 2:8.1.702-1 - patchlevel 702 From a281022892e519dbd5b82cb743bcb0841e0631f4 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 22 Jan 2019 17:28:16 +0100 Subject: [PATCH 073/584] - patchlevel 789 --- .gitignore | 1 + sources | 2 +- vim-7.4-nowarnings.patch | 10 +++++----- vim.spec | 5 ++++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a946f5fa..26d2f521 100644 --- a/.gitignore +++ b/.gitignore @@ -238,3 +238,4 @@ /vim-8.1-575.tar.bz2 /vim-8.1-702.tar.bz2 /vim-8.1-714.tar.bz2 +/vim-8.1-789.tar.bz2 diff --git a/sources b/sources index 6c1afe9f..0815430d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-714.tar.bz2) = fa42534c7220cfa49836e7c269a5a92be9b47099dcee32d169397f685f8ac36439378d66e9583fb79371732e9d4d32e07b6a4feb927496f98d93b6f8d3e3a734 +SHA512 (vim-8.1-789.tar.bz2) = b67a5c59aebb0a18319da476d998ed66303fe0278d01f0d1957be309ccade47b101485573c964f7e8826e534b1e995c32908a77483cc1d2394037fd3a9278926 diff --git a/vim-7.4-nowarnings.patch b/vim-7.4-nowarnings.patch index c77f9fce..a98e9d61 100644 --- a/vim-7.4-nowarnings.patch +++ b/vim-7.4-nowarnings.patch @@ -1,11 +1,11 @@ -diff -up vim74/src/ex_docmd.c.e319 vim74/src/ex_docmd.c ---- vim74/src/ex_docmd.c.e319 2016-02-17 14:48:23.033995923 +0100 -+++ vim74/src/ex_docmd.c 2016-02-17 14:48:03.712890575 +0100 -@@ -4630,6 +4630,7 @@ get_flags(exarg_T *eap) +diff -up vim81/src/ex_docmd.c.backup vim81/src/ex_docmd.c +--- vim81/src/ex_docmd.c.backup 2019-01-22 17:35:28.701320672 +0100 ++++ vim81/src/ex_docmd.c 2019-01-22 17:36:56.644540351 +0100 +@@ -4793,6 +4793,7 @@ get_flags(exarg_T *eap) void ex_ni(exarg_T *eap) { + return; if (!eap->skip) - eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version"); + eap->errmsg = N_("E319: Sorry, the command is not available in this version"); } diff --git a/vim.spec b/vim.spec index 8fa354d4..09613609 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 714 +%define patchlevel 789 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -802,6 +802,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jan 22 2019 Zdenek Dohnal - 2:8.1.789-1 +- patchlevel 789 + * Fri Jan 11 2019 Zdenek Dohnal - 2:8.1.714-1 - patchlevel 714 From 8f22aaf085b7e8525ae610d34d86ef380d620b8d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 25 Jan 2019 09:32:02 +0100 Subject: [PATCH 074/584] - patchlevel 818 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 26d2f521..263b8ade 100644 --- a/.gitignore +++ b/.gitignore @@ -239,3 +239,4 @@ /vim-8.1-702.tar.bz2 /vim-8.1-714.tar.bz2 /vim-8.1-789.tar.bz2 +/vim-8.1-818.tar.bz2 diff --git a/sources b/sources index 0815430d..4f602ced 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-789.tar.bz2) = b67a5c59aebb0a18319da476d998ed66303fe0278d01f0d1957be309ccade47b101485573c964f7e8826e534b1e995c32908a77483cc1d2394037fd3a9278926 +SHA512 (vim-8.1-818.tar.bz2) = a6751c1381cfb0ef659d32c1954e0019fa4030d6f581c6157bad28a187dc92199d3f688f122a1a703d8ade9f31741b92b0a6ea521916569dd1cbe6d4459b9143 diff --git a/vim.spec b/vim.spec index 09613609..35edd88f 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 789 +%define patchlevel 818 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -802,6 +802,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jan 25 2019 Zdenek Dohnal - 2:8.1.818-1 +- patchlevel 818 + * Tue Jan 22 2019 Zdenek Dohnal - 2:8.1.789-1 - patchlevel 789 From 27c2abc4e8711e89d0796d194c8b71468e9b2ea1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 28 Jan 2019 12:04:24 +0100 Subject: [PATCH 075/584] - patchlevel 837 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 263b8ade..d62f4a48 100644 --- a/.gitignore +++ b/.gitignore @@ -240,3 +240,4 @@ /vim-8.1-714.tar.bz2 /vim-8.1-789.tar.bz2 /vim-8.1-818.tar.bz2 +/vim-8.1-837.tar.bz2 diff --git a/sources b/sources index 4f602ced..b9935927 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-818.tar.bz2) = a6751c1381cfb0ef659d32c1954e0019fa4030d6f581c6157bad28a187dc92199d3f688f122a1a703d8ade9f31741b92b0a6ea521916569dd1cbe6d4459b9143 +SHA512 (vim-8.1-837.tar.bz2) = 618c8627a26cb0cdeadaeb952158e13cb3270bedd2e2b448f7813bf8597a3ceeff2703c8294fbab89c19696a300455e5aa28a4f0dbcb67c0b5b0c4c89977c2ff diff --git a/vim.spec b/vim.spec index 35edd88f..be5252de 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 818 +%define patchlevel 837 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -802,6 +802,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jan 28 2019 Zdenek Dohnal - 2:8.1.837-1 +- patchlevel 837 + * Fri Jan 25 2019 Zdenek Dohnal - 2:8.1.818-1 - patchlevel 818 From bda46b61da211d15cfba26a1f66d7ae8ce5cade0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 30 Jan 2019 10:32:46 +0100 Subject: [PATCH 076/584] FTBFS with new ruby-2.6 --- vim-ruby26.patch | 28 ++++++++++++++++++++++++++++ vim.spec | 15 ++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 vim-ruby26.patch diff --git a/vim-ruby26.patch b/vim-ruby26.patch new file mode 100644 index 00000000..da8d2e8f --- /dev/null +++ b/vim-ruby26.patch @@ -0,0 +1,28 @@ +diff --git a/src/if_ruby.c b/src/if_ruby.c +index 9c91f31..e53e0ef 100644 +--- a/src/if_ruby.c ++++ b/src/if_ruby.c +@@ -476,7 +476,11 @@ static void (*dll_ruby_init_stack)(VALUE*); + # endif + # endif + # ifdef RUBY19_OR_LATER ++# ifdef DYNAMIC_RUBY_VER >= 26 ++static VALUE (*dll_rb_int2big)(intptr_t); ++# else + static VALUE (*dll_rb_int2big)(SIGNED_VALUE); ++# endif + # endif + + # ifdef RUBY19_OR_LATER +@@ -506,7 +510,11 @@ SIGNED_VALUE rb_num2long_stub(VALUE x) + { + return dll_rb_num2long(x); + } ++# ifdef DYNAMIC_RUBY_VER >= 26 ++VALUE rb_int2big_stub(intptr_t x) ++# else + VALUE rb_int2big_stub(SIGNED_VALUE x) ++# endif + { + return dll_rb_int2big(x); + } diff --git a/vim.spec b/vim.spec index be5252de..2cd19c68 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -67,6 +67,15 @@ 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 +# Ruby 2.6 introduced API breakage in dll_rb_int2big() function - the function +# had one parameter of SIGNED_VALUE type, but now it has one parameter of +# intptr_t type. It needed to be fixed in Vim, because it caused FTBFS on +# i686 and armv7hl archs - the new type of parameter seems to be expanded +# to the same amount of memory in 64b archs as the old type, but into different +# on 32b archs. +# Ruby upstream issue: https://bugs.ruby-lang.org/issues/15570 +# Vim upstream issue: will need to be reported +Patch3018: vim-ruby26.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -255,6 +264,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 %patch3017 -p1 +%patch3018 -p1 %build %if 0%{?rhel} > 7 @@ -802,6 +812,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jan 29 2019 Zdenek Dohnal - 2:8.1.837-2 +- FTBFS with new ruby-2.6 + * Mon Jan 28 2019 Zdenek Dohnal - 2:8.1.837-1 - patchlevel 837 From c738ae2b3d8950d3d179bca81b57770414456478 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 30 Jan 2019 10:33:46 +0100 Subject: [PATCH 077/584] - patchlevel 847 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d62f4a48..952c0b42 100644 --- a/.gitignore +++ b/.gitignore @@ -241,3 +241,4 @@ /vim-8.1-789.tar.bz2 /vim-8.1-818.tar.bz2 /vim-8.1-837.tar.bz2 +/vim-8.1-847.tar.bz2 diff --git a/sources b/sources index b9935927..e996f9fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-837.tar.bz2) = 618c8627a26cb0cdeadaeb952158e13cb3270bedd2e2b448f7813bf8597a3ceeff2703c8294fbab89c19696a300455e5aa28a4f0dbcb67c0b5b0c4c89977c2ff +SHA512 (vim-8.1-847.tar.bz2) = 1507b2ee8acba8067632799050b4a93ac80464ed15b782e8eeaa3917ab3f71165a59f5dbc003e51cbb6fc309fd1e1a8288b8423cafc1e5f4c0f935d19e66e0bf diff --git a/vim.spec b/vim.spec index 2cd19c68..7efed4f0 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 837 +%define patchlevel 847 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,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: vim.sh @@ -812,6 +812,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jan 30 2019 Zdenek Dohnal - 2:8.1.847-1 +- patchlevel 847 + * Tue Jan 29 2019 Zdenek Dohnal - 2:8.1.837-2 - FTBFS with new ruby-2.6 From 9c25513f81d05a1f3ca95caf330e7109e32a8e13 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 30 Jan 2019 12:30:46 +0100 Subject: [PATCH 078/584] fix patch for new ruby-2.6 --- vim-ruby26.patch | 4 ++-- vim.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/vim-ruby26.patch b/vim-ruby26.patch index da8d2e8f..30630a29 100644 --- a/vim-ruby26.patch +++ b/vim-ruby26.patch @@ -6,7 +6,7 @@ index 9c91f31..e53e0ef 100644 # endif # endif # ifdef RUBY19_OR_LATER -+# ifdef DYNAMIC_RUBY_VER >= 26 ++# if DYNAMIC_RUBY_VER >= 26 +static VALUE (*dll_rb_int2big)(intptr_t); +# else static VALUE (*dll_rb_int2big)(SIGNED_VALUE); @@ -18,7 +18,7 @@ index 9c91f31..e53e0ef 100644 { return dll_rb_num2long(x); } -+# ifdef DYNAMIC_RUBY_VER >= 26 ++# if DYNAMIC_RUBY_VER >= 26 +VALUE rb_int2big_stub(intptr_t x) +# else VALUE rb_int2big_stub(SIGNED_VALUE x) diff --git a/vim.spec b/vim.spec index 7efed4f0..b1472967 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,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: vim.sh @@ -812,6 +812,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jan 30 2019 Zdenek Dohnal - 2:8.1.847-2 +- fix patch for new ruby-2.6 + * Wed Jan 30 2019 Zdenek Dohnal - 2:8.1.847-1 - patchlevel 847 From 2815c684568b7f32bccfd68b93a7997b7291df40 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 31 Jan 2019 11:56:31 +0100 Subject: [PATCH 079/584] remove ancient Changelog.rpm Signed-off-by: Karsten Hopp --- vim.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vim.spec b/vim.spec index b1472967..290956c0 100644 --- a/vim.spec +++ b/vim.spec @@ -35,7 +35,6 @@ Source7: gvim16.png Source8: gvim32.png Source9: gvim48.png Source10: gvim64.png -Source11: Changelog.rpm %if %{withvimspell} Source13: vim-spell-files.tar.bz2 %endif @@ -397,7 +396,6 @@ cp vim enhanced-vim 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 %{SOURCE11} . %if %{?fedora}%{!?fedora:0} >= 16 || %{?rhel}%{!?rhel:0} >= 6 cp -f %{SOURCE15} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec %else @@ -608,7 +606,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %license LICENSE %doc README* %doc runtime/docs -%doc Changelog.rpm %dir %{_datadir}/%{name} %{_datadir}/%{name}/vimfiles/template.spec %dir %{_datadir}/%{name}/%{vimdir} @@ -812,6 +809,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jan 31 2019 Karsten Hopp - 2:8.1.847-2 +- remove ancient Changelog.rpm + * Wed Jan 30 2019 Zdenek Dohnal - 2:8.1.847-2 - fix patch for new ruby-2.6 From 36ce4d783b5d36d91a1f1791cb8d0f980b80b30f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:16:49 +0000 Subject: [PATCH 080/584] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 290956c0..3b64de2f 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 3%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -809,6 +809,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2:8.1.847-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jan 31 2019 Karsten Hopp - 2:8.1.847-2 - remove ancient Changelog.rpm From 6197f253291d1c362948925a865628ebd8673fdd Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 4 Feb 2019 14:38:31 +0100 Subject: [PATCH 081/584] remove downstream fix for new ruby, upstream solved it different way --- vim-ruby26.patch | 28 ---------------------------- vim.spec | 15 ++++----------- 2 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 vim-ruby26.patch diff --git a/vim-ruby26.patch b/vim-ruby26.patch deleted file mode 100644 index 30630a29..00000000 --- a/vim-ruby26.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/if_ruby.c b/src/if_ruby.c -index 9c91f31..e53e0ef 100644 ---- a/src/if_ruby.c -+++ b/src/if_ruby.c -@@ -476,7 +476,11 @@ static void (*dll_ruby_init_stack)(VALUE*); - # endif - # endif - # ifdef RUBY19_OR_LATER -+# if DYNAMIC_RUBY_VER >= 26 -+static VALUE (*dll_rb_int2big)(intptr_t); -+# else - static VALUE (*dll_rb_int2big)(SIGNED_VALUE); -+# endif - # endif - - # ifdef RUBY19_OR_LATER -@@ -506,7 +510,11 @@ SIGNED_VALUE rb_num2long_stub(VALUE x) - { - return dll_rb_num2long(x); - } -+# if DYNAMIC_RUBY_VER >= 26 -+VALUE rb_int2big_stub(intptr_t x) -+# else - VALUE rb_int2big_stub(SIGNED_VALUE x) -+# endif - { - return dll_rb_int2big(x); - } diff --git a/vim.spec b/vim.spec index 3b64de2f..9b4c5757 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 3%{?dist} +Release: 4%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -66,15 +66,6 @@ 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 -# Ruby 2.6 introduced API breakage in dll_rb_int2big() function - the function -# had one parameter of SIGNED_VALUE type, but now it has one parameter of -# intptr_t type. It needed to be fixed in Vim, because it caused FTBFS on -# i686 and armv7hl archs - the new type of parameter seems to be expanded -# to the same amount of memory in 64b archs as the old type, but into different -# on 32b archs. -# Ruby upstream issue: https://bugs.ruby-lang.org/issues/15570 -# Vim upstream issue: will need to be reported -Patch3018: vim-ruby26.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -263,7 +254,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 %patch3017 -p1 -%patch3018 -p1 %build %if 0%{?rhel} > 7 @@ -809,6 +799,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Feb 04 2019 Zdenek Dohnal - 2:8.1.847-4 +- remove downstream fix for new ruby, upstream solved it different way + * Sun Feb 03 2019 Fedora Release Engineering - 2:8.1.847-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a436fb1cabb8ea966198b79c8d472b5a83befecf Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 4 Feb 2019 14:42:02 +0100 Subject: [PATCH 082/584] - patchlevel 873 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 952c0b42..4b72aea7 100644 --- a/.gitignore +++ b/.gitignore @@ -242,3 +242,4 @@ /vim-8.1-818.tar.bz2 /vim-8.1-837.tar.bz2 /vim-8.1-847.tar.bz2 +/vim-8.1-873.tar.bz2 diff --git a/sources b/sources index e996f9fa..47a99c9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-847.tar.bz2) = 1507b2ee8acba8067632799050b4a93ac80464ed15b782e8eeaa3917ab3f71165a59f5dbc003e51cbb6fc309fd1e1a8288b8423cafc1e5f4c0f935d19e66e0bf +SHA512 (vim-8.1-873.tar.bz2) = e64445d7d1705b7fde720f353250bf5a93a58dfc2dca3e82ad1094db042a2d33d116b5083ab169175dd189b0b702187c64df9309123760256f4ff82893cbc73b diff --git a/vim.spec b/vim.spec index 9b4c5757..f6b05b30 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 847 +%define patchlevel 873 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -24,7 +24,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 4%{?dist} +Release: 1%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -799,6 +799,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Feb 04 2019 Zdenek Dohnal - 2:8.1.873-1 +- patchlevel 873 + * Mon Feb 04 2019 Zdenek Dohnal - 2:8.1.847-4 - remove downstream fix for new ruby, upstream solved it different way From bb079b4ae5b009247be687e441d2f1ad1442b07e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 8 Feb 2019 14:23:09 +0100 Subject: [PATCH 083/584] - patchlevel 880 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4b72aea7..2839430f 100644 --- a/.gitignore +++ b/.gitignore @@ -243,3 +243,4 @@ /vim-8.1-837.tar.bz2 /vim-8.1-847.tar.bz2 /vim-8.1-873.tar.bz2 +/vim-8.1-880.tar.bz2 diff --git a/sources b/sources index 47a99c9c..82b7488c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-873.tar.bz2) = e64445d7d1705b7fde720f353250bf5a93a58dfc2dca3e82ad1094db042a2d33d116b5083ab169175dd189b0b702187c64df9309123760256f4ff82893cbc73b +SHA512 (vim-8.1-880.tar.bz2) = c98f5b2234ee9e27af97e6daeff4f5f909bcd62dc633ab797ab7c8085406f0e0f3d886f25c8f632985822d4e8eacc20ee656082d3e9fe29ad9c3c8c034db2586 diff --git a/vim.spec b/vim.spec index f6b05b30..46b75992 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 873 +%define patchlevel 880 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -799,6 +799,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Feb 08 2019 Zdenek Dohnal - 2:8.1.880-1 +- patchlevel 880 + * Mon Feb 04 2019 Zdenek Dohnal - 2:8.1.873-1 - patchlevel 873 From d56c4cb8ff1fc34c8aba11fff404a9baacc67a2d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 12 Feb 2019 17:41:49 +0100 Subject: [PATCH 084/584] - patchlevel 897 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2839430f..10f0bf83 100644 --- a/.gitignore +++ b/.gitignore @@ -244,3 +244,4 @@ /vim-8.1-847.tar.bz2 /vim-8.1-873.tar.bz2 /vim-8.1-880.tar.bz2 +/vim-8.1-897.tar.bz2 diff --git a/sources b/sources index 82b7488c..fe084b8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-880.tar.bz2) = c98f5b2234ee9e27af97e6daeff4f5f909bcd62dc633ab797ab7c8085406f0e0f3d886f25c8f632985822d4e8eacc20ee656082d3e9fe29ad9c3c8c034db2586 +SHA512 (vim-8.1-897.tar.bz2) = 39933ec956ee1337f25967bb165f7c6b36b44520a953dc70a2e1919110fbf89558de38891604b77c99bde71fccc0390d3f8edae603b234a2f7b0c17d5989833d diff --git a/vim.spec b/vim.spec index 46b75992..42dc70f2 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 880 +%define patchlevel 897 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -799,6 +799,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Feb 12 2019 Zdenek Dohnal - 2:8.1.897-1 +- patchlevel 897 + * Fri Feb 08 2019 Zdenek Dohnal - 2:8.1.880-1 - patchlevel 880 From be2d00367cf417dcae2ce84e115432afc2261844 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 14 Feb 2019 14:36:41 +0100 Subject: [PATCH 085/584] we do not need exact include path for python3 now --- vim.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vim.spec b/vim.spec index 42dc70f2..7f79e82a 100644 --- a/vim.spec +++ b/vim.spec @@ -14,9 +14,6 @@ %define withruby 1 %define withlua 1 -%define python3 python3.6m -%define python3path %{_includedir}/%{python3} - %define baseversion 8.1 %define vimdir vim81 @@ -24,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: vim.sh @@ -266,8 +263,8 @@ 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 -I%{python3path}" -export CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -I%{python3path}" +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 @@ -799,6 +796,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Feb 14 2019 Zdenek Dohnal - 2:8.1.897-2 +- we do not need exact include path for python3 now + * Tue Feb 12 2019 Zdenek Dohnal - 2:8.1.897-1 - patchlevel 897 From bd661aab3adf91ef9abffbf41f8ad32fa6e93249 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 14 Feb 2019 14:38:11 +0100 Subject: [PATCH 086/584] - patchlevel 918 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 10f0bf83..f3d4f9f1 100644 --- a/.gitignore +++ b/.gitignore @@ -245,3 +245,4 @@ /vim-8.1-873.tar.bz2 /vim-8.1-880.tar.bz2 /vim-8.1-897.tar.bz2 +/vim-8.1-918.tar.bz2 diff --git a/sources b/sources index fe084b8b..45724220 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-897.tar.bz2) = 39933ec956ee1337f25967bb165f7c6b36b44520a953dc70a2e1919110fbf89558de38891604b77c99bde71fccc0390d3f8edae603b234a2f7b0c17d5989833d +SHA512 (vim-8.1-918.tar.bz2) = 58fc2a3e8200721b93b10d3e3bc65cfdc4dcbcb0fe836c42c57058706d279ba638abf2a501dc12988738e2eff3348363f52596c1e3ef3727b8360895aca7f550 diff --git a/vim.spec b/vim.spec index 7f79e82a..74b8f521 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 897 +%define patchlevel 918 %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: vim.sh @@ -796,6 +796,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Feb 14 2019 Zdenek Dohnal - 2:8.1.918-1 +- patchlevel 918 + * Thu Feb 14 2019 Zdenek Dohnal - 2:8.1.897-2 - we do not need exact include path for python3 now From ab054cef2521420d4a066ddb88d4b48019990f75 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 20 Feb 2019 09:42:46 +0100 Subject: [PATCH 087/584] we have Fedora 30 branch now, enable updates for it in vim-update.sh --- vim-update.sh | 10 +++++----- vim.spec | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index c68b2678..94bfd043 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,11 +1,11 @@ #!/bin/bash debug="" #debug="echo " -branches=( "master" "f29" "f28" ) -releases=( "fc30" "fc29" "fc28" ) -regexps=( "fc30" "\|fc29" "\|fc28" ) -bodhi_enabled=( "0" "1" "1" ) -branches_count=3 +branches=( "master" "f30" "f29" "f28" ) +releases=( "fc31" "fc30" "fc29" "fc28" ) +regexps=( "fc31" "\|fc30" "\|fc29" "\|fc28" ) +bodhi_enabled=( "0" "0" "1" "1" ) +branches_count=4 #releases_regexp=fc28\\\|fc27\\\|fc28 branches_index=0 diff --git a/vim.spec b/vim.spec index 74b8f521..79490e00 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: vim.sh @@ -796,6 +796,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Feb 20 2019 Zdenek Dohnal - 2:8.1.918-2 +- we have Fedora 30 branch now, enable updates for it in vim-update.sh + * Thu Feb 14 2019 Zdenek Dohnal - 2:8.1.918-1 - patchlevel 918 From fe1b6ecab8a0b7daa9d39deffcead73d60b030e0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 20 Feb 2019 10:25:15 +0100 Subject: [PATCH 088/584] - patchlevel 956 --- .gitignore | 1 + sources | 2 +- vim-7.4-licensemacro-1151450.patch | 15 --------------- vim.spec | 9 +++++---- 4 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 vim-7.4-licensemacro-1151450.patch diff --git a/.gitignore b/.gitignore index f3d4f9f1..7af3ef78 100644 --- a/.gitignore +++ b/.gitignore @@ -246,3 +246,4 @@ /vim-8.1-880.tar.bz2 /vim-8.1-897.tar.bz2 /vim-8.1-918.tar.bz2 +/vim-8.1-956.tar.bz2 diff --git a/sources b/sources index 45724220..e1bb39fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-918.tar.bz2) = 58fc2a3e8200721b93b10d3e3bc65cfdc4dcbcb0fe836c42c57058706d279ba638abf2a501dc12988738e2eff3348363f52596c1e3ef3727b8360895aca7f550 +SHA512 (vim-8.1-956.tar.bz2) = a32efd344295e1d68559693d9f53710bc77a2d8a6f19dc969cda588f7924d854f91dc4e4c35332e954c51daa2563a46ad3081a7a236bdf03a8b2b6a777a01d77 diff --git a/vim-7.4-licensemacro-1151450.patch b/vim-7.4-licensemacro-1151450.patch deleted file mode 100644 index 3a6e0a71..00000000 --- a/vim-7.4-licensemacro-1151450.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up vim74_new/runtime/syntax/spec.vim.1151450 vim74_new/runtime/syntax/spec.vim ---- vim74_new/runtime/syntax/spec.vim.1151450 2014-10-13 10:45:07.570944538 +0200 -+++ vim74_new/runtime/syntax/spec.vim 2014-10-13 10:44:09.046945965 +0200 -@@ -88,9 +88,9 @@ syn region specSectionMacroBracketArea o - "%% Files Section %% - "TODO %config valid parameters: missingok\|noreplace - "TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\) --syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier -+syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier - "tip: remember to include new itens in specFilesArea above --syn match specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>' -+syn match specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>' - - "valid options for certain section headers - syn match specDescriptionOpts contained '\s-[ln]\s*\a'ms=s+1,me=e-1 diff --git a/vim.spec b/vim.spec index 79490e00..38d13e97 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 918 +%define patchlevel 956 %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: vim.sh @@ -57,7 +57,6 @@ Patch3008: vim-7.4-syncolor.patch Patch3009: vim-7.0-specedit.patch Patch3010: vim-7.3-manpage-typo-668894-675480.patch Patch3011: vim-manpagefixes-948566.patch -Patch3012: vim-7.4-licensemacro-1151450.patch Patch3013: vim-7.4-globalsyntax.patch Patch3014: vim-7.4-releasestring-1318991.patch Patch3016: vim-8.0-copy-paste.patch @@ -246,7 +245,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk #patch3009 -p1 %patch3010 -p1 %patch3011 -p1 -%patch3012 -p1 %patch3013 -p1 %patch3014 -p1 %patch3016 -p1 @@ -796,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Feb 20 2019 Zdenek Dohnal - 2:8.1.956-1 +- patchlevel 956 + * Wed Feb 20 2019 Zdenek Dohnal - 2:8.1.918-2 - we have Fedora 30 branch now, enable updates for it in vim-update.sh From 3017e55bf3a1e0298595f2df3fdc2da78024fd88 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 4 Mar 2019 15:32:01 +0100 Subject: [PATCH 089/584] - patchlevel 994 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7af3ef78..55115781 100644 --- a/.gitignore +++ b/.gitignore @@ -247,3 +247,4 @@ /vim-8.1-897.tar.bz2 /vim-8.1-918.tar.bz2 /vim-8.1-956.tar.bz2 +/vim-8.1-994.tar.bz2 diff --git a/sources b/sources index e1bb39fe..e22c1c6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-956.tar.bz2) = a32efd344295e1d68559693d9f53710bc77a2d8a6f19dc969cda588f7924d854f91dc4e4c35332e954c51daa2563a46ad3081a7a236bdf03a8b2b6a777a01d77 +SHA512 (vim-8.1-994.tar.bz2) = 9c5c2d1378b8aa0ee1ee33256843e9a41b99df2f56709e57f4d3bf8d30d2bcdc8c2c9dd9520f91ee6ad6600fed133720c0347bdc8150ae6085983e7ec3f7384a diff --git a/vim.spec b/vim.spec index 38d13e97..0f2817c9 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 956 +%define patchlevel 994 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -794,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Mar 04 2019 Zdenek Dohnal - 2:8.1.994-1 +- patchlevel 994 + * Wed Feb 20 2019 Zdenek Dohnal - 2:8.1.956-1 - patchlevel 956 From 6689e80eb4f10a852628b0f29c63df99a184b35b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 8 Mar 2019 09:22:54 +0100 Subject: [PATCH 090/584] F30 is already active in bodhi --- vim-update.sh | 2 +- vim.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 94bfd043..4bc08c12 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -4,7 +4,7 @@ debug="" branches=( "master" "f30" "f29" "f28" ) releases=( "fc31" "fc30" "fc29" "fc28" ) regexps=( "fc31" "\|fc30" "\|fc29" "\|fc28" ) -bodhi_enabled=( "0" "0" "1" "1" ) +bodhi_enabled=( "0" "1" "1" "1" ) branches_count=4 #releases_regexp=fc28\\\|fc27\\\|fc28 diff --git a/vim.spec b/vim.spec index 0f2817c9..a345e004 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: vim.sh @@ -794,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Mar 08 2019 Zdenek Dohnal - 2:8.1.994-2 +- F30 is already active in bodhi + * Mon Mar 04 2019 Zdenek Dohnal - 2:8.1.994-1 - patchlevel 994 From a3a3fd55cc2a53dccb41f6e026e7d64e4243b833 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 8 Mar 2019 09:24:15 +0100 Subject: [PATCH 091/584] - patchlevel 998 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 55115781..0008f8aa 100644 --- a/.gitignore +++ b/.gitignore @@ -248,3 +248,4 @@ /vim-8.1-918.tar.bz2 /vim-8.1-956.tar.bz2 /vim-8.1-994.tar.bz2 +/vim-8.1-998.tar.bz2 diff --git a/sources b/sources index e22c1c6a..e47940b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-994.tar.bz2) = 9c5c2d1378b8aa0ee1ee33256843e9a41b99df2f56709e57f4d3bf8d30d2bcdc8c2c9dd9520f91ee6ad6600fed133720c0347bdc8150ae6085983e7ec3f7384a +SHA512 (vim-8.1-998.tar.bz2) = 877adddea18918f6e915f2118b82c69e45eed9722863296bf567587f830c2443abb0c8e67ef4a18eb4314d3661a3f24659c1a303000b0937142d5a0017d62d43 diff --git a/vim.spec b/vim.spec index a345e004..69087878 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 994 +%define patchlevel 998 %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: vim.sh @@ -794,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Mar 08 2019 Zdenek Dohnal - 2:8.1.998-1 +- patchlevel 998 + * Fri Mar 08 2019 Zdenek Dohnal - 2:8.1.994-2 - F30 is already active in bodhi From a590d1a397dcff828cc1d4e488539ba34001911e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 25 Mar 2019 11:52:48 +0100 Subject: [PATCH 092/584] - patchlevel 1048 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0008f8aa..9a5b1505 100644 --- a/.gitignore +++ b/.gitignore @@ -249,3 +249,4 @@ /vim-8.1-956.tar.bz2 /vim-8.1-994.tar.bz2 /vim-8.1-998.tar.bz2 +/vim-8.1-1048.tar.bz2 diff --git a/sources b/sources index e47940b6..0eb41ae8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-998.tar.bz2) = 877adddea18918f6e915f2118b82c69e45eed9722863296bf567587f830c2443abb0c8e67ef4a18eb4314d3661a3f24659c1a303000b0937142d5a0017d62d43 +SHA512 (vim-8.1-1048.tar.bz2) = 0c3efc9b950a78698aed64d139710152b78ab48fcd56be7fcdb146e748d2d1457d408b3e77b8b4bc70c64673f70ccdc231aecbe8f4b7855d7614b04e5fa5a56a diff --git a/vim.spec b/vim.spec index 69087878..e6808a47 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 998 +%define patchlevel 1048 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -794,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Mar 25 2019 Zdenek Dohnal - 2:8.1.1048-1 +- patchlevel 1048 + * Fri Mar 08 2019 Zdenek Dohnal - 2:8.1.998-1 - patchlevel 998 From ffd228a835c3bacd660770b4b88034c137669826 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 26 Mar 2019 13:49:57 +0100 Subject: [PATCH 093/584] add bundled libvterm --- vim.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index e6808a47..26a266a6 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: vim.sh @@ -87,6 +87,11 @@ BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} Epoch: 2 Conflicts: filesystem < 3 +# vim bundles libvterm, which is used during build - so we need to provide +# bundled libvterm for catching possible libvterm CVEs +Provides: bundled(libvterm) + + %description VIM (VIsual editor iMproved) is an updated and improved version of the vi editor. Vi was the first real screen-based editor for UNIX, and is @@ -794,6 +799,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Mar 26 2019 Zdenek Dohnal - 2:8.1.1048-2 +- add bundled libvterm + * Mon Mar 25 2019 Zdenek Dohnal - 2:8.1.1048-1 - patchlevel 1048 From fcdcaf506769464a2efbf53dd2d156f9c9509c95 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 2 Apr 2019 15:47:03 +0200 Subject: [PATCH 094/584] - patchlevel 1099 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9a5b1505..347de0a6 100644 --- a/.gitignore +++ b/.gitignore @@ -250,3 +250,4 @@ /vim-8.1-994.tar.bz2 /vim-8.1-998.tar.bz2 /vim-8.1-1048.tar.bz2 +/vim-8.1-1099.tar.bz2 diff --git a/sources b/sources index 0eb41ae8..5d9a1771 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1048.tar.bz2) = 0c3efc9b950a78698aed64d139710152b78ab48fcd56be7fcdb146e748d2d1457d408b3e77b8b4bc70c64673f70ccdc231aecbe8f4b7855d7614b04e5fa5a56a +SHA512 (vim-8.1-1099.tar.bz2) = 7236a7ba038457676340dbeb1762c7229571be2d25374febfd900dedf56a90591d49d5a397048f8ed3ad70e33461c8288c5c91b2803b9c18d205c909d7571779 diff --git a/vim.spec b/vim.spec index 26a266a6..42d415e5 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1048 +%define patchlevel 1099 %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: vim.sh @@ -799,6 +799,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Apr 02 2019 Zdenek Dohnal - 2:8.1.1099-1 +- patchlevel 1099 + * Tue Mar 26 2019 Zdenek Dohnal - 2:8.1.1048-2 - add bundled libvterm From 2f1f593c1f584fded501c30973dd40b70de8a2e3 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 8 Apr 2019 12:34:24 +0200 Subject: [PATCH 095/584] 1697104 - new spec file template contains deprecated tags --- spec-template | 42 ------------------------------------------ spec-template.new | 10 ++++++++-- vim.spec | 16 +++++++--------- 3 files changed, 15 insertions(+), 53 deletions(-) delete mode 100644 spec-template diff --git a/spec-template b/spec-template deleted file mode 100644 index a5363cc6..00000000 --- a/spec-template +++ /dev/null @@ -1,42 +0,0 @@ -Name: -Version: -Release: 1%{?dist} -Summary: - -Group: -License: -URL: -Source0: -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -BuildRequires: -Requires: - -%description - - -%prep -%setup -q - - -%build -%configure -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc - - - -%changelog diff --git a/spec-template.new b/spec-template.new index d9953482..b248ecdb 100644 --- a/spec-template.new +++ b/spec-template.new @@ -1,9 +1,14 @@ +# SPEC file overview: +# https://docs.fedoraproject.org/en-US/quick-docs/creating-rpm-packages/#con_rpm-spec-file-overview +# Fedora packaging guidelines: +# https://docs.fedoraproject.org/en-US/packaging-guidelines/ + + Name: Version: -Release: 1%{?dist} +Release: 0%{?dist} Summary: -Group: License: URL: Source0: @@ -29,6 +34,7 @@ make %{?_smp_mflags} %files %doc +%license diff --git a/vim.spec b/vim.spec index 42d415e5..9d146a77 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: vim.sh @@ -35,9 +35,8 @@ Source10: gvim64.png %if %{withvimspell} Source13: vim-spell-files.tar.bz2 %endif -Source14: spec-template -Source15: spec-template.new -Source16: macros.vim +Source14: spec-template.new +Source15: macros.vim #Source17: ftplugin-spec.vim #Source18: syntax-spec.vim @@ -386,11 +385,7 @@ cp vim enhanced-vim 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} -%if %{?fedora}%{!?fedora:0} >= 16 || %{?rhel}%{!?rhel:0} >= 6 -cp -f %{SOURCE15} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec -%else cp -f %{SOURCE14} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec -%endif cp runtime/doc/uganda.txt LICENSE # Those aren't Linux info files but some binary files for Amiga: rm -f README*.info @@ -541,7 +536,7 @@ sed -i -e "s/augroup fedora/augroup redhat/" %{buildroot}/%{_sysconfdir}/virc %endif mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/ -install -p -m644 %{SOURCE16} %{buildroot}%{_rpmconfigdir}/macros.d/ +install -p -m644 %{SOURCE15} %{buildroot}%{_rpmconfigdir}/macros.d/ (cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c @@ -799,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Apr 08 2019 Zdenek Dohnal - 2:8.1.1099-2 +- 1697104 - new spec file template contains deprecated tags + * Tue Apr 02 2019 Zdenek Dohnal - 2:8.1.1099-1 - patchlevel 1099 From 9a11303e92ae1c656765bf64186dd1ddc075e0c1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 8 Apr 2019 12:51:28 +0200 Subject: [PATCH 096/584] - patchlevel 1137 --- .gitignore | 1 + 0001-Typo-in-gvim.desktop-file.patch | 25 +++++++++++++++++++++++++ sources | 2 +- vim.spec | 10 ++++++++-- 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 0001-Typo-in-gvim.desktop-file.patch diff --git a/.gitignore b/.gitignore index 347de0a6..c0c7f977 100644 --- a/.gitignore +++ b/.gitignore @@ -251,3 +251,4 @@ /vim-8.1-998.tar.bz2 /vim-8.1-1048.tar.bz2 /vim-8.1-1099.tar.bz2 +/vim-8.1-1137.tar.bz2 diff --git a/0001-Typo-in-gvim.desktop-file.patch b/0001-Typo-in-gvim.desktop-file.patch new file mode 100644 index 00000000..0b35a647 --- /dev/null +++ b/0001-Typo-in-gvim.desktop-file.patch @@ -0,0 +1,25 @@ +From 89454405df6d9a3063267ca28e07498bcda77b18 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Mon, 8 Apr 2019 13:04:31 +0200 +Subject: [PATCH] Typo in gvim.desktop file. + +--- + runtime/gvim.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/runtime/gvim.desktop b/runtime/gvim.desktop +index 945bfb9bc..095ddb564 100644 +--- a/runtime/gvim.desktop ++++ b/runtime/gvim.desktop +@@ -6,7 +6,7 @@ GenericName[de]=Texteditor + GenericName[eo]=Tekstoredaktilo + GenericName[fr]=Éditeur de texte + GenericName[pl]=Edytor tekstu +-GenericName[is}=Ritvinnsluforrit ++GenericName[is]=Ritvinnsluforrit + Comment=Edit text files + Comment[af]=Redigeer tekslêers + Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ +-- +2.20.1 + diff --git a/sources b/sources index 5d9a1771..4ed6f373 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1099.tar.bz2) = 7236a7ba038457676340dbeb1762c7229571be2d25374febfd900dedf56a90591d49d5a397048f8ed3ad70e33461c8288c5c91b2803b9c18d205c909d7571779 +SHA512 (vim-8.1-1137.tar.bz2) = 0b59930e42de45454a170a9dbc6df6ba6a04475e00eb682c4e9215dac57c3c9536c12ca1bf565b74d9c643123dd4b035825010bd1364ba56cd3d660f84498487 diff --git a/vim.spec b/vim.spec index 9d146a77..8a808b96 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1099 +%define patchlevel 1137 %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: vim.sh @@ -61,6 +61,8 @@ 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 +# typo introduced in the latest upstream commit, reported upstream with patch +Patch3018: 0001-Typo-in-gvim.desktop-file.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -253,6 +255,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 %patch3017 -p1 +%patch3018 -p1 %build %if 0%{?rhel} > 7 @@ -794,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Apr 08 2019 Zdenek Dohnal - 2:8.1.1137-1 +- patchlevel 1137 + * Mon Apr 08 2019 Zdenek Dohnal - 2:8.1.1099-2 - 1697104 - new spec file template contains deprecated tags From 41acf19b5fcb19e332ab2b3e95a3ca56e02177e4 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 20 May 2019 09:15:37 +0200 Subject: [PATCH 097/584] remove upstream patch --- 0001-Typo-in-gvim.desktop-file.patch | 25 ------------------------- vim.spec | 8 ++++---- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 0001-Typo-in-gvim.desktop-file.patch diff --git a/0001-Typo-in-gvim.desktop-file.patch b/0001-Typo-in-gvim.desktop-file.patch deleted file mode 100644 index 0b35a647..00000000 --- a/0001-Typo-in-gvim.desktop-file.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 89454405df6d9a3063267ca28e07498bcda77b18 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Mon, 8 Apr 2019 13:04:31 +0200 -Subject: [PATCH] Typo in gvim.desktop file. - ---- - runtime/gvim.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/runtime/gvim.desktop b/runtime/gvim.desktop -index 945bfb9bc..095ddb564 100644 ---- a/runtime/gvim.desktop -+++ b/runtime/gvim.desktop -@@ -6,7 +6,7 @@ GenericName[de]=Texteditor - GenericName[eo]=Tekstoredaktilo - GenericName[fr]=Éditeur de texte - GenericName[pl]=Edytor tekstu --GenericName[is}=Ritvinnsluforrit -+GenericName[is]=Ritvinnsluforrit - Comment=Edit text files - Comment[af]=Redigeer tekslêers - Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ --- -2.20.1 - diff --git a/vim.spec b/vim.spec index 8a808b96..38fcbcf8 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: vim.sh @@ -61,8 +61,6 @@ 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 -# typo introduced in the latest upstream commit, reported upstream with patch -Patch3018: 0001-Typo-in-gvim.desktop-file.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -255,7 +253,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 %patch3017 -p1 -%patch3018 -p1 %build %if 0%{?rhel} > 7 @@ -797,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon May 20 2019 Zdenek Dohnal - 2:8.1.1137-2 +- remove upstream patch + * Mon Apr 08 2019 Zdenek Dohnal - 2:8.1.1137-1 - patchlevel 1137 From acdd65987528261038acc6f157abefc87bf6a65f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 20 May 2019 09:17:03 +0200 Subject: [PATCH 098/584] - patchlevel 1359 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c0c7f977..ab6fce7d 100644 --- a/.gitignore +++ b/.gitignore @@ -252,3 +252,4 @@ /vim-8.1-1048.tar.bz2 /vim-8.1-1099.tar.bz2 /vim-8.1-1137.tar.bz2 +/vim-8.1-1359.tar.bz2 diff --git a/sources b/sources index 4ed6f373..27cc8fd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1137.tar.bz2) = 0b59930e42de45454a170a9dbc6df6ba6a04475e00eb682c4e9215dac57c3c9536c12ca1bf565b74d9c643123dd4b035825010bd1364ba56cd3d660f84498487 +SHA512 (vim-8.1-1359.tar.bz2) = c8adf831e57851a9d897d9a0aa81eb4c9134f4b1b95cf688567ad9e6e51e95c1d88c0e64e3aa77e4c18dc34787762b5a80c74fda5ffd2690fcc29fc553e94e16 diff --git a/vim.spec b/vim.spec index 38fcbcf8..57b1cdd4 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1137 +%define patchlevel 1359 %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: vim.sh @@ -794,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon May 20 2019 Zdenek Dohnal - 2:8.1.1359-1 +- patchlevel 1359 + * Mon May 20 2019 Zdenek Dohnal - 2:8.1.1137-2 - remove upstream patch From 2157446e28532b81a81890995a829d40e2ab8f1e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 20 May 2019 12:58:29 +0200 Subject: [PATCH 099/584] stop updating f28 --- vim-update.sh | 6 +++--- vim.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 4bc08c12..148748bf 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,9 +1,9 @@ #!/bin/bash debug="" #debug="echo " -branches=( "master" "f30" "f29" "f28" ) -releases=( "fc31" "fc30" "fc29" "fc28" ) -regexps=( "fc31" "\|fc30" "\|fc29" "\|fc28" ) +branches=( "master" "f30" "f29" ) +releases=( "fc31" "fc30" "fc29" ) +regexps=( "fc31" "\|fc30" "\|fc29" ) bodhi_enabled=( "0" "1" "1" "1" ) branches_count=4 #releases_regexp=fc28\\\|fc27\\\|fc28 diff --git a/vim.spec b/vim.spec index 57b1cdd4..bd027f33 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: vim.sh @@ -794,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon May 20 2019 Zdenek Dohnal - 2:8.1.1359-2 +- stop updating f28 + * Mon May 20 2019 Zdenek Dohnal - 2:8.1.1359-1 - patchlevel 1359 From 19be79e8b4357e9181da45e5e97cc3d333785863 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 28 May 2019 12:57:52 +0200 Subject: [PATCH 100/584] - patchlevel 1413 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ab6fce7d..af21e62c 100644 --- a/.gitignore +++ b/.gitignore @@ -253,3 +253,4 @@ /vim-8.1-1099.tar.bz2 /vim-8.1-1137.tar.bz2 /vim-8.1-1359.tar.bz2 +/vim-8.1-1413.tar.bz2 diff --git a/sources b/sources index 27cc8fd2..4f697497 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1359.tar.bz2) = c8adf831e57851a9d897d9a0aa81eb4c9134f4b1b95cf688567ad9e6e51e95c1d88c0e64e3aa77e4c18dc34787762b5a80c74fda5ffd2690fcc29fc553e94e16 +SHA512 (vim-8.1-1413.tar.bz2) = 91368a854d0ad310dabd67879561a6c90b00e54d342d44bf841891382e5bb2786ed646f499368f9953a099f32fe7ce4fd3001bd463eb18d482815b5d841e28b6 diff --git a/vim.spec b/vim.spec index bd027f33..6683d8ba 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1359 +%define patchlevel 1413 %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: vim.sh @@ -794,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue May 28 2019 Zdenek Dohnal - 2:8.1.1413-1 +- patchlevel 1413 + * Mon May 20 2019 Zdenek Dohnal - 2:8.1.1359-2 - stop updating f28 From 88614577e608c898784fd8168517a1911e227604 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 6 Jun 2019 08:24:42 +0200 Subject: [PATCH 101/584] Desktop file is now shipped in correct /usr/share/applications --- .gitignore | 1 + sources | 2 +- vim-desktop-duplicate-entries.patch | 20 ++++++++++++++++++++ vim.spec | 16 +++++++++------- 4 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 vim-desktop-duplicate-entries.patch diff --git a/.gitignore b/.gitignore index af21e62c..98e3338b 100644 --- a/.gitignore +++ b/.gitignore @@ -254,3 +254,4 @@ /vim-8.1-1137.tar.bz2 /vim-8.1-1359.tar.bz2 /vim-8.1-1413.tar.bz2 +/vim-8.1-1471.tar.bz2 diff --git a/sources b/sources index 4f697497..984badea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1413.tar.bz2) = 91368a854d0ad310dabd67879561a6c90b00e54d342d44bf841891382e5bb2786ed646f499368f9953a099f32fe7ce4fd3001bd463eb18d482815b5d841e28b6 +SHA512 (vim-8.1-1471.tar.bz2) = aa2bf83dce8124d4e7970f076b9c9a4baa68124369fe1234f21f2c1626b47ddc190265360dc6200c117f858575c48df2b3bf6009e199d054242e38e0bb414291 diff --git a/vim-desktop-duplicate-entries.patch b/vim-desktop-duplicate-entries.patch new file mode 100644 index 00000000..b1cd9a41 --- /dev/null +++ b/vim-desktop-duplicate-entries.patch @@ -0,0 +1,20 @@ +diff --git a/src/po/gvim.desktop.in b/src/po/gvim.desktop.in +index 7d5234851..b547598e8 100644 +--- a/src/po/gvim.desktop.in ++++ b/src/po/gvim.desktop.in +@@ -10,7 +10,6 @@ Comment=Edit text files + # The translations should come from the po file. Leave them here for now, they will + # be overwritten by the po file when generating the desktop.file! + GenericName[da]=Teksteditor +-GenericName[eo]=Tekstoredaktilo + GenericName[fr]=Éditeur de texte + GenericName[pl]=Edytor tekstu + GenericName[is]=Ritvinnsluforrit +@@ -29,7 +28,6 @@ Comment[da]=Rediger tekstfiler + Comment[el]=Επεξεργασία αρχείων κειμένου + Comment[en_CA]=Edit text files + Comment[en_GB]=Edit text files +-Comment[eo]=Redakti tekstajn dosierojn + Comment[es]=Edita archivos de texto + Comment[et]=Redigeeri tekstifaile + Comment[eu]=Editatu testu-fitxategiak diff --git a/vim.spec b/vim.spec index 6683d8ba..84cc030b 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1413 +%define patchlevel 1471 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -61,6 +61,8 @@ 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 +# duplicate desktop entries +Patch3018: vim-desktop-duplicate-entries.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -253,6 +255,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 %patch3017 -p1 +%patch3018 -p1 %build %if 0%{?rhel} > 7 @@ -473,17 +476,13 @@ EOF ln -sf gvim ./%{_bindir}/gvimdiff ln -sf gvim ./%{_bindir}/vimx %if "%{desktop_file}" == "1" - mkdir -p %{buildroot}/%{_datadir}/applications desktop-file-install \ - %if 0%{?fedora} && 0%{?fedora} < 19 - --vendor fedora \ - %endif --dir %{buildroot}/%{_datadir}/applications \ - %{_builddir}/%{vimdir}/runtime/gvim.desktop + %{buildroot}/%{_datadir}/applications/gvim.desktop # --add-category "Development;TextEditor;X-Red-Hat-Base" D\ %else mkdir -p ./%{_sysconfdir}/X11/applnk/Applications - cp %{_builddir}/%{vimdir}/runtime/gvim.desktop ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop + cp %{buildroot}/%{_datadir}/applications/gvim.desktop ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop %endif # ja_JP.ujis is obsolete, ja_JP.eucJP is recommended. ( cd ./%{_datadir}/%{name}/%{vimdir}/lang; \ @@ -794,6 +793,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jun 06 2019 Zdenek Dohnal - 2:8.1.1471-1 +- patchlevel 1471 + * Tue May 28 2019 Zdenek Dohnal - 2:8.1.1413-1 - patchlevel 1413 From adc9d5c6252260acd4cd1074f36b058a9199e692 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 11 Jun 2019 10:01:31 +0200 Subject: [PATCH 102/584] remove desktop patch, already in upstream --- vim-desktop-duplicate-entries.patch | 20 -------------------- vim.spec | 8 ++++---- 2 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 vim-desktop-duplicate-entries.patch diff --git a/vim-desktop-duplicate-entries.patch b/vim-desktop-duplicate-entries.patch deleted file mode 100644 index b1cd9a41..00000000 --- a/vim-desktop-duplicate-entries.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/po/gvim.desktop.in b/src/po/gvim.desktop.in -index 7d5234851..b547598e8 100644 ---- a/src/po/gvim.desktop.in -+++ b/src/po/gvim.desktop.in -@@ -10,7 +10,6 @@ Comment=Edit text files - # The translations should come from the po file. Leave them here for now, they will - # be overwritten by the po file when generating the desktop.file! - GenericName[da]=Teksteditor --GenericName[eo]=Tekstoredaktilo - GenericName[fr]=Éditeur de texte - GenericName[pl]=Edytor tekstu - GenericName[is]=Ritvinnsluforrit -@@ -29,7 +28,6 @@ Comment[da]=Rediger tekstfiler - Comment[el]=Επεξεργασία αρχείων κειμένου - Comment[en_CA]=Edit text files - Comment[en_GB]=Edit text files --Comment[eo]=Redakti tekstajn dosierojn - Comment[es]=Edita archivos de texto - Comment[et]=Redigeeri tekstifaile - Comment[eu]=Editatu testu-fitxategiak diff --git a/vim.spec b/vim.spec index 84cc030b..a2436096 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: vim.sh @@ -61,8 +61,6 @@ 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 -# duplicate desktop entries -Patch3018: vim-desktop-duplicate-entries.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -255,7 +253,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 %patch3017 -p1 -%patch3018 -p1 %build %if 0%{?rhel} > 7 @@ -793,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jun 11 2019 Zdenek Dohnal - 2:8.1.1471-2 +- remove desktop patch, already in upstream + * Thu Jun 06 2019 Zdenek Dohnal - 2:8.1.1471-1 - patchlevel 1471 From 36b38b4c0a378fca92a70170df7ded8f42f2d511 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 11 Jun 2019 10:02:32 +0200 Subject: [PATCH 103/584] - patchlevel 1517 --- .gitignore | 1 + sources | 2 +- vim-7.4-fstabsyntax.patch | 10 +++++----- vim.spec | 9 ++++++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 98e3338b..3140e8a2 100644 --- a/.gitignore +++ b/.gitignore @@ -255,3 +255,4 @@ /vim-8.1-1359.tar.bz2 /vim-8.1-1413.tar.bz2 /vim-8.1-1471.tar.bz2 +/vim-8.1-1517.tar.bz2 diff --git a/sources b/sources index 984badea..1eb04cac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1471.tar.bz2) = aa2bf83dce8124d4e7970f076b9c9a4baa68124369fe1234f21f2c1626b47ddc190265360dc6200c117f858575c48df2b3bf6009e199d054242e38e0bb414291 +SHA512 (vim-8.1-1517.tar.bz2) = 2c232cdbd8e7fee8bda75742c5e946c7a57e9f604084bb41db0b35a5c4af771f1b6e2b9a3d430833d385dbdcf055d2e7dae02ef470805e80e013ccf3d44de325 diff --git a/vim-7.4-fstabsyntax.patch b/vim-7.4-fstabsyntax.patch index f82a66c0..87ddef43 100644 --- a/vim-7.4-fstabsyntax.patch +++ b/vim-7.4-fstabsyntax.patch @@ -1,6 +1,6 @@ -diff -up vim80/runtime/syntax/fstab.vim.fstabsyntax vim80/runtime/syntax/fstab.vim ---- vim80/runtime/syntax/fstab.vim.fstabsyntax 2017-11-19 20:32:49.000000000 +0100 -+++ vim80/runtime/syntax/fstab.vim 2017-11-20 16:01:31.494316342 +0100 +diff -up vim81/runtime/syntax/fstab.vim.fstabsyntax vim81/runtime/syntax/fstab.vim +--- vim81/runtime/syntax/fstab.vim.fstabsyntax 2019-06-11 09:55:23.000000000 +0200 ++++ vim81/runtime/syntax/fstab.vim 2019-06-11 10:14:22.223616868 +0200 @@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe " Type syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown @@ -14,8 +14,8 @@ diff -up vim80/runtime/syntax/fstab.vim.fstabsyntax vim80/runtime/syntax/fstab.v syn keyword fsOptionsYesNo yes no syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck syn keyword fsOptionsSize 512 1024 2048 --syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx -+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx +-syn 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 ++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 match fsOptionsGeneral /_netdev/ " Options: adfs diff --git a/vim.spec b/vim.spec index a2436096..0f684bcc 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1471 +%define patchlevel 1517 %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: vim.sh @@ -244,7 +244,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3002 -p1 %patch3004 -p1 %patch3006 -p1 -%patch3007 -p1 +%patch3007 -p1 -b .fstabsyntax %patch3008 -p1 -b .syncolor #patch3009 -p1 %patch3010 -p1 @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jun 11 2019 Zdenek Dohnal - 2:8.1.1517-1 +- patchlevel 1517 + * Tue Jun 11 2019 Zdenek Dohnal - 2:8.1.1471-2 - remove desktop patch, already in upstream From 642dca992378e9178a88b2df574ae726ca8a1c3b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 17 Jun 2019 09:51:15 +0200 Subject: [PATCH 104/584] - patchlevel 1561 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3140e8a2..342b6184 100644 --- a/.gitignore +++ b/.gitignore @@ -256,3 +256,4 @@ /vim-8.1-1413.tar.bz2 /vim-8.1-1471.tar.bz2 /vim-8.1-1517.tar.bz2 +/vim-8.1-1561.tar.bz2 diff --git a/sources b/sources index 1eb04cac..90109796 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1517.tar.bz2) = 2c232cdbd8e7fee8bda75742c5e946c7a57e9f604084bb41db0b35a5c4af771f1b6e2b9a3d430833d385dbdcf055d2e7dae02ef470805e80e013ccf3d44de325 +SHA512 (vim-8.1-1561.tar.bz2) = 3c9de870d3146597947de818e9464278030d516e676f8ec939c7580949a8c5c8d01e315635eb4597864648b15f9e3ce2d67c9bfb5c8d177169ff8e90a0d0222b diff --git a/vim.spec b/vim.spec index 0f684bcc..a0bd71ce 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1517 +%define patchlevel 1561 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jun 17 2019 Zdenek Dohnal - 2:8.1.1561-1 +- patchlevel 1561 + * Tue Jun 11 2019 Zdenek Dohnal - 2:8.1.1517-1 - patchlevel 1517 From ab9604deea64452b6ea0982b30fda4bb6746b2a1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 28 Jun 2019 10:54:52 +0200 Subject: [PATCH 105/584] - patchlevel 1602 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 342b6184..34f6c3ef 100644 --- a/.gitignore +++ b/.gitignore @@ -257,3 +257,4 @@ /vim-8.1-1471.tar.bz2 /vim-8.1-1517.tar.bz2 /vim-8.1-1561.tar.bz2 +/vim-8.1-1602.tar.bz2 diff --git a/sources b/sources index 90109796..b561049e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1561.tar.bz2) = 3c9de870d3146597947de818e9464278030d516e676f8ec939c7580949a8c5c8d01e315635eb4597864648b15f9e3ce2d67c9bfb5c8d177169ff8e90a0d0222b +SHA512 (vim-8.1-1602.tar.bz2) = 0d6395809703745ca653d0185d473180ef50fa5bcc98f648e938819d26e2a8f7cf52535b148a075dc4735ccfc63f0c318086c25429b96c1159474c5834c1a338 diff --git a/vim.spec b/vim.spec index a0bd71ce..9876d381 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1561 +%define patchlevel 1602 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jun 28 2019 Zdenek Dohnal - 2:8.1.1602-1 +- patchlevel 1602 + * Mon Jun 17 2019 Zdenek Dohnal - 2:8.1.1561-1 - patchlevel 1561 From 2fff607d4ca18fa7e2f96f293554e8c05fb1caca Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 11 Jul 2019 11:56:42 +0200 Subject: [PATCH 106/584] - patchlevel 1661 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 34f6c3ef..befe2730 100644 --- a/.gitignore +++ b/.gitignore @@ -258,3 +258,4 @@ /vim-8.1-1517.tar.bz2 /vim-8.1-1561.tar.bz2 /vim-8.1-1602.tar.bz2 +/vim-8.1-1661.tar.bz2 diff --git a/sources b/sources index b561049e..da4eafad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1602.tar.bz2) = 0d6395809703745ca653d0185d473180ef50fa5bcc98f648e938819d26e2a8f7cf52535b148a075dc4735ccfc63f0c318086c25429b96c1159474c5834c1a338 +SHA512 (vim-8.1-1661.tar.bz2) = 85df7d8057a569e35768ea8800ba747c5b8e1e746882d074abaaa180df0874cf37b941a0e26847b4a49ce1deca2edd1e6a02476dbc78268d6cd2e3cea3115eba diff --git a/vim.spec b/vim.spec index 9876d381..e403e044 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1602 +%define patchlevel 1661 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jul 11 2019 Zdenek Dohnal - 2:8.1.1661-1 +- patchlevel 1661 + * Fri Jun 28 2019 Zdenek Dohnal - 2:8.1.1602-1 - patchlevel 1602 From 79f7d1b9cbd794cdca218b01851cc19bc61faa26 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 18 Jul 2019 13:53:32 +0200 Subject: [PATCH 107/584] 1643311 - add several defaults from Vim upstream and remove forcing fileencodings --- vim.spec | 5 +++- vimrc | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 5 deletions(-) diff --git a/vim.spec b/vim.spec index e403e044..ca4aa972 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: vim.sh @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jul 18 2019 Zdenek Dohnal - 2:8.1.1661-2 +- 1643311 - add several defaults from Vim upstream and remove forcing fileencodings + * Thu Jul 11 2019 Zdenek Dohnal - 2:8.1.1661-1 - patchlevel 1661 diff --git a/vimrc b/vimrc index cf660612..906273b3 100644 --- a/vimrc +++ b/vimrc @@ -1,15 +1,57 @@ -if v:lang =~ "utf8$" || v:lang =~ "UTF-8$" - set fileencodings=ucs-bom,utf-8,latin1 +" When started as "evim", evim.vim will already have done these settings. +if v:progname =~? "evim" + finish endif -set nocompatible " Use Vim defaults (much better!) -set bs=indent,eol,start " allow backspacing over everything in insert mode +" Bail out if something that ran earlier, e.g. a system wide vimrc, does not +" want Vim to use these default values. +if exists('skip_defaults_vim') + finish +endif + +" Use Vim settings, rather than Vi settings (much better!). +" This must be first, because it changes other options as a side effect. +" Avoid side effects when it was already reset. +if &compatible + set nocompatible +endif + +" When the +eval feature is missing, the set command above will be skipped. +" Use a trick to reset compatible only when the +eval feature is missing. +silent! while 0 + set nocompatible +silent! endwhile + +" Allow backspacing over everything in insert mode. +set backspace=indent,eol,start + "set ai " always set autoindenting on "set backup " keep a backup file set viminfo='20,\"50 " read/write a .viminfo file, don't store more " than 50 lines of registers set history=50 " keep 50 lines of command line history set ruler " show the cursor position all the time +set showcmd " display incomplete commands +set wildmenu " display completion matches in a status line + +set ttimeout " time out for key codes +set ttimeoutlen=100 " wait up to 100ms after Esc for special key + +" Show @@@ in the last line if it is truncated. +set display=truncate + +" Show a few lines of context around the cursor. Note that this makes the +" text scroll if you mouse-click near the start or end of the window. +set scrolloff=5 + +" Do incremental searching when it's possible to timeout. +if has('reltime') + set incsearch +endif + +" Do not recognize octal numbers for Ctrl-A and Ctrl-X, most users find it +" confusing. +set nrformats-=octal " Only do this part when compiled with support for autocommands if has("autocmd") @@ -47,7 +89,12 @@ endif " Switch syntax highlighting on, when the terminal has colors " Also switch on highlighting the last used search pattern. if &t_Co > 2 || has("gui_running") + " Revert with ":syntax off". syntax on + + " I like highlighting strings inside C comments. + " Revert with ":unlet c_comment_strings". + let c_comment_strings=1 set hlsearch endif @@ -59,6 +106,22 @@ if &term=="xterm" set t_Sf=[3%dm endif +" Convenient command to see the difference between the current buffer and the +" file it was loaded from, thus the changes you made. +" Only define it when not defined already. +" Revert with: ":delcommand DiffOrig". +if !exists(":DiffOrig") + command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis + \ | wincmd p | diffthis +endif + +if has('langmap') && exists('+langremap') + " Prevent that the langmap option applies to characters that result from a + " mapping. If set (default), this may break plugins (but it's backward + " compatible). + set nolangremap +endif + " Don't wake up system with blinking cursor: " http://www.linuxpowertop.org/known.php let &guicursor = &guicursor . ",a:blinkon0" From eef43bd32349cc761004e541aad1b3b4cf02aea0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 18 Jul 2019 13:56:14 +0200 Subject: [PATCH 108/584] - patchlevel 1713 --- .gitignore | 1 + sources | 2 +- vim-7.4-syncolor.patch | 15 ++++++++------- vim.spec | 7 +++++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index befe2730..77ae3cf9 100644 --- a/.gitignore +++ b/.gitignore @@ -259,3 +259,4 @@ /vim-8.1-1561.tar.bz2 /vim-8.1-1602.tar.bz2 /vim-8.1-1661.tar.bz2 +/vim-8.1-1713.tar.bz2 diff --git a/sources b/sources index da4eafad..9cc7cfca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1661.tar.bz2) = 85df7d8057a569e35768ea8800ba747c5b8e1e746882d074abaaa180df0874cf37b941a0e26847b4a49ce1deca2edd1e6a02476dbc78268d6cd2e3cea3115eba +SHA512 (vim-8.1-1713.tar.bz2) = e6b22ba25164096d399e97d237515df758fe2455618544898504550fa81579ec05cf2803756a7ff2b8bc41eac75659b6336687810b50407c20856f5777fd333a diff --git a/vim-7.4-syncolor.patch b/vim-7.4-syncolor.patch index 440da186..b41f2fe3 100644 --- a/vim-7.4-syncolor.patch +++ b/vim-7.4-syncolor.patch @@ -1,25 +1,26 @@ -diff -up vim80/src/syntax.c.syncolor vim80/src/syntax.c ---- vim80/src/syntax.c.syncolor 2017-08-15 12:14:21.716020676 +0200 -+++ vim80/src/syntax.c 2017-08-15 12:30:31.380158974 +0200 -@@ -6972,8 +6972,8 @@ static char *(highlight_init_light[]) = +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"), ++ "DiffAdd term=bold ctermbg=LightRed guibg=LightBlue"), CENT("DiffChange term=bold ctermbg=LightMagenta", "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"), CENT("DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan", -@@ -7066,8 +7066,8 @@ static char *(highlight_init_dark[]) = { +@@ -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"), ++ "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 ca4aa972..8c87d6ad 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1661 +%define patchlevel 1713 %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: vim.sh @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jul 18 2019 Zdenek Dohnal - 2:8.1.1713-1 +- patchlevel 1713 + * Thu Jul 18 2019 Zdenek Dohnal - 2:8.1.1661-2 - 1643311 - add several defaults from Vim upstream and remove forcing fileencodings From a54758b9015fafdaa5a84a4cd948a26b97456f6e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 19 Jul 2019 07:30:08 +0200 Subject: [PATCH 109/584] remove skip_defaults_vim - it does not make sense to have it in system vimrc --- vim.spec | 5 ++++- vimrc | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/vim.spec b/vim.spec index 8c87d6ad..8048aad1 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: vim.sh @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jul 19 2019 Zdenek Dohnal - 2:8.1.1713-2 +- remove skip_defaults_vim - it does not make sense to have it in system vimrc + * Thu Jul 18 2019 Zdenek Dohnal - 2:8.1.1713-1 - patchlevel 1713 diff --git a/vimrc b/vimrc index 906273b3..a2e65d64 100644 --- a/vimrc +++ b/vimrc @@ -3,12 +3,6 @@ if v:progname =~? "evim" finish endif -" Bail out if something that ran earlier, e.g. a system wide vimrc, does not -" want Vim to use these default values. -if exists('skip_defaults_vim') - finish -endif - " Use Vim settings, rather than Vi settings (much better!). " This must be first, because it changes other options as a side effect. " Avoid side effects when it was already reset. From ff5f0cc59d41b327093f673720938be46cb2bd61 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 19 Jul 2019 07:45:17 +0200 Subject: [PATCH 110/584] 1724126 - disable showing spec template for new file with .spec suffix minor changes in spec.template - tabs->spaces --- spec-template.new | 18 +++++++++--------- vim.spec | 6 +++++- vimrc | 5 ++++- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/spec-template.new b/spec-template.new index b248ecdb..2a558fb7 100644 --- a/spec-template.new +++ b/spec-template.new @@ -4,17 +4,17 @@ # https://docs.fedoraproject.org/en-US/packaging-guidelines/ -Name: -Version: -Release: 0%{?dist} -Summary: +Name: +Version: +Release: 0%{?dist} +Summary: -License: -URL: -Source0: +License: +URL: +Source0: -BuildRequires: -Requires: +BuildRequires: +Requires: %description diff --git a/vim.spec b/vim.spec index 8048aad1..1ff46935 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: 2%{?dist} +Release: 3%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -790,6 +790,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jul 19 2019 Zdenek Dohnal - 2:8.1.1713-3 +- 1724126 - disable showing spec template for new file with .spec suffix +- minor changes in spec.template - tabs->spaces + * Fri Jul 19 2019 Zdenek Dohnal - 2:8.1.1713-2 - remove skip_defaults_vim - it does not make sense to have it in system vimrc diff --git a/vimrc b/vimrc index a2e65d64..be4d3cfc 100644 --- a/vimrc +++ b/vimrc @@ -61,7 +61,10 @@ if has("autocmd") " 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 - autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec + " 1724126 - do not open new file with .spec suffix with spec file template + " apparently there are other file types with .spec suffix, so disable the + " template + " autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec augroup END endif From 1da3b135a8700372d643c26d63e066b4b3d929d4 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 19 Jul 2019 10:28:42 +0200 Subject: [PATCH 111/584] remove unused patch --- vim-7.0-specedit.patch | 64 ------------------------------------------ vim.spec | 7 +++-- 2 files changed, 4 insertions(+), 67 deletions(-) delete mode 100644 vim-7.0-specedit.patch diff --git a/vim-7.0-specedit.patch b/vim-7.0-specedit.patch deleted file mode 100644 index 74e327d4..00000000 --- a/vim-7.0-specedit.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- vim70/runtime/ftplugin/spec.vim.rh1 2006-05-10 19:37:45.000000000 +0200 -+++ vim70/runtime/ftplugin/spec.vim 2006-11-13 12:21:32.000000000 +0100 -@@ -18,11 +18,18 @@ - - if !exists("*s:SpecChangelog") - function s:SpecChangelog(format) -+ let save_time = v:lc_time - if strlen(a:format) == 0 - if !exists("g:spec_chglog_format") -- let email = input("Email address: ") -- let g:spec_chglog_format = "%a %b %d %Y " . l:email -- echo "\r" -+ if !exists("g:packager") -+ let email = input("Email address: ") -+ let g:spec_chglog_format = "%a %b %d %Y " . l:email -+ echo "\r" -+ else -+ let email = g:packager -+ let g:spec_chglog_format = "%a %b %d %Y " . l:email -+ echo "\r" -+ endif - endif - let format = g:spec_chglog_format - else -@@ -58,7 +65,7 @@ - let line = line+1 - endwhile - if (nameline != -1 && verline != -1 && relline != -1) -- let include_release_info = exists("g:spec_chglog_release_info") -+ let include_release_info = 1 - let name = s:ParseRpmVars(name, nameline) - let ver = s:ParseRpmVars(ver, verline) - let rel = s:ParseRpmVars(rel, relline) -@@ -79,8 +86,10 @@ - endif - endif - if (chgline != -1) -+ execute "language time C" - let parsed_format = "* ".strftime(format) -- let release_info = "+ ".name."-".ver."-".rel -+ execute "language time " . save_time -+ let release_info = ver."-".rel - let wrong_format = 0 - let wrong_release = 0 - let insert_line = 0 -@@ -97,15 +106,14 @@ - execute relline - normal  - let rel = substitute(strpart(getline(relline),8), '^[ ]*\([^ ]\+\)[ ]*$','\1','') -- let release_info = "+ ".name."-".ver."-".rel -+ let release_info = ver."-".rel - endif - endif - let n = 0 -- call append(chgline+n, parsed_format) - if include_release_info -- let n = n + 1 -- call append(chgline+n, release_info) -+ let parsed_format = parsed_format." ".release_info - endif -+ call append(chgline+n, parsed_format) - let n = n + 1 - call append(chgline+n,"- ") - let n = n + 1 diff --git a/vim.spec b/vim.spec index 1ff46935..e56956a6 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: 3%{?dist} +Release: 4%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -53,7 +53,6 @@ Patch3004: vim-7.0-rclocation.patch Patch3006: vim-7.4-checkhl.patch Patch3007: vim-7.4-fstabsyntax.patch Patch3008: vim-7.4-syncolor.patch -Patch3009: vim-7.0-specedit.patch Patch3010: vim-7.3-manpage-typo-668894-675480.patch Patch3011: vim-manpagefixes-948566.patch Patch3013: vim-7.4-globalsyntax.patch @@ -246,7 +245,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3006 -p1 %patch3007 -p1 -b .fstabsyntax %patch3008 -p1 -b .syncolor -#patch3009 -p1 %patch3010 -p1 %patch3011 -p1 %patch3013 -p1 @@ -790,6 +788,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jul 19 2019 Zdenek Dohnal - 2:8.1.1713-4 +- remove unused patch + * Fri Jul 19 2019 Zdenek Dohnal - 2:8.1.1713-3 - 1724126 - disable showing spec template for new file with .spec suffix - minor changes in spec.template - tabs->spaces From 1b41ac03f43aac2d1c3b1468b789c1afbceb08a6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 22 Jul 2019 08:38:47 +0200 Subject: [PATCH 112/584] remove perl-libs, because they are supplied perl MODULE_COMPAT --- vim.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vim.spec b/vim.spec index e56956a6..38c076c1 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: 4%{?dist} +Release: 5%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -149,7 +149,7 @@ Provides: %{_bindir}/vim # embedded functionality in Vim/GVim Suggests: python2 python2-libs Suggests: python3 python3-libs -Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-libs perl-devel +Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-devel %if "%{withruby}" == "1" Suggests: ruby-libs ruby %endif @@ -198,7 +198,7 @@ Requires: hicolor-icon-theme # embedded functionality in Vim/GVim Suggests: python2 python2-libs Suggests: python3 python3-libs -Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-libs perl-devel +Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-devel %if "%{withruby}" == "1" Suggests: ruby-libs ruby %endif @@ -788,6 +788,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jul 22 2019 Zdenek Dohnal - 2:8.1.1713-5 +- remove perl-libs, because they are supplied perl MODULE_COMPAT + * Fri Jul 19 2019 Zdenek Dohnal - 2:8.1.1713-4 - remove unused patch From f49ca4fc6e285fcc6c64df8a0033cf8172a4f0b6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 23 Jul 2019 07:47:25 +0200 Subject: [PATCH 113/584] Provides must be unversioned according FPG --- vim.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vim.spec b/vim.spec index 38c076c1..ee7b5422 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: 5%{?dist} +Release: 6%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -125,7 +125,7 @@ many different languages. %package minimal Summary: A minimal version of the VIM editor -Provides: vi = %{version}-%{release} +Provides: vi Provides: %{_bindir}/vi # conflicts in package because of manpage move (bug #1599663) Conflicts: %{name}-common < %{epoch}:8.1.1-1 @@ -142,7 +142,7 @@ only available when the vim-common package is installed. %package enhanced Summary: A version of the VIM editor which includes recent enhancements Requires: vim-common = %{epoch}:%{version}-%{release} which -Provides: vim = %{version}-%{release} +Provides: vim Provides: %{_bindir}/mergetool Provides: %{_bindir}/vim # suggest python3, python2, lua, ruby and perl packages because of their @@ -189,7 +189,7 @@ BuildRequires: libXpm-devel BuildRequires: libICE-devel Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk3 -Provides: gvim = %{version}-%{release} +Provides: gvim Provides: %{_bindir}/mergetool Provides: %{_bindir}/gvim BuildRequires: gtk3-devel libSM-devel libXt-devel libXpm-devel libappstream-glib @@ -788,6 +788,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jul 23 2019 Zdenek Dohnal - 2:8.1.1713-6 +- Provides must be unversioned according FPG + * Mon Jul 22 2019 Zdenek Dohnal - 2:8.1.1713-5 - remove perl-libs, because they are supplied perl MODULE_COMPAT From 1961611d65c3395d5557601f1859c6f0924643f8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 26 Jul 2019 07:59:29 +0200 Subject: [PATCH 114/584] - patchlevel 1749 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 77ae3cf9..d248479a 100644 --- a/.gitignore +++ b/.gitignore @@ -260,3 +260,4 @@ /vim-8.1-1602.tar.bz2 /vim-8.1-1661.tar.bz2 /vim-8.1-1713.tar.bz2 +/vim-8.1-1749.tar.bz2 diff --git a/sources b/sources index 9cc7cfca..2bb6dbb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1713.tar.bz2) = e6b22ba25164096d399e97d237515df758fe2455618544898504550fa81579ec05cf2803756a7ff2b8bc41eac75659b6336687810b50407c20856f5777fd333a +SHA512 (vim-8.1-1749.tar.bz2) = 6080b29539b8f4e20486e6019eb2592eafee3e1ad74cc27c50b733c0212ccdfe1dc42486a021b729e94230504335d060f336026708428180ac18126cd1bd1984 diff --git a/vim.spec b/vim.spec index ee7b5422..88a2dd58 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1713 +%define patchlevel 1749 %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: 6%{?dist} +Release: 1%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -788,6 +788,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jul 26 2019 Zdenek Dohnal - 2:8.1.1749-1 +- patchlevel 1749 + * Tue Jul 23 2019 Zdenek Dohnal - 2:8.1.1713-6 - Provides must be unversioned according FPG From d53393cc955716448b35c388d5bd01b92e431e80 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 2 Aug 2019 14:18:53 +0200 Subject: [PATCH 115/584] - patchlevel 1790 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d248479a..4fcb17df 100644 --- a/.gitignore +++ b/.gitignore @@ -261,3 +261,4 @@ /vim-8.1-1661.tar.bz2 /vim-8.1-1713.tar.bz2 /vim-8.1-1749.tar.bz2 +/vim-8.1-1790.tar.bz2 diff --git a/sources b/sources index 2bb6dbb6..bf4ef5aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1749.tar.bz2) = 6080b29539b8f4e20486e6019eb2592eafee3e1ad74cc27c50b733c0212ccdfe1dc42486a021b729e94230504335d060f336026708428180ac18126cd1bd1984 +SHA512 (vim-8.1-1790.tar.bz2) = 662c20286e31c171bc56bb8cc9d2bbdb932fb39fb0bab3559936f9f62bb51fb4d2e8ed9209c1489778368bb66ec210ba34dd341a7ca3a0a8aa029b95e7475b04 diff --git a/vim.spec b/vim.spec index 88a2dd58..acb9498d 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1749 +%define patchlevel 1790 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -788,6 +788,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Aug 02 2019 Zdenek Dohnal - 2:8.1.1790-1 +- patchlevel 1790 + * Fri Jul 26 2019 Zdenek Dohnal - 2:8.1.1749-1 - patchlevel 1749 From ae324f20e3b673a5c648e2434b5e960f7deda3a4 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 20 Aug 2019 08:14:10 +0200 Subject: [PATCH 116/584] 1740892 - vimx is symlink to gvim instead of vim --- vim.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vim.spec b/vim.spec index acb9498d..8b8dee3f 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: vim.sh @@ -458,6 +458,7 @@ EOF ln -sf vi ./%{_bindir}/rview ln -sf vi ./%{_bindir}/view ln -sf vi ./%{_bindir}/ex + ln -sf vim ./%{_bindir}/vimx ln -sf vim ./%{_bindir}/rvim ln -sf vim ./%{_bindir}/vimdiff perl -pi -e "s,%{buildroot},," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1 @@ -469,7 +470,6 @@ EOF ln -sf gvim ./%{_bindir}/gex ln -sf gvim ./%{_bindir}/evim ln -sf gvim ./%{_bindir}/gvimdiff - ln -sf gvim ./%{_bindir}/vimx %if "%{desktop_file}" == "1" desktop-file-install \ --dir %{buildroot}/%{_datadir}/applications \ @@ -741,6 +741,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %files enhanced %{_bindir}/vim +%{_bindir}/vimx %{_bindir}/rvim %{_bindir}/vimdiff %{_bindir}/vimtutor @@ -781,13 +782,15 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_bindir}/gview %{_bindir}/gex %{_bindir}/vimtutor -%{_bindir}/vimx %{_bindir}/evim %{_mandir}/man1/evim.* %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Aug 20 2019 Zdenek Dohnal - 2:8.1.1790-2 +- 1740892 - vimx is symlink to gvim instead of vim + * Fri Aug 02 2019 Zdenek Dohnal - 2:8.1.1790-1 - patchlevel 1790 From 4066bdd696c597a670e240d3af79171a449431fb Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 20 Aug 2019 08:35:13 +0200 Subject: [PATCH 117/584] - patchlevel 1890 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4fcb17df..2b46dc6f 100644 --- a/.gitignore +++ b/.gitignore @@ -262,3 +262,4 @@ /vim-8.1-1713.tar.bz2 /vim-8.1-1749.tar.bz2 /vim-8.1-1790.tar.bz2 +/vim-8.1-1890.tar.bz2 diff --git a/sources b/sources index bf4ef5aa..01644a23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1790.tar.bz2) = 662c20286e31c171bc56bb8cc9d2bbdb932fb39fb0bab3559936f9f62bb51fb4d2e8ed9209c1489778368bb66ec210ba34dd341a7ca3a0a8aa029b95e7475b04 +SHA512 (vim-8.1-1890.tar.bz2) = 6f34a15badced307839c88de210bee771c3dac7207f9ca64dcdde74268bda3caa4217cba5f49ec70774314b583f0a5e3116dad64474a30bbd5372038dab86002 diff --git a/vim.spec b/vim.spec index 8b8dee3f..d974d2b3 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1790 +%define patchlevel 1890 %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: vim.sh @@ -788,6 +788,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Aug 20 2019 Zdenek Dohnal - 2:8.1.1890-1 +- patchlevel 1890 + * Tue Aug 20 2019 Zdenek Dohnal - 2:8.1.1790-2 - 1740892 - vimx is symlink to gvim instead of vim From c666fe39c228247908c008fd3ae0f03fedd00b28 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 21 Aug 2019 10:06:08 +0200 Subject: [PATCH 118/584] remove vimx completely, because it is downstream symlink, which does not work correctly anymore --- vim-manpagefixes-948566.patch | 431 +++++++++++++++------------------- vim.spec | 11 +- 2 files changed, 196 insertions(+), 246 deletions(-) diff --git a/vim-manpagefixes-948566.patch b/vim-manpagefixes-948566.patch index 6f495600..bc4d152d 100644 --- a/vim-manpagefixes-948566.patch +++ b/vim-manpagefixes-948566.patch @@ -1,38 +1,80 @@ -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 --git a/runtime/doc/vim-fr.1 b/runtime/doc/vim-fr.1 +index 209ab91..356cb59 100644 +--- a/runtime/doc/vim-fr.1 ++++ b/runtime/doc/vim-fr.1 +@@ -24,6 +24,7 @@ vim \- Vi IMproved, + .PP + .br + .B ex ++.B gex + .br + .B view + .br +diff --git a/runtime/doc/vim-fr.UTF-8.1 b/runtime/doc/vim-fr.UTF-8.1 +index 67be106..30b926c 100644 +--- a/runtime/doc/vim-fr.UTF-8.1 ++++ b/runtime/doc/vim-fr.UTF-8.1 +@@ -24,6 +24,7 @@ vim \- Vi IMproved, éditeur de texte pour programmeurs + .PP + .br + .B ex ++.B gex + .br + .B view + .br +diff --git a/runtime/doc/vim-it.1 b/runtime/doc/vim-it.1 +index 0ab3eff..d3af003 100755 +--- a/runtime/doc/vim-it.1 ++++ b/runtime/doc/vim-it.1 +@@ -17,6 +17,7 @@ vim \- VI Migliorato, un editor di testi per programmatori + .PP + .br + .B ex ++.B gex + .br + .B view + .br +diff --git a/runtime/doc/vim-it.UTF-8.1 b/runtime/doc/vim-it.UTF-8.1 +index 51e7e04..bfafa36 100644 +--- a/runtime/doc/vim-it.UTF-8.1 ++++ b/runtime/doc/vim-it.UTF-8.1 +@@ -17,6 +17,7 @@ vim \- VI Migliorato, un editor di testi per programmatori + .PP + .br + .B ex ++.B gex + .br + .B view + .br +diff --git a/runtime/doc/vim-pl.1 b/runtime/doc/vim-pl.1 +index d506b33..cf6ffeb 100644 +--- a/runtime/doc/vim-pl.1 ++++ b/runtime/doc/vim-pl.1 +@@ -17,6 +17,7 @@ vim \- Vi rozbudowany, edytor tekstu dla programisty + .PP + .br + .B ex ++.B gex + .br + .B view + .br +diff --git a/runtime/doc/vim-pl.UTF-8.1 b/runtime/doc/vim-pl.UTF-8.1 +index f3551d2..01650e9 100644 +--- a/runtime/doc/vim-pl.UTF-8.1 ++++ b/runtime/doc/vim-pl.UTF-8.1 +@@ -17,6 +17,7 @@ vim \- Vi rozbudowany, edytor tekstu dla programisty + .PP + .br + .B ex ++.B gex + .br + .B view + .br +diff --git a/runtime/doc/vim-ru.1 b/runtime/doc/vim-ru.1 +index dfcb3ec..aa569d5 100644 +--- a/runtime/doc/vim-ru.1 ++++ b/runtime/doc/vim-ru.1 +@@ -17,11 +17,14 @@ vim \- Vi IMproved ( .PP .br .B ex @@ -42,11 +84,43 @@ diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1 .br .B gvim .B gview -+.B vimx - .B evim - .B eview ++.B evim ++.B eview .br -@@ -114,7 +116,12 @@ + .B rvim + .B rview +diff --git a/runtime/doc/vim-ru.UTF-8.1 b/runtime/doc/vim-ru.UTF-8.1 +index ef52721..1217b7d 100644 +--- a/runtime/doc/vim-ru.UTF-8.1 ++++ b/runtime/doc/vim-ru.UTF-8.1 +@@ -17,11 +17,14 @@ vim \- Vi IMproved (Улучшенный Vi), текстовый редакто + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B evim ++.B eview + .br + .B rvim + .B rview +diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1 +index 48a121b..aaab06d 100644 +--- a/runtime/doc/vim.1 ++++ b/runtime/doc/vim.1 +@@ -17,6 +17,7 @@ vim \- Vi IMproved, a programmer's text editor + .PP + .br + .B ex ++.B gex + .br + .B view + .br +@@ -114,7 +115,9 @@ Can also be done with the "\-R" argument. gvim gview The GUI version. Starts a new window. @@ -54,13 +128,10 @@ diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1 +.TP +gex +Starts a new gvim window in Ex mode. Can also be done with the "-e" argument to gvim -+.TP -+vimx -+Starts gvim in "Vi" mode similar to "vim", but with additional features like xterm clipboard support .TP evim eview The GUI version in easy mode. -@@ -458,6 +458,12 @@ +@@ -449,6 +452,12 @@ As \-\-remote, but Vim does not exit until the files have been edited. \-\-remote\-wait\-silent As \-\-remote\-wait, but without the warning when no server is found. .TP @@ -73,178 +144,37 @@ 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 @@ - .PP - .br - .B ex -+.B gex - .br - .B view - .br - .B gvim - .B gview -+.B vimx - .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 @@ - .PP - .br - .B ex -+.B gex - .br - .B view - .br - .B gvim - .B gview -+.B vimx - .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 @@ - .PP - .br - .B ex -+.B gex - .br - .B view - .br - .B gvim - .B gview -+.B vimx - .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 @@ - .PP - .br - .B ex -+.B gex - .br - .B view - .br - .B gvim - .B gview -+.B vimx - .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 --git a/runtime/doc/vim.man b/runtime/doc/vim.man +index 5cd751f..6b2cc75 100644 +--- a/runtime/doc/vim.man ++++ b/runtime/doc/vim.man +@@ -11,7 +11,7 @@ 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 + rvim rview rgvim rgview +@@ -79,8 +79,10 @@ 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. -+ 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 @@ - .PP - .br - .B ex -+.B gex - .br - .B view - .br - .B gvim - .B gview -+.B vimx - .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 @@ - .PP - .br - .B ex -+.B gex - .br - .B view - .br - .B gvim - .B gview -+.B vimx - .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 @@ - .PP - .br - .B ex -+.B gex - .br - .B view - .br - .B gvim - .B gview -+.B vimx -+.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 @@ - .PP - .br - .B ex -+.B gex - .br - .B view - .br - .B gvim - .B gview -+.B vimx -+.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 @@ - .SH SYNOPSIS - .br - .B vimtutor [\-g] [language] -+.br -+.B gvimtutor - .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 --git a/runtime/doc/vimtutor-it.1 b/runtime/doc/vimtutor-it.1 +index b5c1e61..fa9dae7 100755 +--- a/runtime/doc/vimtutor-it.1 ++++ b/runtime/doc/vimtutor-it.1 +@@ -4,6 +4,8 @@ vimtutor \- Un breve corso per imparare Vim .SH SINTASSI .br .B vimtutor [\-g] [lingua] @@ -253,10 +183,11 @@ 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 --git a/runtime/doc/vimtutor-it.UTF-8.1 b/runtime/doc/vimtutor-it.UTF-8.1 +index a33dcb0..8520d14 100644 +--- a/runtime/doc/vimtutor-it.UTF-8.1 ++++ b/runtime/doc/vimtutor-it.UTF-8.1 +@@ -4,6 +4,8 @@ vimtutor \- Un breve corso per imparare Vim .SH SINTASSI .br .B vimtutor [\-g] [lingua] @@ -265,21 +196,11 @@ 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 @@ - - SYNOPSIS - vimtutor [-g] [language] -+ gvimtutor - - 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 --git a/runtime/doc/vimtutor-pl.1 b/runtime/doc/vimtutor-pl.1 +index e603ca5..ce6b0bc 100644 +--- a/runtime/doc/vimtutor-pl.1 ++++ b/runtime/doc/vimtutor-pl.1 +@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima .SH SYNOPSIS .br .B vimtutor -g [jzyk] @@ -288,10 +209,11 @@ 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 --git a/runtime/doc/vimtutor-pl.UTF-8.1 b/runtime/doc/vimtutor-pl.UTF-8.1 +index 199fcd0..3b35fb4 100644 +--- a/runtime/doc/vimtutor-pl.UTF-8.1 ++++ b/runtime/doc/vimtutor-pl.UTF-8.1 +@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima .SH SYNOPSIS .br .B vimtutor -g [język] @@ -300,10 +222,11 @@ 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 -@@ -4,6 +4,8 @@ +diff --git a/runtime/doc/vimtutor-ru.1 b/runtime/doc/vimtutor-ru.1 +index fa3c5d9..a4f3eab 100644 +--- a/runtime/doc/vimtutor-ru.1 ++++ b/runtime/doc/vimtutor-ru.1 +@@ -4,6 +4,8 @@ vimtutor \- .SH .br .B vimtutor [] @@ -312,10 +235,11 @@ diff -urN vim73/runtime/doc/vimtutor-ru.1 vim73_new/runtime/doc/vimtutor-ru.1 .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 --git a/runtime/doc/vimtutor-ru.UTF-8.1 b/runtime/doc/vimtutor-ru.UTF-8.1 +index 6b1ba90..305d737 100644 +--- a/runtime/doc/vimtutor-ru.UTF-8.1 ++++ b/runtime/doc/vimtutor-ru.UTF-8.1 +@@ -7,6 +7,8 @@ vimtutor \- учебник по Vim .SH ОПИСАНИЕ Команда .B vimtutor @@ -324,3 +248,28 @@ diff -urN vim73/runtime/doc/vimtutor-ru.UTF-8.1 vim73_new/runtime/doc/vimtutor-r запускает учебник по .B Vim. При этом сначала происходит создание копии файла учебника, +diff --git a/runtime/doc/vimtutor.1 b/runtime/doc/vimtutor.1 +index 0aa7e8d..6a6f6f6 100644 +--- a/runtime/doc/vimtutor.1 ++++ b/runtime/doc/vimtutor.1 +@@ -4,6 +4,8 @@ vimtutor \- the Vim tutor + .SH SYNOPSIS + .br + .B vimtutor [\-g] [language] ++.br ++.B gvimtutor + .SH DESCRIPTION + .B Vimtutor + starts the +diff --git a/runtime/doc/vimtutor.man b/runtime/doc/vimtutor.man +index 9f2350a..e0114ca 100644 +--- a/runtime/doc/vimtutor.man ++++ b/runtime/doc/vimtutor.man +@@ -7,6 +7,7 @@ NAME + + SYNOPSIS + vimtutor [-g] [language] ++ gvimtutor + + DESCRIPTION + Vimtutor starts the Vim tutor. It copies the tutor file first, so that diff --git a/vim.spec b/vim.spec index d974d2b3..5c84daae 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: vim.sh @@ -458,7 +458,6 @@ EOF ln -sf vi ./%{_bindir}/rview ln -sf vi ./%{_bindir}/view ln -sf vi ./%{_bindir}/ex - ln -sf vim ./%{_bindir}/vimx ln -sf vim ./%{_bindir}/rvim ln -sf vim ./%{_bindir}/vimdiff perl -pi -e "s,%{buildroot},," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1 @@ -561,7 +560,7 @@ for i in fr.UTF-8 it.UTF-8 pl.UTF-8 da.UTF-8 de.UTF-8; do rm -rf %{buildroot}/%{_mandir}/$i done -for i in rvim.1 gvim.1 gex.1 gview.1 vimx.1; do +for i in rvim.1 gvim.1 gex.1 gview.1; do echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man1/$i done echo ".so man1/vimdiff.1" > %{buildroot}/%{_mandir}/man1/gvimdiff.1 @@ -657,7 +656,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_mandir}/man1/vim.* %{_mandir}/man1/vimdiff.* %{_mandir}/man1/vimtutor.* -%{_mandir}/man1/vimx.* %{_mandir}/man1/xxd.* %{_mandir}/man5/vimrc.* %lang(fr) %{_mandir}/fr/man1/* @@ -741,7 +739,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %files enhanced %{_bindir}/vim -%{_bindir}/vimx %{_bindir}/rvim %{_bindir}/vimdiff %{_bindir}/vimtutor @@ -788,6 +785,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Aug 21 2019 Zdenek Dohnal - 2:8.1.1890-2 +- remove vimx completely, because it is downstream symlink, which does not + work correctly anymore + * Tue Aug 20 2019 Zdenek Dohnal - 2:8.1.1890-1 - patchlevel 1890 From 478d29445ff0aee6b9acfa0279c011af32c7f70d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 23 Aug 2019 12:23:20 +0200 Subject: [PATCH 119/584] Revert "remove vimx completely, because it is downstream symlink, which does not" This reverts commit c666fe39c228247908c008fd3ae0f03fedd00b28. --- vim-manpagefixes-948566.patch | 487 +++++++++++++++++++--------------- vim.spec | 10 +- 2 files changed, 275 insertions(+), 222 deletions(-) diff --git a/vim-manpagefixes-948566.patch b/vim-manpagefixes-948566.patch index bc4d152d..6f495600 100644 --- a/vim-manpagefixes-948566.patch +++ b/vim-manpagefixes-948566.patch @@ -1,80 +1,38 @@ -diff --git a/runtime/doc/vim-fr.1 b/runtime/doc/vim-fr.1 -index 209ab91..356cb59 100644 ---- a/runtime/doc/vim-fr.1 -+++ b/runtime/doc/vim-fr.1 -@@ -24,6 +24,7 @@ vim \- Vi IMproved, - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-fr.UTF-8.1 b/runtime/doc/vim-fr.UTF-8.1 -index 67be106..30b926c 100644 ---- a/runtime/doc/vim-fr.UTF-8.1 -+++ b/runtime/doc/vim-fr.UTF-8.1 -@@ -24,6 +24,7 @@ vim \- Vi IMproved, éditeur de texte pour programmeurs - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-it.1 b/runtime/doc/vim-it.1 -index 0ab3eff..d3af003 100755 ---- a/runtime/doc/vim-it.1 -+++ b/runtime/doc/vim-it.1 -@@ -17,6 +17,7 @@ vim \- VI Migliorato, un editor di testi per programmatori - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-it.UTF-8.1 b/runtime/doc/vim-it.UTF-8.1 -index 51e7e04..bfafa36 100644 ---- a/runtime/doc/vim-it.UTF-8.1 -+++ b/runtime/doc/vim-it.UTF-8.1 -@@ -17,6 +17,7 @@ vim \- VI Migliorato, un editor di testi per programmatori - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-pl.1 b/runtime/doc/vim-pl.1 -index d506b33..cf6ffeb 100644 ---- a/runtime/doc/vim-pl.1 -+++ b/runtime/doc/vim-pl.1 -@@ -17,6 +17,7 @@ vim \- Vi rozbudowany, edytor tekstu dla programisty - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-pl.UTF-8.1 b/runtime/doc/vim-pl.UTF-8.1 -index f3551d2..01650e9 100644 ---- a/runtime/doc/vim-pl.UTF-8.1 -+++ b/runtime/doc/vim-pl.UTF-8.1 -@@ -17,6 +17,7 @@ vim \- Vi rozbudowany, edytor tekstu dla programisty - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-ru.1 b/runtime/doc/vim-ru.1 -index dfcb3ec..aa569d5 100644 ---- a/runtime/doc/vim-ru.1 -+++ b/runtime/doc/vim-ru.1 -@@ -17,11 +17,14 @@ vim \- Vi IMproved ( +diff -up vim73/runtime/doc/vim.man.rh1 vim73/runtime/doc/vim.man +--- vim73/runtime/doc/vim.man.rh1 2013-07-26 11:26:20.566576864 +0200 ++++ vim73/runtime/doc/vim.man 2013-07-26 11:47:42.061351469 +0200 +@@ -11,9 +11,9 @@ SYNOPSIS + vim [options] -t tag + vim [options] -q [errorfile] + +- ex ++ ex gex + view +- gvim gview evim eview ++ gvim gview vimx evim eview + rvim rview rgvim rgview + + DESCRIPTION +@@ -79,8 +79,13 @@ DESCRIPTION + the files. Can also be done with the "-R" argument. + + gvim gview +- The GUI version. Starts a new window. Can also be done with +- the "-g" argument. ++ The GUI version. Starts a new window. ++ ++ gex Starts a new gvim window in Ex mode. Can also be done with ++ the "-e" argument to gvim. ++ ++ vimx Starts gvim in "Vi" mode similar to "vim", but with ++ additional features like xterm clipboard support. + + evim eview + The GUI version in easy mode. Starts a new window. Can also +diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1 +--- vim73/runtime/doc/vim.1 2013-07-31 14:13:01.039765800 +0200 ++++ vim73_new/runtime/doc/vim.1 2013-07-31 13:57:59.861912768 +0200 +@@ -17,11 +17,13 @@ .PP .br .B ex @@ -84,43 +42,11 @@ index dfcb3ec..aa569d5 100644 .br .B gvim .B gview -+.B evim -+.B eview ++.B vimx + .B evim + .B eview .br - .B rvim - .B rview -diff --git a/runtime/doc/vim-ru.UTF-8.1 b/runtime/doc/vim-ru.UTF-8.1 -index ef52721..1217b7d 100644 ---- a/runtime/doc/vim-ru.UTF-8.1 -+++ b/runtime/doc/vim-ru.UTF-8.1 -@@ -17,11 +17,14 @@ vim \- Vi IMproved (Улучшенный Vi), текстовый редакто - .PP - .br - .B ex -+.B gex - .br - .B view - .br - .B gvim - .B gview -+.B evim -+.B eview - .br - .B rvim - .B rview -diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1 -index 48a121b..aaab06d 100644 ---- a/runtime/doc/vim.1 -+++ b/runtime/doc/vim.1 -@@ -17,6 +17,7 @@ vim \- Vi IMproved, a programmer's text editor - .PP - .br - .B ex -+.B gex - .br - .B view - .br -@@ -114,7 +115,9 @@ Can also be done with the "\-R" argument. +@@ -114,7 +116,12 @@ gvim gview The GUI version. Starts a new window. @@ -128,10 +54,13 @@ index 48a121b..aaab06d 100644 +.TP +gex +Starts a new gvim window in Ex mode. Can also be done with the "-e" argument to gvim ++.TP ++vimx ++Starts gvim in "Vi" mode similar to "vim", but with additional features like xterm clipboard support .TP evim eview The GUI version in easy mode. -@@ -449,6 +452,12 @@ As \-\-remote, but Vim does not exit until the files have been edited. +@@ -458,6 +458,12 @@ \-\-remote\-wait\-silent As \-\-remote\-wait, but without the warning when no server is found. .TP @@ -144,115 +73,166 @@ index 48a121b..aaab06d 100644 \-\-serverlist List the names of all Vim servers that can be found. .TP -diff --git a/runtime/doc/vim.man b/runtime/doc/vim.man -index 5cd751f..6b2cc75 100644 ---- a/runtime/doc/vim.man -+++ b/runtime/doc/vim.man -@@ -11,7 +11,7 @@ SYNOPSIS - vim [options] -t tag - vim [options] -q [errorfile] +diff -urN vim73/runtime/doc/vim-fr.1 vim73_new/runtime/doc/vim-fr.1 +--- vim73/runtime/doc/vim-fr.1 2010-05-15 13:04:00.000000000 +0200 ++++ vim73_new/runtime/doc/vim-fr.1 2013-07-31 13:59:10.587467916 +0200 +@@ -24,11 +24,13 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx + .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 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx + .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 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx + .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 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx + .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. -- ex -+ ex gex - view - gvim gview evim eview - rvim rview rgvim rgview -@@ -79,8 +79,10 @@ DESCRIPTION - the files. Can also be done with the "-R" argument. - - gvim gview -- The GUI version. Starts a new window. Can also be done with -- the "-g" argument. -+ The GUI version. Starts a new window. -+ -+ gex Starts a new gvim window in Ex mode. Can also be done with + gex Starts a new gvim window in Ex mode. Can also be done with +- the "-e" argument to gvim. + the "-e" argument to gvim + vimx Starts gvim in "Vi" mode similar to "vim", but with +- additional features like xterm clipboard support. ++ additional features like xterm clipboard support + evim eview The GUI version in easy mode. Starts a new window. Can also -diff --git a/runtime/doc/vimtutor-it.1 b/runtime/doc/vimtutor-it.1 -index b5c1e61..fa9dae7 100755 ---- a/runtime/doc/vimtutor-it.1 -+++ b/runtime/doc/vimtutor-it.1 -@@ -4,6 +4,8 @@ vimtutor \- Un breve corso per imparare Vim - .SH SINTASSI +diff -urN vim73/runtime/doc/vim-pl.1 vim73_new/runtime/doc/vim-pl.1 +--- vim73/runtime/doc/vim-pl.1 2010-05-15 13:04:01.000000000 +0200 ++++ vim73_new/runtime/doc/vim-pl.1 2013-07-31 14:00:21.282024131 +0200 +@@ -17,11 +17,13 @@ + .PP .br - .B vimtutor [\-g] [lingua] -+.br -+.B gvimtutor - .SH DESCRIZIONE - .B Vimtutor - inizia il -diff --git a/runtime/doc/vimtutor-it.UTF-8.1 b/runtime/doc/vimtutor-it.UTF-8.1 -index a33dcb0..8520d14 100644 ---- a/runtime/doc/vimtutor-it.UTF-8.1 -+++ b/runtime/doc/vimtutor-it.UTF-8.1 -@@ -4,6 +4,8 @@ vimtutor \- Un breve corso per imparare Vim - .SH SINTASSI + .B ex ++.B gex .br - .B vimtutor [\-g] [lingua] -+.br -+.B gvimtutor - .SH DESCRIZIONE - .B Vimtutor - inizia il -diff --git a/runtime/doc/vimtutor-pl.1 b/runtime/doc/vimtutor-pl.1 -index e603ca5..ce6b0bc 100644 ---- a/runtime/doc/vimtutor-pl.1 -+++ b/runtime/doc/vimtutor-pl.1 -@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima - .SH SYNOPSIS + .B view .br - .B vimtutor -g [jzyk] -+.br -+.B gvimtutor - .SH OPIS - .B Vimtutor - uruchamia nauczyciela -diff --git a/runtime/doc/vimtutor-pl.UTF-8.1 b/runtime/doc/vimtutor-pl.UTF-8.1 -index 199fcd0..3b35fb4 100644 ---- a/runtime/doc/vimtutor-pl.UTF-8.1 -+++ b/runtime/doc/vimtutor-pl.UTF-8.1 -@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima - .SH SYNOPSIS + .B gvim + .B gview ++.B vimx + .B evim + .B eview .br - .B vimtutor -g [język] -+.br -+.B gvimtutor - .SH OPIS - .B Vimtutor - uruchamia nauczyciela -diff --git a/runtime/doc/vimtutor-ru.1 b/runtime/doc/vimtutor-ru.1 -index fa3c5d9..a4f3eab 100644 ---- a/runtime/doc/vimtutor-ru.1 -+++ b/runtime/doc/vimtutor-ru.1 -@@ -4,6 +4,8 @@ vimtutor \- - .SH +diff -urN vim73/runtime/doc/vim-pl.UTF-8.1 vim73_new/runtime/doc/vim-pl.UTF-8.1 +--- vim73/runtime/doc/vim-pl.UTF-8.1 2010-05-15 13:37:38.000000000 +0200 ++++ vim73_new/runtime/doc/vim-pl.UTF-8.1 2013-07-31 14:00:36.056513402 +0200 +@@ -17,11 +17,13 @@ + .PP .br - .B vimtutor [] -+.br -+.B gvimtutor - .SH - - .B vimtutor -diff --git a/runtime/doc/vimtutor-ru.UTF-8.1 b/runtime/doc/vimtutor-ru.UTF-8.1 -index 6b1ba90..305d737 100644 ---- a/runtime/doc/vimtutor-ru.UTF-8.1 -+++ b/runtime/doc/vimtutor-ru.UTF-8.1 -@@ -7,6 +7,8 @@ vimtutor \- учебник по Vim - .SH ОПИСАНИЕ - Команда - .B vimtutor -+.br -+.B gvimtutor - запускает учебник по - .B Vim. - При этом сначала происходит создание копии файла учебника, -diff --git a/runtime/doc/vimtutor.1 b/runtime/doc/vimtutor.1 -index 0aa7e8d..6a6f6f6 100644 ---- a/runtime/doc/vimtutor.1 -+++ b/runtime/doc/vimtutor.1 -@@ -4,6 +4,8 @@ vimtutor \- the Vim tutor + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx + .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 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx ++.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 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx ++.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 @@ .SH SYNOPSIS .br .B vimtutor [\-g] [language] @@ -261,11 +241,34 @@ index 0aa7e8d..6a6f6f6 100644 .SH DESCRIPTION .B Vimtutor starts the -diff --git a/runtime/doc/vimtutor.man b/runtime/doc/vimtutor.man -index 9f2350a..e0114ca 100644 ---- a/runtime/doc/vimtutor.man -+++ b/runtime/doc/vimtutor.man -@@ -7,6 +7,7 @@ NAME +diff -urN vim73/runtime/doc/vimtutor-it.1 vim73_new/runtime/doc/vimtutor-it.1 +--- vim73/runtime/doc/vimtutor-it.1 2010-07-27 22:35:32.000000000 +0200 ++++ vim73_new/runtime/doc/vimtutor-it.1 2013-07-31 14:10:33.564861055 +0200 +@@ -4,6 +4,8 @@ + .SH SINTASSI + .br + .B vimtutor [\-g] [lingua] ++.br ++.B gvimtutor + .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 @@ + .SH SINTASSI + .br + .B vimtutor [\-g] [lingua] ++.br ++.B gvimtutor + .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 @@ SYNOPSIS vimtutor [-g] [language] @@ -273,3 +276,51 @@ index 9f2350a..e0114ca 100644 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 @@ + .SH SYNOPSIS + .br + .B vimtutor -g [jzyk] ++.br ++.B gvimtutor + .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 @@ + .SH SYNOPSIS + .br + .B vimtutor -g [język] ++.br ++.B gvimtutor + .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 +@@ -4,6 +4,8 @@ + .SH + .br + .B vimtutor [] ++.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 @@ + .SH ОПИСАНИЕ + Команда + .B vimtutor ++.br ++.B gvimtutor + запускает учебник по + .B Vim. + При этом сначала происходит создание копии файла учебника, diff --git a/vim.spec b/vim.spec index 5c84daae..5460ca08 100644 --- a/vim.spec +++ b/vim.spec @@ -458,6 +458,7 @@ EOF ln -sf vi ./%{_bindir}/rview ln -sf vi ./%{_bindir}/view ln -sf vi ./%{_bindir}/ex + ln -sf gvim ./%{_bindir}/vimx ln -sf vim ./%{_bindir}/rvim ln -sf vim ./%{_bindir}/vimdiff perl -pi -e "s,%{buildroot},," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1 @@ -560,7 +561,7 @@ for i in fr.UTF-8 it.UTF-8 pl.UTF-8 da.UTF-8 de.UTF-8; do rm -rf %{buildroot}/%{_mandir}/$i done -for i in rvim.1 gvim.1 gex.1 gview.1; do +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 @@ -656,6 +657,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_mandir}/man1/vim.* %{_mandir}/man1/vimdiff.* %{_mandir}/man1/vimtutor.* +%{_mandir}/man1/vimx.* %{_mandir}/man1/xxd.* %{_mandir}/man5/vimrc.* %lang(fr) %{_mandir}/fr/man1/* @@ -779,15 +781,15 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_bindir}/gview %{_bindir}/gex %{_bindir}/vimtutor +%{_bindir}/vimx %{_bindir}/evim %{_mandir}/man1/evim.* %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/locolor/*/apps/* %changelog -* Wed Aug 21 2019 Zdenek Dohnal - 2:8.1.1890-2 -- remove vimx completely, because it is downstream symlink, which does not - work correctly anymore +* Fri Aug 23 2019 Zdenek Dohnal - 2:8.1.1890-2 +- revert vimx removal * Tue Aug 20 2019 Zdenek Dohnal - 2:8.1.1890-1 - patchlevel 1890 From 68ef408a4090a012cbe0b6150fd78ece6a6871ea Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 23 Aug 2019 12:29:34 +0200 Subject: [PATCH 120/584] put symlink in the right place --- vim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 5460ca08..41c1b890 100644 --- a/vim.spec +++ b/vim.spec @@ -458,7 +458,6 @@ EOF ln -sf vi ./%{_bindir}/rview ln -sf vi ./%{_bindir}/view ln -sf vi ./%{_bindir}/ex - ln -sf gvim ./%{_bindir}/vimx ln -sf vim ./%{_bindir}/rvim ln -sf vim ./%{_bindir}/vimdiff perl -pi -e "s,%{buildroot},," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1 @@ -470,6 +469,7 @@ EOF ln -sf gvim ./%{_bindir}/gex ln -sf gvim ./%{_bindir}/evim ln -sf gvim ./%{_bindir}/gvimdiff + ln -sf gvim ./%{_bindir}/vimx %if "%{desktop_file}" == "1" desktop-file-install \ --dir %{buildroot}/%{_datadir}/applications \ From 3eb0f3afb3fddd9f977ec86d1ec0a6fa42cf727b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 23 Aug 2019 12:35:54 +0200 Subject: [PATCH 121/584] - patchlevel 1912 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2b46dc6f..9fbca64a 100644 --- a/.gitignore +++ b/.gitignore @@ -263,3 +263,4 @@ /vim-8.1-1749.tar.bz2 /vim-8.1-1790.tar.bz2 /vim-8.1-1890.tar.bz2 +/vim-8.1-1912.tar.bz2 diff --git a/sources b/sources index 01644a23..3d303acb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1890.tar.bz2) = 6f34a15badced307839c88de210bee771c3dac7207f9ca64dcdde74268bda3caa4217cba5f49ec70774314b583f0a5e3116dad64474a30bbd5372038dab86002 +SHA512 (vim-8.1-1912.tar.bz2) = a04934b80b38e1cda7b26f2946edbfab49c1b0339c91b394f9a06b737c72456600c913acda3da978d47aa048249a19dadcbe26c07865e0715fe50937610619e7 diff --git a/vim.spec b/vim.spec index 41c1b890..c6de3aff 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1890 +%define patchlevel 1912 %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: vim.sh @@ -788,6 +788,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Aug 23 2019 Zdenek Dohnal - 2:8.1.1912-1 +- patchlevel 1912 + * Fri Aug 23 2019 Zdenek Dohnal - 2:8.1.1890-2 - revert vimx removal From 386b3931a7707bd938b0754f19815ae325377cd5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 26 Aug 2019 10:16:03 +0200 Subject: [PATCH 122/584] use 'file' with '--mime' option - output is more stable --- vim.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vim.spec b/vim.spec index c6de3aff..e441fd12 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: vim.sh @@ -539,7 +539,7 @@ rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/doc/vim2html.pl rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/tutor/tutor.gr.utf-8~ ( cd %{buildroot}/%{_mandir} for i in `find ??/ -type f`; do - if [[ "`file $i`" == *UTF-8\ Unicode\ text* ]]; then + if [[ "`file --mime $i`" == *charset=utf-8* ]]; then continue fi bi=`basename $i` @@ -788,6 +788,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Aug 26 2019 Zdenek Dohnal - 2:8.1.1912-2 +- use 'file' with '--mime' option - output is more stable + * Fri Aug 23 2019 Zdenek Dohnal - 2:8.1.1912-1 - patchlevel 1912 From fdad298eb135b3c6d8701c5f65619d0dd53f9a28 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 26 Aug 2019 11:13:06 +0200 Subject: [PATCH 123/584] remove python2 interpreter - python2 will be retired soon. --- vim.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vim.spec b/vim.spec index e441fd12..ca73ece3 100644 --- a/vim.spec +++ b/vim.spec @@ -64,7 +64,7 @@ Patch3017: vim-python3-tests.patch # gcc is no longer in buildroot by default BuildRequires: gcc -BuildRequires: python2-devel python3-devel ncurses-devel gettext perl-devel +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 @@ -147,7 +147,6 @@ Provides: %{_bindir}/mergetool Provides: %{_bindir}/vim # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim -Suggests: python2 python2-libs Suggests: python3 python3-libs Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-devel %if "%{withruby}" == "1" @@ -196,7 +195,6 @@ BuildRequires: gtk3-devel libSM-devel libXt-devel libXpm-devel libappstream-glib Requires: hicolor-icon-theme # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim -Suggests: python2 python2-libs Suggests: python3 python3-libs Suggests: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl-devel %if "%{withruby}" == "1" @@ -309,7 +307,6 @@ mv -f ex_cmds.c.save ex_cmds.c # --enable-termtruecolor - use terminal with true colors %configure --with-features=huge \ - --enable-pythoninterp=dynamic \ --enable-python3interp=dynamic \ --enable-perlinterp=dynamic \ --disable-tclinterp --with-x=yes \ @@ -345,7 +342,6 @@ cp vim gvim make clean %configure --prefix=%{_prefix} --with-features=huge \ - --enable-pythoninterp=dynamic \ --enable-python3interp=dynamic \ --enable-perlinterp=dynamic \ --disable-tclinterp \ @@ -789,6 +785,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog * Mon Aug 26 2019 Zdenek Dohnal - 2:8.1.1912-2 +- remove python2 interpreter - python2 will be retired soon. - use 'file' with '--mime' option - output is more stable * Fri Aug 23 2019 Zdenek Dohnal - 2:8.1.1912-1 From 11df03d51ef8e2cd10cf9000622afb2acd12f75b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 3 Sep 2019 16:43:37 +0200 Subject: [PATCH 124/584] 1744956 - vim does not build with python3.8 --- vim.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index ca73ece3..242f8234 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: 2%{?dist} +Release: 3%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -264,6 +264,12 @@ 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" +%if 0%{?fedora} > 31 +export LDFLAGS="%{build_ldflags} $(python3-config --libs --embed)" +%else +export LDFLAGS="%{build_ldflags} $(python3-config --libs)" +%endif + cp -f os_unix.h os_unix.h.save cp -f ex_cmds.c ex_cmds.c.save @@ -784,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Sep 03 2019 Zdenek Dohnal - 2:8.1.1912-3 +- 1744956 - vim does not build with python3.8 + * Mon Aug 26 2019 Zdenek Dohnal - 2:8.1.1912-2 - remove python2 interpreter - python2 will be retired soon. - use 'file' with '--mime' option - output is more stable From 36a49e8dc853296672e51c0095cc013713ad016b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 6 Sep 2019 07:38:27 +0200 Subject: [PATCH 125/584] - patchlevel 1991 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9fbca64a..bc0cc2ac 100644 --- a/.gitignore +++ b/.gitignore @@ -264,3 +264,4 @@ /vim-8.1-1790.tar.bz2 /vim-8.1-1890.tar.bz2 /vim-8.1-1912.tar.bz2 +/vim-8.1-1991.tar.bz2 diff --git a/sources b/sources index 3d303acb..03aadf6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1912.tar.bz2) = a04934b80b38e1cda7b26f2946edbfab49c1b0339c91b394f9a06b737c72456600c913acda3da978d47aa048249a19dadcbe26c07865e0715fe50937610619e7 +SHA512 (vim-8.1-1991.tar.bz2) = b079c5ee94c8b2c75f6ba8dc40840b19d5bafb7324551defbb77749bcfd596f2995d1cd252ad3694462e6af8fbc628d4de73d83c30b8c71cd873e6c5a4e0d980 diff --git a/vim.spec b/vim.spec index 242f8234..d928e341 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1912 +%define patchlevel 1991 %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: 3%{?dist} +Release: 1%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Sep 06 2019 Zdenek Dohnal - 2:8.1.1991-1 +- patchlevel 1991 + * Tue Sep 03 2019 Zdenek Dohnal - 2:8.1.1912-3 - 1744956 - vim does not build with python3.8 From d8b54d1102108c7bc3d5fe1e632238df259b68a7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 6 Sep 2019 08:11:18 +0200 Subject: [PATCH 126/584] add f32 as rawhide and f31 as standalone branch --- vim-update.sh | 6 +++--- vim.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index 148748bf..f2c3b2f5 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,9 +1,9 @@ #!/bin/bash debug="" #debug="echo " -branches=( "master" "f30" "f29" ) -releases=( "fc31" "fc30" "fc29" ) -regexps=( "fc31" "\|fc30" "\|fc29" ) +branches=( "master" "f31" "f30" "f29" ) +releases=( "fc32" "fc31" "fc30" "fc29" ) +regexps=( "fc32" "\|fc31" "\|fc30" "\|fc29" ) bodhi_enabled=( "0" "1" "1" "1" ) branches_count=4 #releases_regexp=fc28\\\|fc27\\\|fc28 diff --git a/vim.spec b/vim.spec index d928e341..c148bef3 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: vim.sh @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Sep 06 2019 Zdenek Dohnal - 2:8.1.1991-2 +- add f32 as rawhide and f31 as standalone branch + * Fri Sep 06 2019 Zdenek Dohnal - 2:8.1.1991-1 - patchlevel 1991 From 7ea9c9f4d5c658255142dd473798b7e14e7ba01c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 10 Sep 2019 07:47:31 +0200 Subject: [PATCH 127/584] - patchlevel 2019 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bc0cc2ac..683f4d5c 100644 --- a/.gitignore +++ b/.gitignore @@ -265,3 +265,4 @@ /vim-8.1-1890.tar.bz2 /vim-8.1-1912.tar.bz2 /vim-8.1-1991.tar.bz2 +/vim-8.1-2019.tar.bz2 diff --git a/sources b/sources index 03aadf6e..4232dd30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1991.tar.bz2) = b079c5ee94c8b2c75f6ba8dc40840b19d5bafb7324551defbb77749bcfd596f2995d1cd252ad3694462e6af8fbc628d4de73d83c30b8c71cd873e6c5a4e0d980 +SHA512 (vim-8.1-2019.tar.bz2) = 2ab7a1cc6d6bd4ccd521a59994594f228c84881fc34c92d5221db7f8e509660aadc1589d92c752eaf328b85d9f47adb586608c31cb225aeeb505384d41208540 diff --git a/vim.spec b/vim.spec index c148bef3..e84a65f8 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1991 +%define patchlevel 2019 %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: vim.sh @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Sep 10 2019 Zdenek Dohnal - 2:8.1.2019-1 +- patchlevel 2019 + * Fri Sep 06 2019 Zdenek Dohnal - 2:8.1.1991-2 - add f32 as rawhide and f31 as standalone branch From fd78a22e2c05adc8d7588321a861b412098aa430 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 16 Sep 2019 14:59:27 +0200 Subject: [PATCH 128/584] enable fips warning --- vim-crypto-warning.patch | 83 ++++++++++++++++++++++++++++++++++++++++ vim.spec | 11 +++++- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 vim-crypto-warning.patch diff --git a/vim-crypto-warning.patch b/vim-crypto-warning.patch new file mode 100644 index 00000000..6d5e6ac1 --- /dev/null +++ b/vim-crypto-warning.patch @@ -0,0 +1,83 @@ +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 @@ + + /* Define to inline symbol or empty */ + #undef inline ++ ++/* Do we need FIPS warning? */ ++#undef HAVE_FIPS_WARNING ++ ++/* Link to system-fips file */ ++#undef SYSTEM_FIPS_FILE_LINK ++ ++/* Link to fips_enabled file */ ++#undef FIPS_ENABLED_FILE_LINK +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 + AC_MSG_RESULT(yes) + fi + ++dnl Checking if we want FIPS warning ++ ++AC_MSG_CHECKING(--enable-fips-warning) ++AC_ARG_ENABLE([fips-warning], ++ AS_HELP_STRING([--enable-fips-warning], [Enable FIPS warning]), ++ ,[enable_fips_warning="no"]) ++ ++if test "$enable_fips_warning" = "yes"; then ++ AC_MSG_RESULT(yes) ++ AC_DEFINE([HAVE_FIPS_WARNING]) ++ ++ dnl Setting path for system-fips file ++ ++ AC_MSG_CHECKING(--with-system-fips-file argument) ++ AC_ARG_WITH([system-fips-file], [ --with-system-fips-file=PATH Link to system-fips file (default: /etc/system-fips)], ++ with_system_fips_file=$withval, ++ with_system_fips_file="/etc/system-fips") ++ AC_MSG_RESULT([$with_system_fips_file]) ++ AC_DEFINE_UNQUOTED([SYSTEM_FIPS_FILE_LINK], ["$with_system_fips_file"]) ++ ++ dnl Setting link to fips_enabled file ++ ++ AC_MSG_CHECKING(--with-fips-enabled-file argument) ++ AC_ARG_WITH([fips-enabled-file], [ --with-fips-enabled-file=PATH Link to fibs_enabled file (default: /proc/sys/crypto/fips_enabled)], ++ with_fips_enabled_file=$withval, ++ with_fips_enabled_file="/proc/sys/crypto/fips_enabled") ++ AC_MSG_RESULT([$with_fips_enabled_file]) ++ AC_DEFINE_UNQUOTED([FIPS_ENABLED_FILE_LINK], ["$with_fips_enabled_file"]) ++else ++ AC_MSG_RESULT(no) ++fi ++ + dnl Check for Lua feature. + AC_MSG_CHECKING(--enable-luainterp argument) + AC_ARG_ENABLE(luainterp, +diff -up 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) + msg_scroll = TRUE; + msg(_("Warning: Using a weak encryption method; see :help 'cm'")); + } ++#ifdef HAVE_FIPS_WARNING ++ FILE *fips_enable_fd = fopen(FIPS_ENABLED_FILE_LINK, "r"); ++ if (fips_enable_fd == NULL) ++ return; ++ ++ int enabled = fgetc(fips_enable_fd); ++ ++ if ( access(SYSTEM_FIPS_FILE_LINK, F_OK) != -1 && enabled == '1') ++ { ++ msg_scroll = TRUE; ++ msg(_("Warning: This cryptography is not FIPS 140-2 compliant.")); ++ } ++ ++ fclose(fips_enable_fd); ++#endif + } + + void diff --git a/vim.spec b/vim.spec index e84a65f8..09d51942 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: vim.sh @@ -60,6 +60,8 @@ 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 +Patch3018: vim-crypto-warning.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -249,6 +251,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3014 -p1 %patch3016 -p1 %patch3017 -p1 +%patch3018 -p1 %build %if 0%{?rhel} > 7 @@ -298,6 +301,7 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --with-tlib=ncurses --enable-gui=no --disable-gpm --exec-prefix=/ \ --with-compiledby="" \ --with-modified-by="" \ + --enable-fips-warning \ --enable-fail-if-missing make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags} @@ -319,6 +323,7 @@ mv -f ex_cmds.c.save ex_cmds.c --enable-xim --enable-multibyte \ --with-tlib=ncurses \ --enable-gtk3-check --enable-gui=gtk3 \ + --enable-fips-warning \ --with-compiledby="" --enable-cscope \ --with-modified-by="" \ %if "%{withnetbeans}" == "1" @@ -355,6 +360,7 @@ make clean --enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte \ --enable-cscope --with-modified-by="" \ --with-tlib=ncurses \ + --enable-fips-warning \ --with-compiledby="" \ %if "%{withnetbeans}" == "1" --enable-netbeans \ @@ -790,6 +796,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Sep 16 2019 Zdenek Dohnal - 2:8.1.2019-2 +- enable fips warning + * Tue Sep 10 2019 Zdenek Dohnal - 2:8.1.2019-1 - patchlevel 2019 From 9be23a8090556dbc34c5188fbdd4ec586503eb3b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 19 Sep 2019 11:54:52 +0200 Subject: [PATCH 129/584] - patchlevel 2056 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 683f4d5c..8ba9e72a 100644 --- a/.gitignore +++ b/.gitignore @@ -266,3 +266,4 @@ /vim-8.1-1912.tar.bz2 /vim-8.1-1991.tar.bz2 /vim-8.1-2019.tar.bz2 +/vim-8.1-2056.tar.bz2 diff --git a/sources b/sources index 4232dd30..cb03a0f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2019.tar.bz2) = 2ab7a1cc6d6bd4ccd521a59994594f228c84881fc34c92d5221db7f8e509660aadc1589d92c752eaf328b85d9f47adb586608c31cb225aeeb505384d41208540 +SHA512 (vim-8.1-2056.tar.bz2) = 39c549a5b4d3f284d03469f28b1c33ade28b3e15b43872a4b614010d437662d4ba9cf574ab17f37bed2eee1f08c400a4ac23c0bdc18e45aea8a40ff8a472ab5c diff --git a/vim.spec b/vim.spec index 09d51942..6899cd96 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2019 +%define patchlevel 2056 %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: vim.sh @@ -796,6 +796,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Sep 19 2019 Zdenek Dohnal - 2:8.1.2056-1 +- patchlevel 2056 + * Mon Sep 16 2019 Zdenek Dohnal - 2:8.1.2019-2 - enable fips warning From 5d45ac645a5ae6e9a36bf12f470bba18777a4f33 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 30 Sep 2019 16:27:42 +0200 Subject: [PATCH 130/584] - patchlevel 2102 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8ba9e72a..928d4f57 100644 --- a/.gitignore +++ b/.gitignore @@ -267,3 +267,4 @@ /vim-8.1-1991.tar.bz2 /vim-8.1-2019.tar.bz2 /vim-8.1-2056.tar.bz2 +/vim-8.1-2102.tar.bz2 diff --git a/sources b/sources index cb03a0f5..162b2699 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2056.tar.bz2) = 39c549a5b4d3f284d03469f28b1c33ade28b3e15b43872a4b614010d437662d4ba9cf574ab17f37bed2eee1f08c400a4ac23c0bdc18e45aea8a40ff8a472ab5c +SHA512 (vim-8.1-2102.tar.bz2) = 058abc57bca27d3d040a5d43737275bfe77bc93e0cb6f29a085a163f2b0c6eecfc1cadac556ed4c56a78d22ee8ffec1c65fd7ddd661bdfd35debcdb23380e9fb diff --git a/vim.spec b/vim.spec index 6899cd96..41fb6518 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2056 +%define patchlevel 2102 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -796,6 +796,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Sep 30 2019 Zdenek Dohnal - 2:8.1.2102-1 +- patchlevel 2102 + * Thu Sep 19 2019 Zdenek Dohnal - 2:8.1.2056-1 - patchlevel 2056 From bc909c14dfd504acdb756beb1d02271fc63a1e6b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 7 Oct 2019 12:00:34 +0200 Subject: [PATCH 131/584] - patchlevel 2120 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 928d4f57..b9814dc0 100644 --- a/.gitignore +++ b/.gitignore @@ -268,3 +268,4 @@ /vim-8.1-2019.tar.bz2 /vim-8.1-2056.tar.bz2 /vim-8.1-2102.tar.bz2 +/vim-8.1-2120.tar.bz2 diff --git a/sources b/sources index 162b2699..3fae0bfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2102.tar.bz2) = 058abc57bca27d3d040a5d43737275bfe77bc93e0cb6f29a085a163f2b0c6eecfc1cadac556ed4c56a78d22ee8ffec1c65fd7ddd661bdfd35debcdb23380e9fb +SHA512 (vim-8.1-2120.tar.bz2) = 6dd9b103863cbc885074187b03a38e40bc6b7ef08e62fc6a8507148703c71f5569c689a21443e96d872436cb82c73fb041866095fb1101145268af33cd50356a diff --git a/vim.spec b/vim.spec index 41fb6518..a134c6be 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2102 +%define patchlevel 2120 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -796,6 +796,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Oct 07 2019 Zdenek Dohnal - 2:8.1.2120-1 +- patchlevel 2120 + * Mon Sep 30 2019 Zdenek Dohnal - 2:8.1.2102-1 - patchlevel 2102 From b025ba2aa3dd5003c1e848b8b4c195285c11ac36 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 17 Oct 2019 15:25:25 +0200 Subject: [PATCH 132/584] - patchlevel 2168 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b9814dc0..deb82a29 100644 --- a/.gitignore +++ b/.gitignore @@ -269,3 +269,4 @@ /vim-8.1-2056.tar.bz2 /vim-8.1-2102.tar.bz2 /vim-8.1-2120.tar.bz2 +/vim-8.1-2168.tar.bz2 diff --git a/sources b/sources index 3fae0bfa..675b5330 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2120.tar.bz2) = 6dd9b103863cbc885074187b03a38e40bc6b7ef08e62fc6a8507148703c71f5569c689a21443e96d872436cb82c73fb041866095fb1101145268af33cd50356a +SHA512 (vim-8.1-2168.tar.bz2) = 7a9f41438a3787db3e7c4458c13db5f26234f8bbded0307d24a907246655c564e4c7f6d1cf985f023a0a9e1d6170e481e81b936e37be8c79add97b1b7efed039 diff --git a/vim.spec b/vim.spec index a134c6be..5bb406e2 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2120 +%define patchlevel 2168 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -796,6 +796,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Oct 17 2019 Zdenek Dohnal - 2:8.1.2168-1 +- patchlevel 2168 + * Mon Oct 07 2019 Zdenek Dohnal - 2:8.1.2120-1 - patchlevel 2120 From da7b20f7e2aac032aed51360d5ed8197cb265c15 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 21 Oct 2019 09:46:38 +0200 Subject: [PATCH 133/584] - patchlevel 2197 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index deb82a29..0d65d0f4 100644 --- a/.gitignore +++ b/.gitignore @@ -270,3 +270,4 @@ /vim-8.1-2102.tar.bz2 /vim-8.1-2120.tar.bz2 /vim-8.1-2168.tar.bz2 +/vim-8.1-2197.tar.bz2 diff --git a/sources b/sources index 675b5330..5ff784b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2168.tar.bz2) = 7a9f41438a3787db3e7c4458c13db5f26234f8bbded0307d24a907246655c564e4c7f6d1cf985f023a0a9e1d6170e481e81b936e37be8c79add97b1b7efed039 +SHA512 (vim-8.1-2197.tar.bz2) = dc1eea2daebe1630c18d1b574808248773de3b179c57119f955dd6bdb77cb62ec6e70ba258de20b0b776f9fd3fcb688b4c7289efe52e5f0d75b66f430e6066ec diff --git a/vim.spec b/vim.spec index 5bb406e2..48ad560c 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2168 +%define patchlevel 2197 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -796,6 +796,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Oct 21 2019 Zdenek Dohnal - 2:8.1.2197-1 +- patchlevel 2197 + * Thu Oct 17 2019 Zdenek Dohnal - 2:8.1.2168-1 - patchlevel 2168 From 1c4cff61ceb44fbdbc7de0c10b3423567fe85dbf Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 22 Oct 2019 12:35:41 +0200 Subject: [PATCH 134/584] - patchlevel 2198 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0d65d0f4..0daf9e7d 100644 --- a/.gitignore +++ b/.gitignore @@ -271,3 +271,4 @@ /vim-8.1-2120.tar.bz2 /vim-8.1-2168.tar.bz2 /vim-8.1-2197.tar.bz2 +/vim-8.1-2198.tar.bz2 diff --git a/sources b/sources index 5ff784b1..665b8b14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2197.tar.bz2) = dc1eea2daebe1630c18d1b574808248773de3b179c57119f955dd6bdb77cb62ec6e70ba258de20b0b776f9fd3fcb688b4c7289efe52e5f0d75b66f430e6066ec +SHA512 (vim-8.1-2198.tar.bz2) = 11ce62fa2f8c2fbb412c188b6bc3419edb9449d96b6a85e688053b1fcd8460a636e758feea479a0346e98ac35fdf6cb33c336eef94f6210bacecb9d5732d870f diff --git a/vim.spec b/vim.spec index 48ad560c..f7931e0b 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2197 +%define patchlevel 2198 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -796,6 +796,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Oct 22 2019 Zdenek Dohnal - 2:8.1.2198-1 +- patchlevel 2198 + * Mon Oct 21 2019 Zdenek Dohnal - 2:8.1.2197-1 - patchlevel 2197 From 99995c519305634ee2345ac229b636ec9ef28707 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 30 Oct 2019 10:24:03 +0100 Subject: [PATCH 135/584] - patchlevel 2234 --- .gitignore | 1 + sources | 2 +- vim-8.0-copy-paste.patch | 16 +++++++++++----- vim.spec | 8 ++++++-- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 0daf9e7d..3a8a02df 100644 --- a/.gitignore +++ b/.gitignore @@ -272,3 +272,4 @@ /vim-8.1-2168.tar.bz2 /vim-8.1-2197.tar.bz2 /vim-8.1-2198.tar.bz2 +/vim-8.1-2234.tar.bz2 diff --git a/sources b/sources index 665b8b14..b096f727 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2198.tar.bz2) = 11ce62fa2f8c2fbb412c188b6bc3419edb9449d96b6a85e688053b1fcd8460a636e758feea479a0346e98ac35fdf6cb33c336eef94f6210bacecb9d5732d870f +SHA512 (vim-8.1-2234.tar.bz2) = 895650c52f6151d13012c229abd599979cb0b542372b8e012a6ad9b776651b77bdba42d92cf229ab29ec4de4ba2a8ecc69265f1085e928492564a64ec76da3ab diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch index 5cb1a88c..1ef4c9b1 100644 --- a/vim-8.0-copy-paste.patch +++ b/vim-8.0-copy-paste.patch @@ -1,14 +1,20 @@ -diff -up vim80/runtime/defaults.vim.copy-paste vim80/runtime/defaults.vim ---- vim80/runtime/defaults.vim.copy-paste 2016-12-19 09:01:20.351119199 +0100 -+++ vim80/runtime/defaults.vim 2016-12-19 09:01:53.735738941 +0100 -@@ -64,12 +64,6 @@ map Q gq +diff -up vim81/runtime/defaults.vim.copypaste vim81/runtime/defaults.vim +--- vim81/runtime/defaults.vim.copypaste 2019-10-30 10:30:23.108710252 +0100 ++++ vim81/runtime/defaults.vim 2019-10-30 10:36:19.127508406 +0100 +@@ -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') -- set mouse=a +- if &term =~ 'xterm' +- set mouse=a +- else +- set mouse=nvi +- endif -endif - " Switch syntax highlighting on when the terminal has colors or when using the diff --git a/vim.spec b/vim.spec index f7931e0b..6424da77 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2198 +%define patchlevel 2234 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -249,7 +249,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3011 -p1 %patch3013 -p1 %patch3014 -p1 -%patch3016 -p1 +%patch3016 -p1 -b .copypaste %patch3017 -p1 %patch3018 -p1 @@ -649,6 +649,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %lang(sk.cp1250) %{_datadir}/%{name}/%{vimdir}/lang/sk.cp1250 %lang(sr) %{_datadir}/%{name}/%{vimdir}/lang/sr %lang(sv) %{_datadir}/%{name}/%{vimdir}/lang/sv +%lang(tr) %{_datadir}/%{name}/%{vimdir}/lang/tr %lang(uk) %{_datadir}/%{name}/%{vimdir}/lang/uk %lang(uk.cp1251) %{_datadir}/%{name}/%{vimdir}/lang/uk.cp1251 %lang(vi) %{_datadir}/%{name}/%{vimdir}/lang/vi @@ -796,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Oct 30 2019 Zdenek Dohnal - 2:8.1.2234-1 +- patchlevel 2234 + * Tue Oct 22 2019 Zdenek Dohnal - 2:8.1.2198-1 - patchlevel 2198 From 3f13abb69e54427df95e2b011d573c82777ffcba Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 6 Nov 2019 18:15:16 +0100 Subject: [PATCH 136/584] do not add python-libs into LDFLAGS until we build vim and gvim --- vim.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/vim.spec b/vim.spec index 6424da77..c1d14914 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: vim.sh @@ -267,12 +267,6 @@ 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" -%if 0%{?fedora} > 31 -export LDFLAGS="%{build_ldflags} $(python3-config --libs --embed)" -%else -export LDFLAGS="%{build_ldflags} $(python3-config --libs)" -%endif - cp -f os_unix.h os_unix.h.save cp -f ex_cmds.c ex_cmds.c.save @@ -311,6 +305,12 @@ make clean mv -f os_unix.h.save os_unix.h mv -f ex_cmds.c.save ex_cmds.c +%if 0%{?fedora} > 31 +export LDFLAGS="%{build_ldflags} $(python3-config --libs --embed)" +%else +export LDFLAGS="%{build_ldflags} $(python3-config --libs)" +%endif + # More configure options: # --enable-xim - enabling X Input Method - international input module for X, # it is for multibyte languages in Vim with X @@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Nov 06 2019 Zdenek Dohnal - 2:8.1.2234-2 +- do not add python-libs into LDFLAGS until we build vim and gvim + * Wed Oct 30 2019 Zdenek Dohnal - 2:8.1.2234-1 - patchlevel 2234 From 649bcbec08b7f23727cc0876c94b552a1cbb534c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 7 Nov 2019 12:55:48 +0100 Subject: [PATCH 137/584] - patchlevel 2267 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3a8a02df..e2070799 100644 --- a/.gitignore +++ b/.gitignore @@ -273,3 +273,4 @@ /vim-8.1-2197.tar.bz2 /vim-8.1-2198.tar.bz2 /vim-8.1-2234.tar.bz2 +/vim-8.1-2267.tar.bz2 diff --git a/sources b/sources index b096f727..e330bded 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2234.tar.bz2) = 895650c52f6151d13012c229abd599979cb0b542372b8e012a6ad9b776651b77bdba42d92cf229ab29ec4de4ba2a8ecc69265f1085e928492564a64ec76da3ab +SHA512 (vim-8.1-2267.tar.bz2) = d1eeb22101fe6ed15a7f37d3c80808ddae71aaea30f3056b9d85003864356e129ea83c62a6a1e5f7f339a81a347c3c3885d3b0d9d4f5f05425964e0c042f054e diff --git a/vim.spec b/vim.spec index c1d14914..df3d3f0f 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2234 +%define patchlevel 2267 %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: vim.sh @@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Nov 07 2019 Zdenek Dohnal - 2:8.1.2267-1 +- patchlevel 2267 + * Wed Nov 06 2019 Zdenek Dohnal - 2:8.1.2234-2 - do not add python-libs into LDFLAGS until we build vim and gvim From b81069bea73a235c2fad535ce33d7f36665d1a1c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 28 Nov 2019 12:58:46 +0100 Subject: [PATCH 138/584] leave out f29, will be soon EOL --- vim-update.sh | 8 ++++---- vim.spec | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index f2c3b2f5..baf53e8d 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,10 +1,10 @@ #!/bin/bash debug="" #debug="echo " -branches=( "master" "f31" "f30" "f29" ) -releases=( "fc32" "fc31" "fc30" "fc29" ) -regexps=( "fc32" "\|fc31" "\|fc30" "\|fc29" ) -bodhi_enabled=( "0" "1" "1" "1" ) +branches=( "master" "f31" "f30" ) +releases=( "fc32" "fc31" "fc30" ) +regexps=( "fc32" "\|fc31" "\|fc30" ) +bodhi_enabled=( "0" "1" "1" ) branches_count=4 #releases_regexp=fc28\\\|fc27\\\|fc28 diff --git a/vim.spec b/vim.spec index df3d3f0f..789c0893 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: vim.sh @@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Nov 28 2019 Zdenek Dohnal - 2:8.1.2267-2 +- leave out f29, will be soon EOL + * Thu Nov 07 2019 Zdenek Dohnal - 2:8.1.2267-1 - patchlevel 2267 From 6c0f07908364786861b84f3b50676bb7b7bf3d8c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 28 Nov 2019 13:00:01 +0100 Subject: [PATCH 139/584] - patchlevel 2352 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e2070799..e8de7673 100644 --- a/.gitignore +++ b/.gitignore @@ -274,3 +274,4 @@ /vim-8.1-2198.tar.bz2 /vim-8.1-2234.tar.bz2 /vim-8.1-2267.tar.bz2 +/vim-8.1-2352.tar.bz2 diff --git a/sources b/sources index e330bded..c19acdbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2267.tar.bz2) = d1eeb22101fe6ed15a7f37d3c80808ddae71aaea30f3056b9d85003864356e129ea83c62a6a1e5f7f339a81a347c3c3885d3b0d9d4f5f05425964e0c042f054e +SHA512 (vim-8.1-2352.tar.bz2) = 95b5b8fdaff62aa229bff225e778410f2efad96cd5e8d0d22a37e01d801a680a7244ed6fca1bcd96a333004e72739efd57f7cbc2af2b466fb1ad942936ea3dd9 diff --git a/vim.spec b/vim.spec index 789c0893..11ac6398 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2267 +%define patchlevel 2352 %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: vim.sh @@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Nov 28 2019 Zdenek Dohnal - 2:8.1.2352-1 +- patchlevel 2352 + * Thu Nov 28 2019 Zdenek Dohnal - 2:8.1.2267-2 - leave out f29, will be soon EOL From 6288f78b6d42ba983009a8d279f7d6aa8c65b638 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 12 Dec 2019 08:53:54 +0100 Subject: [PATCH 140/584] - patchlevel 2424 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e8de7673..ec3b9666 100644 --- a/.gitignore +++ b/.gitignore @@ -275,3 +275,4 @@ /vim-8.1-2234.tar.bz2 /vim-8.1-2267.tar.bz2 /vim-8.1-2352.tar.bz2 +/vim-8.1-2424.tar.bz2 diff --git a/sources b/sources index c19acdbe..dd3330d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2352.tar.bz2) = 95b5b8fdaff62aa229bff225e778410f2efad96cd5e8d0d22a37e01d801a680a7244ed6fca1bcd96a333004e72739efd57f7cbc2af2b466fb1ad942936ea3dd9 +SHA512 (vim-8.1-2424.tar.bz2) = c6c5cf11a5d8b540e6c224389dd617aa3323a1c09a4ab22e8dd5e6c1a6bed66a6df0fae2b5a1aa013755f2d3a219ca08c43111b994643e2ef8768bb85b70f1c5 diff --git a/vim.spec b/vim.spec index 11ac6398..30edb742 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2352 +%define patchlevel 2424 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Dec 12 2019 Zdenek Dohnal - 2:8.1.2424-1 +- patchlevel 2424 + * Thu Nov 28 2019 Zdenek Dohnal - 2:8.1.2352-1 - patchlevel 2352 From 3de9737774da68d520f5310e4c743dc43f8c8fb2 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 12 Dec 2019 10:16:13 +0100 Subject: [PATCH 141/584] Patchlevel 2424 --- vim-7.0-fixkeys.patch | 9 +++++---- vim.spec | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/vim-7.0-fixkeys.patch b/vim-7.0-fixkeys.patch index 5554e1bf..4092b3e6 100644 --- a/vim-7.0-fixkeys.patch +++ b/vim-7.0-fixkeys.patch @@ -1,9 +1,10 @@ ---- vim70aa/src/term.c.orig 2006-03-01 23:07:55.000000000 +0100 -+++ vim70aa/src/term.c 2006-03-14 15:39:12.000000000 +0100 -@@ -1008,14 +1008,14 @@ +diff -up vim81/src/term.c.fixkeys vim81/src/term.c +--- vim81/src/term.c.fixkeys 2019-12-12 09:00:20.685567074 +0100 ++++ vim81/src/term.c 2019-12-12 09:21:36.708769626 +0100 +@@ -957,14 +957,14 @@ static struct builtin_term builtin_termc {K_XRIGHT, IF_EB("\033[1;*C", ESC_STR "[1;*C")}, {K_XLEFT, IF_EB("\033[1;*D", ESC_STR "[1;*D")}, - /* An extra set of function keys for vt100 mode */ + // 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")}, diff --git a/vim.spec b/vim.spec index 30edb742..d0fb1215 100644 --- a/vim.spec +++ b/vim.spec @@ -227,7 +227,7 @@ sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3017} # fix rogue dependencies from sample code chmod -x runtime/tools/mve.awk -%patch2002 -p1 +%patch2002 -p1 -b .fixkeys %patch2003 -p1 %if %{withhunspell} %patch2011 -p1 From 7f4e5836c62091bee1125f8917d72460c6ed873f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 16 Dec 2019 12:03:32 +0100 Subject: [PATCH 142/584] - patchlevel 12 --- .gitignore | 1 + sources | 2 +- vim.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ec3b9666..08cae65d 100644 --- a/.gitignore +++ b/.gitignore @@ -276,3 +276,4 @@ /vim-8.1-2267.tar.bz2 /vim-8.1-2352.tar.bz2 /vim-8.1-2424.tar.bz2 +/vim-8.2-012.tar.bz2 diff --git a/sources b/sources index dd3330d1..87ff5015 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-2424.tar.bz2) = c6c5cf11a5d8b540e6c224389dd617aa3323a1c09a4ab22e8dd5e6c1a6bed66a6df0fae2b5a1aa013755f2d3a219ca08c43111b994643e2ef8768bb85b70f1c5 +SHA512 (vim-8.2-012.tar.bz2) = 78fea7b4b43792030219ab158582953adaaedfdbbd8062e9d547f274e05533fc48a784fe9a8c184337951c546f106d2d8c0eaac100e2b007b52fa3ab096d327b diff --git a/vim.spec b/vim.spec index d0fb1215..8c3a596d 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2424 +%define patchlevel 012 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -14,8 +14,8 @@ %define withruby 1 %define withlua 1 -%define baseversion 8.1 -%define vimdir vim81 +%define baseversion 8.2 +%define vimdir vim82 Summary: The VIM editor URL: http://www.vim.org/ @@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Dec 16 2019 Zdenek Dohnal - 2:8.2.012-1 +- patchlevel 012 + * Thu Dec 12 2019 Zdenek Dohnal - 2:8.1.2424-1 - patchlevel 2424 From 0c2a98afcc4f256ee239752949333fb30ca396bf Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 18 Dec 2019 10:12:16 +0100 Subject: [PATCH 143/584] - patchlevel 19 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 08cae65d..474f8587 100644 --- a/.gitignore +++ b/.gitignore @@ -277,3 +277,4 @@ /vim-8.1-2352.tar.bz2 /vim-8.1-2424.tar.bz2 /vim-8.2-012.tar.bz2 +/vim-8.2-019.tar.bz2 diff --git a/sources b/sources index 87ff5015..86e0eafd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-012.tar.bz2) = 78fea7b4b43792030219ab158582953adaaedfdbbd8062e9d547f274e05533fc48a784fe9a8c184337951c546f106d2d8c0eaac100e2b007b52fa3ab096d327b +SHA512 (vim-8.2-019.tar.bz2) = 19c1bda587792614b93b980325ae40f95b06edf89a8051869f62d9aefe6417ee767ae6534837d01f9ebaf3f6c960a07348e96c123b7a1bc8e94f2979fcaa8d1d diff --git a/vim.spec b/vim.spec index 8c3a596d..e5a6150d 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 012 +%define patchlevel 019 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Dec 18 2019 Zdenek Dohnal - 2:8.2.019-1 +- patchlevel 019 + * Mon Dec 16 2019 Zdenek Dohnal - 2:8.2.012-1 - patchlevel 012 From b99d6b93fc88c17ee9a4fdddd32dc5bf57baba78 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 2 Jan 2020 11:39:30 +0100 Subject: [PATCH 144/584] - patchlevel 76 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 474f8587..cb909e1e 100644 --- a/.gitignore +++ b/.gitignore @@ -278,3 +278,4 @@ /vim-8.1-2424.tar.bz2 /vim-8.2-012.tar.bz2 /vim-8.2-019.tar.bz2 +/vim-8.2-076.tar.bz2 diff --git a/sources b/sources index 86e0eafd..cb807ed0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-019.tar.bz2) = 19c1bda587792614b93b980325ae40f95b06edf89a8051869f62d9aefe6417ee767ae6534837d01f9ebaf3f6c960a07348e96c123b7a1bc8e94f2979fcaa8d1d +SHA512 (vim-8.2-076.tar.bz2) = 2e70862937e2fe1eb02ceb6c7c32512b0df02fad36d4039ebbc8158341dabdb72fd69f04d8db6f0139ba05f2e798fb3762e23946f566ffd0bf5b23005a1f82d3 diff --git a/vim.spec b/vim.spec index e5a6150d..711554b0 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 019 +%define patchlevel 076 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jan 02 2020 Zdenek Dohnal - 2:8.2.076-1 +- patchlevel 076 + * Wed Dec 18 2019 Zdenek Dohnal - 2:8.2.019-1 - patchlevel 019 From 36bc445dc55557c16ca17387dd023f2fbf026fab Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 10 Jan 2020 10:10:58 +0100 Subject: [PATCH 145/584] - patchlevel 109 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cb909e1e..59b99b1c 100644 --- a/.gitignore +++ b/.gitignore @@ -279,3 +279,4 @@ /vim-8.2-012.tar.bz2 /vim-8.2-019.tar.bz2 /vim-8.2-076.tar.bz2 +/vim-8.2-109.tar.bz2 diff --git a/sources b/sources index cb807ed0..96693e5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-076.tar.bz2) = 2e70862937e2fe1eb02ceb6c7c32512b0df02fad36d4039ebbc8158341dabdb72fd69f04d8db6f0139ba05f2e798fb3762e23946f566ffd0bf5b23005a1f82d3 +SHA512 (vim-8.2-109.tar.bz2) = b3c647f8a4eba572b7268291d2a4ed8142b59e6c97266886d9c0c515d40bbc724758d34ede154cc8fe18045714a04b28dea845c749395f51002e1b016bef65e6 diff --git a/vim.spec b/vim.spec index 711554b0..a67e4428 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 076 +%define patchlevel 109 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jan 10 2020 Zdenek Dohnal - 2:8.2.109-1 +- patchlevel 109 + * Thu Jan 02 2020 Zdenek Dohnal - 2:8.2.076-1 - patchlevel 076 From 40291ffdbb2bafc40553d786ea1aa47869452e97 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 27 Jan 2020 12:54:37 +0100 Subject: [PATCH 146/584] - patchlevel 158 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 59b99b1c..7bf47536 100644 --- a/.gitignore +++ b/.gitignore @@ -280,3 +280,4 @@ /vim-8.2-019.tar.bz2 /vim-8.2-076.tar.bz2 /vim-8.2-109.tar.bz2 +/vim-8.2-158.tar.bz2 diff --git a/sources b/sources index 96693e5b..e2f86e30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-109.tar.bz2) = b3c647f8a4eba572b7268291d2a4ed8142b59e6c97266886d9c0c515d40bbc724758d34ede154cc8fe18045714a04b28dea845c749395f51002e1b016bef65e6 +SHA512 (vim-8.2-158.tar.bz2) = 4b293425950f4eb016c2401061ab8a0f1eba47c0a5ee1560a72d4a3cc58c01a602e84428c84b6e80c1665dc2981fc7a48d4595b4401cd07f1c36f659983aeab6 diff --git a/vim.spec b/vim.spec index a67e4428..46c29e2b 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 109 +%define patchlevel 158 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jan 27 2020 Zdenek Dohnal - 2:8.2.158-1 +- patchlevel 158 + * Fri Jan 10 2020 Zdenek Dohnal - 2:8.2.109-1 - patchlevel 109 From 0fa211bd6b9749ad9676dd2ed4ea9cfc45616eef Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 29 Jan 2020 14:28:51 +0100 Subject: [PATCH 147/584] man page file format conversion is not needed anymore --- vim.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/vim.spec b/vim.spec index 46c29e2b..bf82343d 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: vim.sh @@ -545,16 +545,6 @@ rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/tools rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/doc/vim2html.pl rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/tutor/tutor.gr.utf-8~ -( cd %{buildroot}/%{_mandir} - for i in `find ??/ -type f`; do - if [[ "`file --mime $i`" == *charset=utf-8* ]]; then - continue - fi - bi=`basename $i` - iconv -f latin1 -t UTF8 $i > %{buildroot}/$bi - mv -f %{buildroot}/$bi $i - done -) # Remove not UTF-8 manpages for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1 da.ISO8859-1 de.ISO8859-1; do @@ -797,6 +787,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jan 29 2020 Zdenek Dohnal - 2:8.2.158-2 +- man page file format conversion is not needed anymore + * Mon Jan 27 2020 Zdenek Dohnal - 2:8.2.158-1 - patchlevel 158 From 8ccdc33db22b85092adff71090f3410f81c6ee92 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 10 Feb 2020 08:47:32 +0100 Subject: [PATCH 148/584] - patchlevel 236 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7bf47536..4e9c25fc 100644 --- a/.gitignore +++ b/.gitignore @@ -281,3 +281,4 @@ /vim-8.2-076.tar.bz2 /vim-8.2-109.tar.bz2 /vim-8.2-158.tar.bz2 +/vim-8.2-236.tar.bz2 diff --git a/sources b/sources index e2f86e30..bd0d61a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-158.tar.bz2) = 4b293425950f4eb016c2401061ab8a0f1eba47c0a5ee1560a72d4a3cc58c01a602e84428c84b6e80c1665dc2981fc7a48d4595b4401cd07f1c36f659983aeab6 +SHA512 (vim-8.2-236.tar.bz2) = 410073dd378cc0df6b7de6a839085d6ca8fb5b152354f3ec106abafee889f54e69259bc07e828df5884f95da54707d59d9e6e1fcc9ae171e4bb90cf2f9bf579b diff --git a/vim.spec b/vim.spec index bf82343d..ea3e8c4f 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 158 +%define patchlevel 236 %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: vim.sh @@ -787,6 +787,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Feb 10 2020 Zdenek Dohnal - 2:8.2.236-1 +- patchlevel 236 + * Wed Jan 29 2020 Zdenek Dohnal - 2:8.2.158-2 - man page file format conversion is not needed anymore From 4eae277422b6f3a2fceeb77c41d6ccce825e1fe1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 13 Feb 2020 08:49:25 +0100 Subject: [PATCH 149/584] F32 got branched - do separate update for it --- vim-update.sh | 9 ++++----- vim.spec | 5 ++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index baf53e8d..ca33c9e8 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,11 +1,10 @@ #!/bin/bash debug="" #debug="echo " -branches=( "master" "f31" "f30" ) -releases=( "fc32" "fc31" "fc30" ) -regexps=( "fc32" "\|fc31" "\|fc30" ) -bodhi_enabled=( "0" "1" "1" ) -branches_count=4 +branches=( "master" "f32" "f31" "f30" ) +releases=( "fc33" "fc32" "fc31" "fc30" ) +regexps=( "fc33" "\|fc32" "\|fc31" "\|fc30" ) +bodhi_enabled=( "0" "1" "1" "1" ) #releases_regexp=fc28\\\|fc27\\\|fc28 branches_index=0 diff --git a/vim.spec b/vim.spec index ea3e8c4f..8bb40b45 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: vim.sh @@ -787,6 +787,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Feb 13 2020 Zdenek Dohnal - 2:8.2.236-2 +- F32 got branched - do separate update for it + * Mon Feb 10 2020 Zdenek Dohnal - 2:8.2.236-1 - patchlevel 236 From 46af7cf98a4b8e450cce0c59092ac99e719f8198 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 3 Mar 2020 12:01:08 +0100 Subject: [PATCH 150/584] - patchlevel 348 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4e9c25fc..3a2e52fe 100644 --- a/.gitignore +++ b/.gitignore @@ -282,3 +282,4 @@ /vim-8.2-109.tar.bz2 /vim-8.2-158.tar.bz2 /vim-8.2-236.tar.bz2 +/vim-8.2-348.tar.bz2 diff --git a/sources b/sources index bd0d61a1..58ac1060 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-236.tar.bz2) = 410073dd378cc0df6b7de6a839085d6ca8fb5b152354f3ec106abafee889f54e69259bc07e828df5884f95da54707d59d9e6e1fcc9ae171e4bb90cf2f9bf579b +SHA512 (vim-8.2-348.tar.bz2) = ee9b51b9720cf44a7c2aa90f8b0d13a01c8964d8cb97acfe6840e4e08a384b3b69579aa387e2d264e5c8eb9b996a8974cc63e21c9ff4d9e9488a18af89bbd32d diff --git a/vim.spec b/vim.spec index 8bb40b45..2de96f20 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 236 +%define patchlevel 348 %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: vim.sh @@ -787,6 +787,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Mar 03 2020 Zdenek Dohnal - 2:8.2.348-1 +- patchlevel 348 + * Thu Feb 13 2020 Zdenek Dohnal - 2:8.2.236-2 - F32 got branched - do separate update for it From 7f8136f53dee67b625bd714f4723dec4a55ff9df Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 3 Mar 2020 17:00:12 +0100 Subject: [PATCH 151/584] patchlevel 348 --- vim-7.4-checkhl.patch | 12 ------------ vim-7.4-globalsyntax.patch | 13 +++++++------ vim.spec | 2 -- vimrc | 1 - 4 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 vim-7.4-checkhl.patch diff --git a/vim-7.4-checkhl.patch b/vim-7.4-checkhl.patch deleted file mode 100644 index f7fbf904..00000000 --- a/vim-7.4-checkhl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up vim74/runtime/syntax/spec.vim.kh1 vim74/runtime/syntax/spec.vim ---- vim74/runtime/syntax/spec.vim.kh1 2016-08-04 15:23:25.275955301 +0200 -+++ vim74/runtime/syntax/spec.vim 2016-08-04 15:24:56.699417602 +0200 -@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou - syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment - - "%% Scripts Section %% --syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 -+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 - - "%% Changelog Section %% - syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense diff --git a/vim-7.4-globalsyntax.patch b/vim-7.4-globalsyntax.patch index 1e0b08ed..4503f2d0 100644 --- a/vim-7.4-globalsyntax.patch +++ b/vim-7.4-globalsyntax.patch @@ -1,12 +1,13 @@ -diff -up vim74/runtime/syntax/spec.vim.orig vim74/runtime/syntax/spec.vim ---- vim74/runtime/syntax/spec.vim.orig 2016-01-12 13:51:55.727569873 +0100 -+++ vim74/runtime/syntax/spec.vim 2016-01-12 13:53:08.124991178 +0100 -@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou +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= 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\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 -+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 +-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 "%% 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 2de96f20..be6b3795 100644 --- a/vim.spec +++ b/vim.spec @@ -50,7 +50,6 @@ BuildRequires: hunspell-devel Patch3000: vim-7.4-syntax.patch Patch3002: vim-7.4-nowarnings.patch Patch3004: vim-7.0-rclocation.patch -Patch3006: vim-7.4-checkhl.patch Patch3007: vim-7.4-fstabsyntax.patch Patch3008: vim-7.4-syncolor.patch Patch3010: vim-7.3-manpage-typo-668894-675480.patch @@ -242,7 +241,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3000 -p1 %patch3002 -p1 %patch3004 -p1 -%patch3006 -p1 %patch3007 -p1 -b .fstabsyntax %patch3008 -p1 -b .syncolor %patch3010 -p1 diff --git a/vimrc b/vimrc index be4d3cfc..18c5ed58 100644 --- a/vimrc +++ b/vimrc @@ -120,5 +120,4 @@ if has('langmap') && exists('+langremap') endif " Don't wake up system with blinking cursor: -" http://www.linuxpowertop.org/known.php let &guicursor = &guicursor . ",a:blinkon0" From 3d1aa02adc1c164181e4d655166216c0300cdc42 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 5 Mar 2020 10:41:22 +0100 Subject: [PATCH 152/584] - patchlevel 356 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3a2e52fe..8e178158 100644 --- a/.gitignore +++ b/.gitignore @@ -283,3 +283,4 @@ /vim-8.2-158.tar.bz2 /vim-8.2-236.tar.bz2 /vim-8.2-348.tar.bz2 +/vim-8.2-356.tar.bz2 diff --git a/sources b/sources index 58ac1060..df28717b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-348.tar.bz2) = ee9b51b9720cf44a7c2aa90f8b0d13a01c8964d8cb97acfe6840e4e08a384b3b69579aa387e2d264e5c8eb9b996a8974cc63e21c9ff4d9e9488a18af89bbd32d +SHA512 (vim-8.2-356.tar.bz2) = 081dd933f6c311e5befd019da621407f33b1dd8340039a1e79a5a4612009095baaf8dfd57a89137a668799d0e7e8213e8db96e3242629457227d2cbd3c1fcb59 diff --git a/vim.spec b/vim.spec index be6b3795..a93d3d59 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 348 +%define patchlevel 356 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -785,6 +785,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Mar 05 2020 Zdenek Dohnal - 2:8.2.356-1 +- patchlevel 356 + * Tue Mar 03 2020 Zdenek Dohnal - 2:8.2.348-1 - patchlevel 348 From b57e2be10ed36bc6e87fa114f4a1d4c1081b1174 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 6 Mar 2020 06:12:25 +0100 Subject: [PATCH 153/584] - patchlevel 357 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8e178158..2e63d6f1 100644 --- a/.gitignore +++ b/.gitignore @@ -284,3 +284,4 @@ /vim-8.2-236.tar.bz2 /vim-8.2-348.tar.bz2 /vim-8.2-356.tar.bz2 +/vim-8.2-357.tar.bz2 diff --git a/sources b/sources index df28717b..f356e0c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-356.tar.bz2) = 081dd933f6c311e5befd019da621407f33b1dd8340039a1e79a5a4612009095baaf8dfd57a89137a668799d0e7e8213e8db96e3242629457227d2cbd3c1fcb59 +SHA512 (vim-8.2-357.tar.bz2) = 64f789c71106165738bb83ca670d0d815fad8fbaeb4a64a8b31c53da8785e7dfdb94ea89c0cec855b562015f16101055e862dfe3e7c2d16e5a39e7c96f65dea7 diff --git a/vim.spec b/vim.spec index a93d3d59..5cde7ce8 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 356 +%define patchlevel 357 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -785,6 +785,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Mar 06 2020 Zdenek Dohnal - 2:8.2.357-1 +- patchlevel 357 + * Thu Mar 05 2020 Zdenek Dohnal - 2:8.2.356-1 - patchlevel 356 From 01f71da7438083bdfa75434894a47db52c78670d Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 10 Mar 2020 13:30:48 +0100 Subject: [PATCH 154/584] put providing bundled libvterm into subpackage vim-enhanced --- vim.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/vim.spec b/vim.spec index 5cde7ce8..2ed87d65 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: vim.sh @@ -86,11 +86,6 @@ BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} Epoch: 2 Conflicts: filesystem < 3 -# vim bundles libvterm, which is used during build - so we need to provide -# bundled libvterm for catching possible libvterm CVEs -Provides: bundled(libvterm) - - %description VIM (VIsual editor iMproved) is an updated and improved version of the vi editor. Vi was the first real screen-based editor for UNIX, and is @@ -156,6 +151,9 @@ Suggests: ruby-libs ruby %if "%{withlua}" == "1" Suggests: lua-libs %endif +# vim bundles libvterm, which is used during build - so we need to provide +# bundled libvterm for catching possible libvterm CVEs +Provides: bundled(libvterm) %description enhanced VIM (VIsual editor iMproved) is an updated and improved version of the @@ -785,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Mar 10 2020 Zdenek Dohnal - 2:8.2.357-2 +- put providing bundled libvterm into subpackage vim-enhanced + * Fri Mar 06 2020 Zdenek Dohnal - 2:8.2.357-1 - patchlevel 357 From 8bd4fb37d47a106850f655494fd442bb4ea1f88c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 16 Mar 2020 07:05:53 +0100 Subject: [PATCH 155/584] - patchlevel 390 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2e63d6f1..383234c3 100644 --- a/.gitignore +++ b/.gitignore @@ -285,3 +285,4 @@ /vim-8.2-348.tar.bz2 /vim-8.2-356.tar.bz2 /vim-8.2-357.tar.bz2 +/vim-8.2-390.tar.bz2 diff --git a/sources b/sources index f356e0c4..67d3a4b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-357.tar.bz2) = 64f789c71106165738bb83ca670d0d815fad8fbaeb4a64a8b31c53da8785e7dfdb94ea89c0cec855b562015f16101055e862dfe3e7c2d16e5a39e7c96f65dea7 +SHA512 (vim-8.2-390.tar.bz2) = c2ab22b459c57f936277d794d162da6b18263cc615ebbdb908cc362900816b24d11a13732e9a25f7100863df72e6e9418154edcfce0b5d1169be19b07456a402 diff --git a/vim.spec b/vim.spec index 2ed87d65..83a01115 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 357 +%define patchlevel 390 %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: vim.sh @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Mar 16 2020 Zdenek Dohnal - 2:8.2.390-1 +- patchlevel 390 + * Tue Mar 10 2020 Zdenek Dohnal - 2:8.2.357-2 - put providing bundled libvterm into subpackage vim-enhanced From 7c865ceb25cfdb642f482f255428c31a82ab5075 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 16 Mar 2020 20:52:45 +0100 Subject: [PATCH 156/584] Source /etc/vimrc.local if it exists There seems to be no good way to extend distro-provided vimrc. If the user modifies /etc/vimrc, then RPM will keep it intact from then on, with subsequent distribution updates going into a .rpmnew file. Sad. On Debian the user is supposed to put the local overrides into a vimrc.local file next to the main vimrc. That is pretty neat -- the local configuration is separated from the system one and can be updated independently. Let's do the same thing. --- vim.spec | 5 ++++- vimrc | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 83a01115..e15f41e7 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: vim.sh @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Mar 16 2020 Lubomir Rintel - 2:8.2.390-2 +- source /etc/vimrc.local if it exists + * Mon Mar 16 2020 Zdenek Dohnal - 2:8.2.390-1 - patchlevel 390 diff --git a/vimrc b/vimrc index 18c5ed58..4842faf2 100644 --- a/vimrc +++ b/vimrc @@ -121,3 +121,8 @@ endif " Don't wake up system with blinking cursor: let &guicursor = &guicursor . ",a:blinkon0" + +" Source a global configuration file if available +if filereadable("/etc/vimrc.local") + source /etc/vimrc.local +endif From 59faaa019faebed271ee106398f2edd8bb9467e1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 25 Mar 2020 13:48:59 +0100 Subject: [PATCH 157/584] - patchlevel 444 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 383234c3..75858cb5 100644 --- a/.gitignore +++ b/.gitignore @@ -286,3 +286,4 @@ /vim-8.2-356.tar.bz2 /vim-8.2-357.tar.bz2 /vim-8.2-390.tar.bz2 +/vim-8.2-444.tar.bz2 diff --git a/sources b/sources index 67d3a4b7..daa70ff0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-390.tar.bz2) = c2ab22b459c57f936277d794d162da6b18263cc615ebbdb908cc362900816b24d11a13732e9a25f7100863df72e6e9418154edcfce0b5d1169be19b07456a402 +SHA512 (vim-8.2-444.tar.bz2) = c184bd982139ed90680640cdb57cb9619ca3fde4a475e7f7109118a88b9607aacd4f20b12c8a843c8a963cf4878d50a17356097c2637ba5823eb292f19d99998 diff --git a/vim.spec b/vim.spec index e15f41e7..3626ad9a 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 390 +%define patchlevel 444 %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: vim.sh @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Mar 25 2020 Zdenek Dohnal - 2:8.2.444-1 +- patchlevel 444 + * Mon Mar 16 2020 Lubomir Rintel - 2:8.2.390-2 - source /etc/vimrc.local if it exists From 7566cdb4740c8b3ebb4eb758492b1f2c9cb1b248 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 26 Mar 2020 06:03:29 +0100 Subject: [PATCH 158/584] - patchlevel 448 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 75858cb5..ad75c7cf 100644 --- a/.gitignore +++ b/.gitignore @@ -287,3 +287,4 @@ /vim-8.2-357.tar.bz2 /vim-8.2-390.tar.bz2 /vim-8.2-444.tar.bz2 +/vim-8.2-448.tar.bz2 diff --git a/sources b/sources index daa70ff0..c6c80f48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-444.tar.bz2) = c184bd982139ed90680640cdb57cb9619ca3fde4a475e7f7109118a88b9607aacd4f20b12c8a843c8a963cf4878d50a17356097c2637ba5823eb292f19d99998 +SHA512 (vim-8.2-448.tar.bz2) = a3a697ba22febf76fd681c80a054c0ecb5bc4842efcca8a6f184107191b0489f7f8c842f8aedcbba372ee2f07880c22cad502cfc829e1a2460eaf87a2c48f4ab diff --git a/vim.spec b/vim.spec index 3626ad9a..59d30ad1 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 444 +%define patchlevel 448 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Mar 26 2020 Zdenek Dohnal - 2:8.2.448-1 +- patchlevel 448 + * Wed Mar 25 2020 Zdenek Dohnal - 2:8.2.444-1 - patchlevel 444 From f58588a265ce39ce10afe8af689f8056376dee14 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 30 Mar 2020 09:38:55 +0200 Subject: [PATCH 159/584] - patchlevel 480 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ad75c7cf..38da6ec7 100644 --- a/.gitignore +++ b/.gitignore @@ -288,3 +288,4 @@ /vim-8.2-390.tar.bz2 /vim-8.2-444.tar.bz2 /vim-8.2-448.tar.bz2 +/vim-8.2-480.tar.bz2 diff --git a/sources b/sources index c6c80f48..ad74ee30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-448.tar.bz2) = a3a697ba22febf76fd681c80a054c0ecb5bc4842efcca8a6f184107191b0489f7f8c842f8aedcbba372ee2f07880c22cad502cfc829e1a2460eaf87a2c48f4ab +SHA512 (vim-8.2-480.tar.bz2) = 3a05b62a0c165dfc080cd8741941f9f357cda223ea5263e3c88b976c5c0c37b19cc4d957d4123792a8d76ecc262b4bfc3270faada1cc03a1dcd85d60050fd1fc diff --git a/vim.spec b/vim.spec index 59d30ad1..6b9cbb45 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 448 +%define patchlevel 480 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Mar 30 2020 Zdenek Dohnal - 2:8.2.480-1 +- patchlevel 480 + * Thu Mar 26 2020 Zdenek Dohnal - 2:8.2.448-1 - patchlevel 448 From e58df69f15f5c5fab5923aaac9d455c68ee1466f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 6 Apr 2020 07:53:38 +0200 Subject: [PATCH 160/584] - patchlevel 520 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 38da6ec7..c14e88af 100644 --- a/.gitignore +++ b/.gitignore @@ -289,3 +289,4 @@ /vim-8.2-444.tar.bz2 /vim-8.2-448.tar.bz2 /vim-8.2-480.tar.bz2 +/vim-8.2-520.tar.bz2 diff --git a/sources b/sources index ad74ee30..0adcf413 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-480.tar.bz2) = 3a05b62a0c165dfc080cd8741941f9f357cda223ea5263e3c88b976c5c0c37b19cc4d957d4123792a8d76ecc262b4bfc3270faada1cc03a1dcd85d60050fd1fc +SHA512 (vim-8.2-520.tar.bz2) = 7bc170e7bdf43bf54a09a0bc50cc03be99fb189ced8ca7454e7da89102eea19f091b12b2ddbee91e82211dc6734fb8cec31d48b52c58628f75169e5ff5abfe7c diff --git a/vim.spec b/vim.spec index 6b9cbb45..4d2082ec 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 480 +%define patchlevel 520 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Apr 06 2020 Zdenek Dohnal - 2:8.2.520-1 +- patchlevel 520 + * Mon Mar 30 2020 Zdenek Dohnal - 2:8.2.480-1 - patchlevel 480 From 059ec7f443483e078a0e974f040920488c2c38da Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 7 Apr 2020 13:38:40 +0200 Subject: [PATCH 161/584] - patchlevel 525 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c14e88af..2b189222 100644 --- a/.gitignore +++ b/.gitignore @@ -290,3 +290,4 @@ /vim-8.2-448.tar.bz2 /vim-8.2-480.tar.bz2 /vim-8.2-520.tar.bz2 +/vim-8.2-525.tar.bz2 diff --git a/sources b/sources index 0adcf413..8795be0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-520.tar.bz2) = 7bc170e7bdf43bf54a09a0bc50cc03be99fb189ced8ca7454e7da89102eea19f091b12b2ddbee91e82211dc6734fb8cec31d48b52c58628f75169e5ff5abfe7c +SHA512 (vim-8.2-525.tar.bz2) = 668f4e106b961637dc2d33f6472514fc50eff0155f67a6a9f4b8e32f82ad82f7bed43b00f887ac97be792c49e1c2dc76f1e2e8f9d6496faff6339b6179d84906 diff --git a/vim.spec b/vim.spec index 4d2082ec..e9d913c1 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 520 +%define patchlevel 525 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Apr 07 2020 Zdenek Dohnal - 2:8.2.525-1 +- patchlevel 525 + * Mon Apr 06 2020 Zdenek Dohnal - 2:8.2.520-1 - patchlevel 520 From c7dfabe9acc16b86000867b2d597d5b06af4b666 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 9 Apr 2020 06:35:08 +0200 Subject: [PATCH 162/584] - patchlevel 534 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2b189222..f8c1ba86 100644 --- a/.gitignore +++ b/.gitignore @@ -291,3 +291,4 @@ /vim-8.2-480.tar.bz2 /vim-8.2-520.tar.bz2 /vim-8.2-525.tar.bz2 +/vim-8.2-534.tar.bz2 diff --git a/sources b/sources index 8795be0a..8b045f2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-525.tar.bz2) = 668f4e106b961637dc2d33f6472514fc50eff0155f67a6a9f4b8e32f82ad82f7bed43b00f887ac97be792c49e1c2dc76f1e2e8f9d6496faff6339b6179d84906 +SHA512 (vim-8.2-534.tar.bz2) = 5a8458c71e23f12c78b6e4c89bcd764dbf9b1e5a69fc6a7db17c1bdc0506eb4c35dc42c66fd50bbd9d41869e292e41a3bd4ace6c8ab6c619e5e4b9cf4017fc92 diff --git a/vim.spec b/vim.spec index e9d913c1..8cc3bc6d 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 525 +%define patchlevel 534 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Apr 09 2020 Zdenek Dohnal - 2:8.2.534-1 +- patchlevel 534 + * Tue Apr 07 2020 Zdenek Dohnal - 2:8.2.525-1 - patchlevel 525 From 676a6659c28ccc796396f7e7cd4449931253a970 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 17 Apr 2020 06:08:21 +0200 Subject: [PATCH 163/584] - patchlevel 587 --- .gitignore | 1 + sources | 2 +- vim-python3-tests.patch | 60 ++++++++++++++++++++--------------------- vim.spec | 7 +++-- 4 files changed, 37 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index f8c1ba86..e5177b6d 100644 --- a/.gitignore +++ b/.gitignore @@ -292,3 +292,4 @@ /vim-8.2-520.tar.bz2 /vim-8.2-525.tar.bz2 /vim-8.2-534.tar.bz2 +/vim-8.2-587.tar.bz2 diff --git a/sources b/sources index 8b045f2a..838d2f79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-534.tar.bz2) = 5a8458c71e23f12c78b6e4c89bcd764dbf9b1e5a69fc6a7db17c1bdc0506eb4c35dc42c66fd50bbd9d41869e292e41a3bd4ace6c8ab6c619e5e4b9cf4017fc92 +SHA512 (vim-8.2-587.tar.bz2) = 3bd9af491080275c951ff9aa7176260895b4a5a12b107981feb2beaa1d90bf2551ae5bbbea7a3bafa0cc0fc0f9a36964934055f6cfb2f7805f1f0f371076a531 diff --git a/vim-python3-tests.patch b/vim-python3-tests.patch index 26027f74..98b5f758 100644 --- a/vim-python3-tests.patch +++ b/vim-python3-tests.patch @@ -1,16 +1,16 @@ -diff -up vim80/runtime/tools/demoserver.py.python3-tests vim80/runtime/tools/demoserver.py ---- vim80/runtime/tools/demoserver.py.python3-tests 2018-05-11 08:24:41.774618804 +0200 -+++ vim80/runtime/tools/demoserver.py 2018-05-11 09:24:48.363309856 +0200 +diff -up vim82/runtime/tools/demoserver.py.python-tests vim82/runtime/tools/demoserver.py +--- vim82/runtime/tools/demoserver.py.python-tests 2019-07-26 07:58:50.000000000 +0200 ++++ vim82/runtime/tools/demoserver.py 2020-04-17 06:18:06.748977527 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Server that will accept connections from a Vim channel. # Run this server and then in Vim you can open the channel: -diff -up vim80/src/auto/configure.python3-tests vim80/src/auto/configure ---- vim80/src/auto/configure.python3-tests 2018-05-11 08:25:03.632420873 +0200 -+++ vim80/src/auto/configure 2018-05-11 09:25:26.062000471 +0200 -@@ -6396,7 +6396,7 @@ eof +diff -up vim82/src/auto/configure.python-tests vim82/src/auto/configure +--- vim82/src/auto/configure.python-tests 2020-04-17 06:07:48.000000000 +0200 ++++ vim82/src/auto/configure 2020-04-17 06:18:06.750977509 +0200 +@@ -6418,7 +6418,7 @@ eof if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \ "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then vi_cv_path_python_plibs="-framework Python" @@ -19,10 +19,10 @@ diff -up vim80/src/auto/configure.python3-tests vim80/src/auto/configure vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" fi else -diff -up vim80/src/configure.ac.python3-tests vim80/src/configure.ac ---- vim80/src/configure.ac.python3-tests 2018-05-11 08:25:26.070218957 +0200 -+++ vim80/src/configure.ac 2018-05-11 09:26:01.603708243 +0200 -@@ -1248,7 +1248,7 @@ eof +diff -up vim82/src/configure.ac.python-tests vim82/src/configure.ac +--- vim82/src/configure.ac.python-tests 2020-04-17 06:07:48.000000000 +0200 ++++ vim82/src/configure.ac 2020-04-17 06:18:06.750977509 +0200 +@@ -1263,7 +1263,7 @@ eof if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \ "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then vi_cv_path_python_plibs="-framework Python" @@ -31,54 +31,54 @@ diff -up vim80/src/configure.ac.python3-tests vim80/src/configure.ac vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" fi else -diff -up vim80/src/testdir/test_channel_pipe.py.python3-tests vim80/src/testdir/test_channel_pipe.py ---- vim80/src/testdir/test_channel_pipe.py.python3-tests 2018-05-11 09:23:05.738146018 +0200 -+++ vim80/src/testdir/test_channel_pipe.py 2018-05-11 09:26:37.354413350 +0200 +diff -up vim82/src/testdir/test_channel_pipe.py.python-tests vim82/src/testdir/test_channel_pipe.py +--- vim82/src/testdir/test_channel_pipe.py.python-tests 2019-07-26 07:58:53.000000000 +0200 ++++ vim82/src/testdir/test_channel_pipe.py 2020-04-17 06:18:06.751977500 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Server that will communicate over stdin/stderr # -diff -up vim80/src/testdir/test_channel.py.python3-tests vim80/src/testdir/test_channel.py ---- vim80/src/testdir/test_channel.py.python3-tests 2018-05-11 09:22:48.522284266 +0200 -+++ vim80/src/testdir/test_channel.py 2018-05-11 09:26:17.762574955 +0200 +diff -up vim82/src/testdir/test_channel.py.python-tests vim82/src/testdir/test_channel.py +--- vim82/src/testdir/test_channel.py.python-tests 2020-04-17 06:18:06.751977500 +0200 ++++ vim82/src/testdir/test_channel.py 2020-04-17 06:18:24.517813082 +0200 @@ -1,4 +1,4 @@ --#!/usr/bin/python +-#!/usr/bin/env python +#!/usr/bin/python3 # # Server that will accept connections from a Vim channel. # Used by test_channel.vim. -diff -up vim80/src/testdir/test_channel_write.py.python3-tests vim80/src/testdir/test_channel_write.py ---- vim80/src/testdir/test_channel_write.py.python3-tests 2018-05-11 09:23:21.254021422 +0200 -+++ vim80/src/testdir/test_channel_write.py 2018-05-11 09:26:54.952268193 +0200 +diff -up vim82/src/testdir/test_channel_write.py.python-tests vim82/src/testdir/test_channel_write.py +--- vim82/src/testdir/test_channel_write.py.python-tests 2019-07-26 07:58:53.000000000 +0200 ++++ vim82/src/testdir/test_channel_write.py 2020-04-17 06:18:06.751977500 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Program that writes a number to stdout repeatedly # -diff -up vim80/src/testdir/test_makeencoding.py.python3-tests vim80/src/testdir/test_makeencoding.py ---- vim80/src/testdir/test_makeencoding.py.python3-tests 2018-05-11 09:23:38.990878990 +0200 -+++ vim80/src/testdir/test_makeencoding.py 2018-05-11 09:27:14.402107759 +0200 +diff -up vim82/src/testdir/test_makeencoding.py.python-tests vim82/src/testdir/test_makeencoding.py +--- vim82/src/testdir/test_makeencoding.py.python-tests 2019-07-26 07:58:53.000000000 +0200 ++++ vim82/src/testdir/test_makeencoding.py 2020-04-17 06:18:06.751977500 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # Test program for :make, :grep and :cgetfile. -diff -up vim80/src/testdir/test_netbeans.py.python3-tests vim80/src/testdir/test_netbeans.py ---- vim80/src/testdir/test_netbeans.py.python3-tests 2018-05-11 09:23:54.398752732 +0200 -+++ vim80/src/testdir/test_netbeans.py 2018-05-11 09:27:30.489975057 +0200 +diff -up vim82/src/testdir/test_netbeans.py.python-tests vim82/src/testdir/test_netbeans.py +--- vim82/src/testdir/test_netbeans.py.python-tests 2019-07-26 07:58:53.000000000 +0200 ++++ vim82/src/testdir/test_netbeans.py 2020-04-17 06:18:06.751977500 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Server that will communicate with Vim through the netbeans interface. # Used by test_netbeans.vim. -diff -up vim80/src/testdir/test_short_sleep.py.python3-tests vim80/src/testdir/test_short_sleep.py ---- vim80/src/testdir/test_short_sleep.py.python3-tests 2018-05-11 09:24:09.134631798 +0200 -+++ vim80/src/testdir/test_short_sleep.py 2018-05-11 09:27:48.432827053 +0200 +diff -up vim82/src/testdir/test_short_sleep.py.python-tests vim82/src/testdir/test_short_sleep.py +--- vim82/src/testdir/test_short_sleep.py.python-tests 2019-07-26 07:58:53.000000000 +0200 ++++ vim82/src/testdir/test_short_sleep.py 2020-04-17 06:18:06.751977500 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 diff --git a/vim.spec b/vim.spec index 8cc3bc6d..a5d07940 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 534 +%define patchlevel 587 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -246,7 +246,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3013 -p1 %patch3014 -p1 %patch3016 -p1 -b .copypaste -%patch3017 -p1 +%patch3017 -p1 -b .python-tests %patch3018 -p1 %build @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Apr 17 2020 Zdenek Dohnal - 2:8.2.587-1 +- patchlevel 587 + * Thu Apr 09 2020 Zdenek Dohnal - 2:8.2.534-1 - patchlevel 534 From 09b96f43c6d88ea9b1b0d00e455b525029309e9b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 21 Apr 2020 06:23:01 +0200 Subject: [PATCH 164/584] - patchlevel 613 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e5177b6d..fed54850 100644 --- a/.gitignore +++ b/.gitignore @@ -293,3 +293,4 @@ /vim-8.2-525.tar.bz2 /vim-8.2-534.tar.bz2 /vim-8.2-587.tar.bz2 +/vim-8.2-613.tar.bz2 diff --git a/sources b/sources index 838d2f79..50642cad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-587.tar.bz2) = 3bd9af491080275c951ff9aa7176260895b4a5a12b107981feb2beaa1d90bf2551ae5bbbea7a3bafa0cc0fc0f9a36964934055f6cfb2f7805f1f0f371076a531 +SHA512 (vim-8.2-613.tar.bz2) = fc29a29e873bc7247e330997e278b118f0ce663657e53bdec3c19331a8abadf41ea05839913f72aa53d0774e81fa429bd8e49773d601bf9257c6ee0da4d8113a diff --git a/vim.spec b/vim.spec index a5d07940..a441d3cc 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 587 +%define patchlevel 613 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Apr 21 2020 Zdenek Dohnal - 2:8.2.613-1 +- patchlevel 613 + * Fri Apr 17 2020 Zdenek Dohnal - 2:8.2.587-1 - patchlevel 587 From 2f68296d47a07200986d5ae27f8c3f6a30aee13f Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 24 Apr 2020 08:21:00 +0200 Subject: [PATCH 165/584] - patchlevel 628 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fed54850..0733f4b3 100644 --- a/.gitignore +++ b/.gitignore @@ -294,3 +294,4 @@ /vim-8.2-534.tar.bz2 /vim-8.2-587.tar.bz2 /vim-8.2-613.tar.bz2 +/vim-8.2-628.tar.bz2 diff --git a/sources b/sources index 50642cad..998c7a34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-613.tar.bz2) = fc29a29e873bc7247e330997e278b118f0ce663657e53bdec3c19331a8abadf41ea05839913f72aa53d0774e81fa429bd8e49773d601bf9257c6ee0da4d8113a +SHA512 (vim-8.2-628.tar.bz2) = 6785c2057fc1cababac237aa168dc3b5ab757bb55c9c758a11008098ba65cc8f7913e8d00b8ff977b9890d1d3656b66c8f2c5f63270ad429b760772a5699f5c1 diff --git a/vim.spec b/vim.spec index a441d3cc..a1d3d70e 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 613 +%define patchlevel 628 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Apr 24 2020 Zdenek Dohnal - 2:8.2.628-1 +- patchlevel 628 + * Tue Apr 21 2020 Zdenek Dohnal - 2:8.2.613-1 - patchlevel 613 From f499296925400aec34df7e17b4ff1197a0fea071 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 4 May 2020 12:32:23 +0200 Subject: [PATCH 166/584] - patchlevel 694 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0733f4b3..46cb6267 100644 --- a/.gitignore +++ b/.gitignore @@ -295,3 +295,4 @@ /vim-8.2-587.tar.bz2 /vim-8.2-613.tar.bz2 /vim-8.2-628.tar.bz2 +/vim-8.2-694.tar.bz2 diff --git a/sources b/sources index 998c7a34..5356a5a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-628.tar.bz2) = 6785c2057fc1cababac237aa168dc3b5ab757bb55c9c758a11008098ba65cc8f7913e8d00b8ff977b9890d1d3656b66c8f2c5f63270ad429b760772a5699f5c1 +SHA512 (vim-8.2-694.tar.bz2) = 954523d2b37f97eafd19132090bd6bd19d07248e14c719fc6552ce7f799a35758682c4314f57efa8b8fa218202a96c1c69982956b64897a342feb74b3644a653 diff --git a/vim.spec b/vim.spec index a1d3d70e..7a30f414 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 628 +%define patchlevel 694 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon May 04 2020 Zdenek Dohnal - 2:8.2.694-1 +- patchlevel 694 + * Fri Apr 24 2020 Zdenek Dohnal - 2:8.2.628-1 - patchlevel 628 From b302d026dcec92a760ca02c4919623cd64aec749 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 11 May 2020 10:14:12 +0200 Subject: [PATCH 167/584] - patchlevel 735 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 46cb6267..78596e47 100644 --- a/.gitignore +++ b/.gitignore @@ -296,3 +296,4 @@ /vim-8.2-613.tar.bz2 /vim-8.2-628.tar.bz2 /vim-8.2-694.tar.bz2 +/vim-8.2-735.tar.bz2 diff --git a/sources b/sources index 5356a5a8..e0106406 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-694.tar.bz2) = 954523d2b37f97eafd19132090bd6bd19d07248e14c719fc6552ce7f799a35758682c4314f57efa8b8fa218202a96c1c69982956b64897a342feb74b3644a653 +SHA512 (vim-8.2-735.tar.bz2) = df84d7e5dc7b6e436465a9d475ca47bbf17c585becec80470ed17e51c67c45edf0c4a9d06715cd6cd8c664519e719833bd66c0072e62188b841b300acc65aeef diff --git a/vim.spec b/vim.spec index 7a30f414..74aa6f20 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 694 +%define patchlevel 735 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon May 11 2020 Zdenek Dohnal - 2:8.2.735-1 +- patchlevel 735 + * Mon May 04 2020 Zdenek Dohnal - 2:8.2.694-1 - patchlevel 694 From 13db6e73402b43653803d0ad4690b31e3f505f60 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 14 May 2020 07:01:00 +0200 Subject: [PATCH 168/584] - patchlevel 752 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 78596e47..2f7d2ac9 100644 --- a/.gitignore +++ b/.gitignore @@ -297,3 +297,4 @@ /vim-8.2-628.tar.bz2 /vim-8.2-694.tar.bz2 /vim-8.2-735.tar.bz2 +/vim-8.2-752.tar.bz2 diff --git a/sources b/sources index e0106406..dea22144 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-735.tar.bz2) = df84d7e5dc7b6e436465a9d475ca47bbf17c585becec80470ed17e51c67c45edf0c4a9d06715cd6cd8c664519e719833bd66c0072e62188b841b300acc65aeef +SHA512 (vim-8.2-752.tar.bz2) = b06f8d717ea83db1cdbede11d85c4106a97ab5cf25b1ba6b2ec48be09a0ea20fc7328445bfc9eb226dfc7487ace0d633ce45531c879d42853c4d8cd27691bc50 diff --git a/vim.spec b/vim.spec index 74aa6f20..9b8ed3eb 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 735 +%define patchlevel 752 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu May 14 2020 Zdenek Dohnal - 2:8.2.752-1 +- patchlevel 752 + * Mon May 11 2020 Zdenek Dohnal - 2:8.2.735-1 - patchlevel 735 From d755431f35b59ea11d7629e2b6087731243c23e1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 14 May 2020 08:35:54 +0200 Subject: [PATCH 169/584] F30 will be EOL in less than 14 days, remove it from automatic updates --- vim-update.sh | 8 ++++---- vim.spec | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/vim-update.sh b/vim-update.sh index ca33c9e8..a85d75fe 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -1,10 +1,10 @@ #!/bin/bash debug="" #debug="echo " -branches=( "master" "f32" "f31" "f30" ) -releases=( "fc33" "fc32" "fc31" "fc30" ) -regexps=( "fc33" "\|fc32" "\|fc31" "\|fc30" ) -bodhi_enabled=( "0" "1" "1" "1" ) +branches=( "master" "f32" "f31" ) +releases=( "fc33" "fc32" "fc31" ) +regexps=( "fc33" "\|fc32" "\|fc31" ) +bodhi_enabled=( "0" "1" "1" ) #releases_regexp=fc28\\\|fc27\\\|fc28 branches_index=0 diff --git a/vim.spec b/vim.spec index 9b8ed3eb..09025464 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: vim.sh @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu May 14 2020 Zdenek Dohnal - 2:8.2.752-2 +- F30 will be EOL in less than 14 days, remove it from automatic updates + * Thu May 14 2020 Zdenek Dohnal - 2:8.2.752-1 - patchlevel 752 From ab24f8ac5d7ed64a34a5fa403d6f05d640898ea0 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 18 May 2020 13:54:49 +0200 Subject: [PATCH 170/584] - patchlevel 789 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2f7d2ac9..c452172d 100644 --- a/.gitignore +++ b/.gitignore @@ -298,3 +298,4 @@ /vim-8.2-694.tar.bz2 /vim-8.2-735.tar.bz2 /vim-8.2-752.tar.bz2 +/vim-8.2-789.tar.bz2 diff --git a/sources b/sources index dea22144..3fbbc776 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-752.tar.bz2) = b06f8d717ea83db1cdbede11d85c4106a97ab5cf25b1ba6b2ec48be09a0ea20fc7328445bfc9eb226dfc7487ace0d633ce45531c879d42853c4d8cd27691bc50 +SHA512 (vim-8.2-789.tar.bz2) = 5ea2d2b7c422252e2c9eb82ff5e08c51fe6038a2443dfde2af34cfccab8ae0f5496b4d71cca4a87f7d6eea3b8bbe9bda8503855028ff998187c9afd4180842e7 diff --git a/vim.spec b/vim.spec index 09025464..5da6b1e8 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 752 +%define patchlevel 789 %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: vim.sh @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon May 18 2020 Zdenek Dohnal - 2:8.2.789-1 +- patchlevel 789 + * Thu May 14 2020 Zdenek Dohnal - 2:8.2.752-2 - F30 will be EOL in less than 14 days, remove it from automatic updates From ac805f39927e3abb5d25e4aaf1236905d03ca5a9 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 22 May 2020 10:32:14 +0200 Subject: [PATCH 171/584] - patchlevel 806 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c452172d..c075bacc 100644 --- a/.gitignore +++ b/.gitignore @@ -299,3 +299,4 @@ /vim-8.2-735.tar.bz2 /vim-8.2-752.tar.bz2 /vim-8.2-789.tar.bz2 +/vim-8.2-806.tar.bz2 diff --git a/sources b/sources index 3fbbc776..e623ccdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-789.tar.bz2) = 5ea2d2b7c422252e2c9eb82ff5e08c51fe6038a2443dfde2af34cfccab8ae0f5496b4d71cca4a87f7d6eea3b8bbe9bda8503855028ff998187c9afd4180842e7 +SHA512 (vim-8.2-806.tar.bz2) = caed7b1259c6ace373e63c233fd3313279db4b7fed84ffe595426b0830d3e04bc84bb603794a34720540af279e9837be4a62ec2dd1ac2fd81a166a0ae86fb452 diff --git a/vim.spec b/vim.spec index 5da6b1e8..89d35693 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 789 +%define patchlevel 806 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri May 22 2020 Zdenek Dohnal - 2:8.2.806-1 +- patchlevel 806 + * Mon May 18 2020 Zdenek Dohnal - 2:8.2.789-1 - patchlevel 789 From 36d8efb22df72bf5c9b3b787101ac32832044eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:54:36 +0200 Subject: [PATCH 172/584] Rebuilt for Python 3.9 --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 89d35693..ca6a7adb 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: vim.sh @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue May 26 2020 Miro Hrončok - 2:8.2.806-2 +- Rebuilt for Python 3.9 + * Fri May 22 2020 Zdenek Dohnal - 2:8.2.806-1 - patchlevel 806 From 2f0fe435e6bb7a40a46570b12ab9fbfcee93d404 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 28 May 2020 09:06:10 +0200 Subject: [PATCH 173/584] - patchlevel 834 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c075bacc..49741056 100644 --- a/.gitignore +++ b/.gitignore @@ -300,3 +300,4 @@ /vim-8.2-752.tar.bz2 /vim-8.2-789.tar.bz2 /vim-8.2-806.tar.bz2 +/vim-8.2-834.tar.bz2 diff --git a/sources b/sources index e623ccdb..1147e185 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-806.tar.bz2) = caed7b1259c6ace373e63c233fd3313279db4b7fed84ffe595426b0830d3e04bc84bb603794a34720540af279e9837be4a62ec2dd1ac2fd81a166a0ae86fb452 +SHA512 (vim-8.2-834.tar.bz2) = db74a4c721706aba9f1ce1fab1a42387a7ff056eb093d557c969d6bb7cfd3bd942e4f8a60a32cce71794748b3328c275ce5cdc43df1fbc52bf9e9af826e6598f diff --git a/vim.spec b/vim.spec index ca6a7adb..a977cecf 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 806 +%define patchlevel 834 %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: vim.sh @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu May 28 2020 Zdenek Dohnal - 2:8.2.834-1 +- patchlevel 834 + * Tue May 26 2020 Miro Hrončok - 2:8.2.806-2 - Rebuilt for Python 3.9 From 83b08fd66a96381c2bffd3e8c5fb3b46314e61f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 28 May 2020 14:53:18 +0200 Subject: [PATCH 174/584] Rebuilt for Python 3.9 --- vim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index a977cecf..e14258a6 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: vim.sh @@ -783,6 +783,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu May 28 2020 Miro Hrončok - 2:8.2.834-2 +- Rebuilt for Python 3.9 + * Thu May 28 2020 Zdenek Dohnal - 2:8.2.834-1 - patchlevel 834 From d4d5b349031bcbb67ca17331371bd2006697e888 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 1 Jun 2020 08:12:20 +0200 Subject: [PATCH 175/584] - patchlevel 869 --- .gitignore | 1 + sources | 2 +- vim.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 49741056..68cd3c23 100644 --- a/.gitignore +++ b/.gitignore @@ -301,3 +301,4 @@ /vim-8.2-789.tar.bz2 /vim-8.2-806.tar.bz2 /vim-8.2-834.tar.bz2 +/vim-8.2-869.tar.bz2 diff --git a/sources b/sources index 1147e185..3944c475 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-834.tar.bz2) = db74a4c721706aba9f1ce1fab1a42387a7ff056eb093d557c969d6bb7cfd3bd942e4f8a60a32cce71794748b3328c275ce5cdc43df1fbc52bf9e9af826e6598f +SHA512 (vim-8.2-869.tar.bz2) = 1b5ce09e138035b138b0f127f863cc093cee8360689fb96b3e96d4745c91f66d453cd16907bb0896df19f7165c525bb637d449cb61787a6cc8f501ee09566ce6 diff --git a/vim.spec b/vim.spec index e14258a6..9ad79184 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 834 +%define patchlevel 869 %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: vim.sh @@ -543,7 +543,7 @@ rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/doc/vim2html.pl rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/tutor/tutor.gr.utf-8~ # Remove not UTF-8 manpages -for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1 da.ISO8859-1 de.ISO8859-1; do +for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1 da.ISO8859-1 de.ISO8859-1 tr.ISO8859-9; do rm -rf %{buildroot}/%{_mandir}/$i done @@ -551,7 +551,7 @@ done mv %{buildroot}/%{_mandir}/ru.UTF-8 %{buildroot}/%{_mandir}/ru # Remove duplicate man pages -for i in fr.UTF-8 it.UTF-8 pl.UTF-8 da.UTF-8 de.UTF-8; do +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 @@ -662,6 +662,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %lang(ja) %{_mandir}/ja/man1/* %lang(pl) %{_mandir}/pl/man1/* %lang(ru) %{_mandir}/ru/man1/* +%lang(tr) %{_mandir}/tr/man1/* %if %{withvimspell} %files spell @@ -783,6 +784,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jun 01 2020 Zdenek Dohnal - 2:8.2.869-1 +- patchlevel 869 + * Thu May 28 2020 Miro Hrončok - 2:8.2.834-2 - Rebuilt for Python 3.9 From 798b4456505821c9eb02916fa5bcf71f98c57a7e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 2 Jun 2020 08:31:30 +0200 Subject: [PATCH 176/584] remove tests from dist-git, we use base os ci --- .../Makefile | 63 ------------------ .../PURPOSE | 9 --- .../runtest.sh | 64 ------------------- tests/tests.yml | 23 ------- .../Makefile | 63 ------------------ .../PURPOSE | 3 - .../exdoublequote | 2 - .../expounddoublequote | 2 - .../runtest.sh | 46 ------------- vim.spec | 5 +- 10 files changed, 4 insertions(+), 276 deletions(-) delete mode 100644 tests/netrw-plugin-delete-command-broken/Makefile delete mode 100644 tests/netrw-plugin-delete-command-broken/PURPOSE delete mode 100755 tests/netrw-plugin-delete-command-broken/runtest.sh delete mode 100644 tests/tests.yml delete mode 100644 tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile delete mode 100644 tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE delete mode 100644 tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote delete mode 100644 tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote delete mode 100755 tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh diff --git a/tests/netrw-plugin-delete-command-broken/Makefile b/tests/netrw-plugin-delete-command-broken/Makefile deleted file mode 100644 index 5e02ce37..00000000 --- a/tests/netrw-plugin-delete-command-broken/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of netrw-plugin-delete-command-broken -# Description: Test for netrw plugin: delete command broken -# Author: Petr Splichal -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2009 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/vim/Regression/netrw-plugin-delete-command-broken -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Petr Splichal " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for netrw plugin: delete command broken" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: vim" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Requires: vim-enhanced" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/netrw-plugin-delete-command-broken/PURPOSE b/tests/netrw-plugin-delete-command-broken/PURPOSE deleted file mode 100644 index 45af60a3..00000000 --- a/tests/netrw-plugin-delete-command-broken/PURPOSE +++ /dev/null @@ -1,9 +0,0 @@ -PURPOSE of netrw-plugin-delete-command-broken -Description: Test for netrw plugin: delete command broken -Author: Petr Splichal -Summary: netrw plugin: delete command broken - -Description: - -Regression to to verify the delete command of netrw plugin -successfully deletes files or directories. diff --git a/tests/netrw-plugin-delete-command-broken/runtest.sh b/tests/netrw-plugin-delete-command-broken/runtest.sh deleted file mode 100755 index 6dbf8c43..00000000 --- a/tests/netrw-plugin-delete-command-broken/runtest.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/vim/Regression/netrw-plugin-delete-command-broken -# Description: Test for netrw plugin: delete command broken -# Author: Petr Splichal -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2009 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include rhts environment -. /usr/bin/rhts-environment.sh -. /usr/share/rhts-library/rhtslib.sh - -PACKAGE="vim-enhanced" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - # create test file & dir - rlRun "touch testfile" 0 "Creating test file" - rlRun "mkdir testdir" 0 "Creating test directory" - rlAssertExists "testfile" - rlAssertExists "testdir" - # create vim scripts - rlRun "echo '/testfile Dy :q' > scriptfile" \ - 0 "Creating file delete script" - rlRun "echo '/testdir Dy :q' > scriptdir" \ - 0 "Creating directory delete script" - rlPhaseEnd - - rlPhaseStartTest - rlRun "vim . -s scriptfile" 0 "Deleting file using netrw" - rlAssertNotExists "testfile" - rlRun "vim . -s scriptdir" 0 "Deleting directory using netrw" - rlAssertNotExists "testdir" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 7f01b5af..00000000 --- a/tests/tests.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# This first play always runs on the local staging system -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - - container - tests: - - netrw-plugin-delete-command-broken - - vim-in-ex-mode-incorrectly-gives-an-eol-error - required_packages: - - vim-minimal - - vim-enhanced - -# Tests for Atomic Host -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - atomic - tests: - - vim-in-ex-mode-incorrectly-gives-an-eol-error diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile deleted file mode 100644 index 45099dde..00000000 --- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error -# Description: Test for vim in ex mode incorrectly gives an eol error -# Author: David Kutalek -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2010 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE exdoublequote expounddoublequote - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: David Kutalek " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for vim in ex mode incorrectly gives an eol error" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: vim" >> $(METADATA) - @echo "Requires: vim-minimal" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE deleted file mode 100644 index 0d6d11a2..00000000 --- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error -Description: Test for vim in ex mode incorrectly gives an eol error -Author: David Kutalek diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote deleted file mode 100644 index 4037c883..00000000 --- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote +++ /dev/null @@ -1,2 +0,0 @@ -" comment -q diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote deleted file mode 100644 index ff821153..00000000 --- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote +++ /dev/null @@ -1,2 +0,0 @@ -#" comment -q diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh deleted file mode 100755 index 20967bc6..00000000 --- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error -# Description: Test for vim in ex mode incorrectly gives an eol error -# Author: David Kutalek -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2010 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include rhts environment -. /usr/bin/rhts-environment.sh -. /usr/lib/beakerlib/beakerlib.sh - -PACKAGE="vim" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm vim-minimal - rlPhaseEnd - - rlPhaseStartTest - rlRun "ex -u NONE ~/.bash_profile < ./exdoublequote" - rlRun "ex -u NONE ~/.bash_profile < ./expounddoublequote" - rlPhaseEnd - -rlJournalPrintText -rlJournalEnd diff --git a/vim.spec b/vim.spec index 9ad79184..e17180d6 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: vim.sh @@ -784,6 +784,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jun 02 2020 Zdenek Dohnal - 2:8.2.869-2 +- remove tests from dist-git, we use base os ci + * Mon Jun 01 2020 Zdenek Dohnal - 2:8.2.869-1 - patchlevel 869 From 48608571d12a72557d8a4527f44e477fb148dec5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 5 Jun 2020 07:08:00 +0200 Subject: [PATCH 177/584] - patchlevel 905 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 68cd3c23..96063325 100644 --- a/.gitignore +++ b/.gitignore @@ -302,3 +302,4 @@ /vim-8.2-806.tar.bz2 /vim-8.2-834.tar.bz2 /vim-8.2-869.tar.bz2 +/vim-8.2-905.tar.bz2 diff --git a/sources b/sources index 3944c475..41cb06ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-869.tar.bz2) = 1b5ce09e138035b138b0f127f863cc093cee8360689fb96b3e96d4745c91f66d453cd16907bb0896df19f7165c525bb637d449cb61787a6cc8f501ee09566ce6 +SHA512 (vim-8.2-905.tar.bz2) = 7d1928a6584b3aaac67626d1d94b5470cd0db5076e0b99d6bbcf06cdf76a1c77041af3b0484043aaceddda2dd85e10dcfb2f68f0670f189b91f8c553a833cb8d diff --git a/vim.spec b/vim.spec index e17180d6..e1b4e336 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 869 +%define patchlevel 905 %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: vim.sh @@ -784,6 +784,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jun 05 2020 Zdenek Dohnal - 2:8.2.905-1 +- patchlevel 905 + * Tue Jun 02 2020 Zdenek Dohnal - 2:8.2.869-2 - remove tests from dist-git, we use base os ci From ba28c77a8daecceee305104fb51af438df870028 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 16 Jun 2020 15:09:02 +0200 Subject: [PATCH 178/584] - patchlevel 987 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 96063325..ee0b6a51 100644 --- a/.gitignore +++ b/.gitignore @@ -303,3 +303,4 @@ /vim-8.2-834.tar.bz2 /vim-8.2-869.tar.bz2 /vim-8.2-905.tar.bz2 +/vim-8.2-987.tar.bz2 diff --git a/sources b/sources index 41cb06ff..5cd871ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-905.tar.bz2) = 7d1928a6584b3aaac67626d1d94b5470cd0db5076e0b99d6bbcf06cdf76a1c77041af3b0484043aaceddda2dd85e10dcfb2f68f0670f189b91f8c553a833cb8d +SHA512 (vim-8.2-987.tar.bz2) = 7ecb48d456199cecca774e09dff16cd0e5f218d0900e7363d983bad51f7929490d78b80636a1b2c906158283a40219a4ae646183be2fddde7b25e7a9cc151c46 diff --git a/vim.spec b/vim.spec index e1b4e336..5248158b 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 905 +%define patchlevel 987 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -784,6 +784,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jun 16 2020 Zdenek Dohnal - 2:8.2.987-1 +- patchlevel 987 + * Fri Jun 05 2020 Zdenek Dohnal - 2:8.2.905-1 - patchlevel 905 From e4f1099f5cd5f5a139f2edc52bfeab7d1b7af4a9 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 17 Jun 2020 13:39:39 +0200 Subject: [PATCH 179/584] - patchlevel 993 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ee0b6a51..f0511b36 100644 --- a/.gitignore +++ b/.gitignore @@ -304,3 +304,4 @@ /vim-8.2-869.tar.bz2 /vim-8.2-905.tar.bz2 /vim-8.2-987.tar.bz2 +/vim-8.2-993.tar.bz2 diff --git a/sources b/sources index 5cd871ee..08456ebf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-987.tar.bz2) = 7ecb48d456199cecca774e09dff16cd0e5f218d0900e7363d983bad51f7929490d78b80636a1b2c906158283a40219a4ae646183be2fddde7b25e7a9cc151c46 +SHA512 (vim-8.2-993.tar.bz2) = 9aedc8d408f669b2bfba342809a67bc58fa9a026eddeb08fb854d893ed31d1e08fc0e15ce62d2aa024b3a22c75a0795181323cfba07b5d5fe99e6d80bb91a8c0 diff --git a/vim.spec b/vim.spec index 5248158b..9d064471 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 987 +%define patchlevel 993 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -784,6 +784,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Jun 17 2020 Zdenek Dohnal - 2:8.2.993-1 +- patchlevel 993 + * Tue Jun 16 2020 Zdenek Dohnal - 2:8.2.987-1 - patchlevel 987 From 7bc5380b4041d638caf0f3a98c9ca596225aba1e Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 19 Jun 2020 06:25:15 +0200 Subject: [PATCH 180/584] - patchlevel 1009 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f0511b36..c7ab2b01 100644 --- a/.gitignore +++ b/.gitignore @@ -305,3 +305,4 @@ /vim-8.2-905.tar.bz2 /vim-8.2-987.tar.bz2 /vim-8.2-993.tar.bz2 +/vim-8.2-1009.tar.bz2 diff --git a/sources b/sources index 08456ebf..79492163 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-993.tar.bz2) = 9aedc8d408f669b2bfba342809a67bc58fa9a026eddeb08fb854d893ed31d1e08fc0e15ce62d2aa024b3a22c75a0795181323cfba07b5d5fe99e6d80bb91a8c0 +SHA512 (vim-8.2-1009.tar.bz2) = ade4ca00a331698ddb4bd9dc2ed78268a099af94237f7c8bf9158654189785d9f212fca6052b6235efb3026a3c3862723b66ed83adb18a07c1d4719baf203aec diff --git a/vim.spec b/vim.spec index 9d064471..39752cc9 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 993 +%define patchlevel 1009 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -784,6 +784,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jun 19 2020 Zdenek Dohnal - 2:8.2.1009-1 +- patchlevel 1009 + * Wed Jun 17 2020 Zdenek Dohnal - 2:8.2.993-1 - patchlevel 993 From 1e1a9d2c97f6fa13a51d313384fb7a474ad320f4 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 25 Jun 2020 06:40:49 +0200 Subject: [PATCH 181/584] - patchlevel 1052 --- .gitignore | 1 + sources | 2 +- vim.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c7ab2b01..4eb9c97e 100644 --- a/.gitignore +++ b/.gitignore @@ -306,3 +306,4 @@ /vim-8.2-987.tar.bz2 /vim-8.2-993.tar.bz2 /vim-8.2-1009.tar.bz2 +/vim-8.2-1052.tar.bz2 diff --git a/sources b/sources index 79492163..c87d13c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-1009.tar.bz2) = ade4ca00a331698ddb4bd9dc2ed78268a099af94237f7c8bf9158654189785d9f212fca6052b6235efb3026a3c3862723b66ed83adb18a07c1d4719baf203aec +SHA512 (vim-8.2-1052.tar.bz2) = 62ddfc87bfa0b5fe7b9a1c1f492f5fdd47b5c669c3f05c48f508b2624780561a7a6f0f7b5649ff75244a5cf287d74b37087f5cb665ed454b93c1705b37038d3f diff --git a/vim.spec b/vim.spec index 39752cc9..03b70157 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1009 +%define patchlevel 1052 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -784,6 +784,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jun 25 2020 Zdenek Dohnal - 2:8.2.1052-1 +- patchlevel 1052 + * Fri Jun 19 2020 Zdenek Dohnal - 2:8.2.1009-1 - patchlevel 1009 From e632526c80b8c0e77087bbc23349c783f1d2f179 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 25 Jun 2020 14:23:56 +0200 Subject: [PATCH 182/584] remove python2 stuff for RHEL --- vim.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/vim.spec b/vim.spec index 03b70157..9e4d6ae2 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: vim.sh @@ -250,10 +250,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3018 -p1 %build -%if 0%{?rhel} > 7 -export RHEL_ALLOW_PYTHON2_FOR_BUILD=1 -%endif - cd src autoconf @@ -784,6 +780,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Thu Jun 25 2020 Zdenek Dohnal - 2:8.2.1052-2 +- remove python2 stuff for RHEL + * Thu Jun 25 2020 Zdenek Dohnal - 2:8.2.1052-1 - patchlevel 1052 From a876979c811ed375b308186b7ebc72935a376817 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 25 Jun 2020 14:49:21 +0200 Subject: [PATCH 183/584] %%{fedora} macro is undefined in ELN, causes python3-config to use old options --- vim.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vim.spec b/vim.spec index 9e4d6ae2..61de654c 100644 --- a/vim.spec +++ b/vim.spec @@ -297,7 +297,7 @@ make clean mv -f os_unix.h.save os_unix.h mv -f ex_cmds.c.save ex_cmds.c -%if 0%{?fedora} > 31 +%if 0%{?fedora} > 31 || 0%{?rhel} > 8 export LDFLAGS="%{build_ldflags} $(python3-config --libs --embed)" %else export LDFLAGS="%{build_ldflags} $(python3-config --libs)" @@ -782,6 +782,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %changelog * Thu Jun 25 2020 Zdenek Dohnal - 2:8.2.1052-2 - remove python2 stuff for RHEL +- %%{fedora} macro is undefined in ELN, causes python3-config to use old options * Thu Jun 25 2020 Zdenek Dohnal - 2:8.2.1052-1 - patchlevel 1052 From 4d7920364daeb002a488b7143b25e59531cba541 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 29 Jun 2020 09:16:09 +0200 Subject: [PATCH 184/584] - patchlevel 1081 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4eb9c97e..e449f22d 100644 --- a/.gitignore +++ b/.gitignore @@ -307,3 +307,4 @@ /vim-8.2-993.tar.bz2 /vim-8.2-1009.tar.bz2 /vim-8.2-1052.tar.bz2 +/vim-8.2-1081.tar.bz2 diff --git a/sources b/sources index c87d13c4..abeb9a27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-1052.tar.bz2) = 62ddfc87bfa0b5fe7b9a1c1f492f5fdd47b5c669c3f05c48f508b2624780561a7a6f0f7b5649ff75244a5cf287d74b37087f5cb665ed454b93c1705b37038d3f +SHA512 (vim-8.2-1081.tar.bz2) = 1e0f4fa6283d00166f85792205b17b2e7741dc63204ba3e3db8eed1729e20e3c8f1a49e8a31f471b65e17e16d9ea54b389749889fd52dabe738189f8520bad12 diff --git a/vim.spec b/vim.spec index 61de654c..604d431f 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1052 +%define patchlevel 1081 %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: vim.sh @@ -780,6 +780,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jun 29 2020 Zdenek Dohnal - 2:8.2.1081-1 +- patchlevel 1081 + * Thu Jun 25 2020 Zdenek Dohnal - 2:8.2.1052-2 - remove python2 stuff for RHEL - %%{fedora} macro is undefined in ELN, causes python3-config to use old options From ebb22f2162c98e62c7ceb95ae3941d37c447c3a8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 13 Jul 2020 11:50:51 +0200 Subject: [PATCH 185/584] - patchlevel 1199 --- .gitignore | 1 + sources | 2 +- vim-lua-ftbfs.patch | 13 +++++++++++++ vim.spec | 20 +++++++++++++++++--- 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 vim-lua-ftbfs.patch diff --git a/.gitignore b/.gitignore index e449f22d..6f4ac6ed 100644 --- a/.gitignore +++ b/.gitignore @@ -308,3 +308,4 @@ /vim-8.2-1009.tar.bz2 /vim-8.2-1052.tar.bz2 /vim-8.2-1081.tar.bz2 +/vim-8.2-1199.tar.bz2 diff --git a/sources b/sources index abeb9a27..ad242b88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-1081.tar.bz2) = 1e0f4fa6283d00166f85792205b17b2e7741dc63204ba3e3db8eed1729e20e3c8f1a49e8a31f471b65e17e16d9ea54b389749889fd52dabe738189f8520bad12 +SHA512 (vim-8.2-1199.tar.bz2) = 4a3d7c972c5406a928291457e21bb041bd532833c3f092ba058b8a9a3512beefd1a3271bb45259c0b3aec5afbfa88e357db40fe8ec90739b5919588d8c0ad59d diff --git a/vim-lua-ftbfs.patch b/vim-lua-ftbfs.patch new file mode 100644 index 00000000..b4bbb678 --- /dev/null +++ b/vim-lua-ftbfs.patch @@ -0,0 +1,13 @@ +diff --git a/src/if_lua.c b/src/if_lua.c +index 9852c61..21141d8 100644 +--- a/src/if_lua.c ++++ b/src/if_lua.c +@@ -457,7 +457,7 @@ lua_enabled(int verbose) + } + #endif + +-#if LUA_VERSION_NUM > 501 ++#if LUA_VERSION_NUM > 501 && LUA_VERSION_NUM < 504 + static int + luaL_typeerror(lua_State *L, int narg, const char *tname) + { diff --git a/vim.spec b/vim.spec index 604d431f..63e34fcc 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1081 +%define patchlevel 1199 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -61,6 +61,7 @@ Patch3016: vim-8.0-copy-paste.patch Patch3017: vim-python3-tests.patch # fips warning Patch3018: vim-crypto-warning.patch +Patch3019: vim-lua-ftbfs.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -248,6 +249,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3016 -p1 -b .copypaste %patch3017 -p1 -b .python-tests %patch3018 -p1 +%patch3019 -p1 -b .lua-ftbfs %build cd src @@ -297,10 +299,19 @@ make clean mv -f os_unix.h.save os_unix.h mv -f ex_cmds.c.save ex_cmds.c +# since Lua 5.4.0, we need to add lua linker flag +export LDFLAGS="%{build_ldflags} -llua" +# python introduced incompatible change in getting linker flags for compiling programs +# which use C python API. Remove %%if after F31 going EOL and leave the single export here. +# This LDFLAGS settings needs to be before vim+gvim configuration and after vi configuration +# to prevent vi (doesn't have python embedded interpreter) be linked with python. +# When assigning to LDFLAGS, we join the current LDFLAGS with python linker flags - it is +# because we already defined LDFLAGS above when Lua linker flag was added. If the manual +# Lua linker flag adding goes away, use %%{build_ldflags} in the concatenation instead of LDFLAGS %if 0%{?fedora} > 31 || 0%{?rhel} > 8 -export LDFLAGS="%{build_ldflags} $(python3-config --libs --embed)" +export LDFLAGS="$LDFLAGS $(python3-config --libs --embed)" %else -export LDFLAGS="%{build_ldflags} $(python3-config --libs)" +export LDFLAGS="$LDFLAGS $(python3-config --libs)" %endif # More configure options: @@ -780,6 +791,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jul 13 2020 Zdenek Dohnal - 2:8.2.1199-1 +- patchlevel 1199 + * Mon Jun 29 2020 Zdenek Dohnal - 2:8.2.1081-1 - patchlevel 1081 From ec9b186e632e402671c74ee2c940f67bb1728809 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 14 Jul 2020 12:46:01 +0200 Subject: [PATCH 186/584] FTBFS with Lua - backported patch from upstream pull request to prevent linking with lua --- vim-lua-ftbfs.patch | 47 +++++++++++++++++++++++++++++++++++++++++++-- vim.spec | 9 +++++---- 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/vim-lua-ftbfs.patch b/vim-lua-ftbfs.patch index b4bbb678..22769ff1 100644 --- a/vim-lua-ftbfs.patch +++ b/vim-lua-ftbfs.patch @@ -1,8 +1,48 @@ +From ea3ebd50e2a4ec26ee503f352a1280e11e4af93b Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Tue, 14 Jul 2020 12:14:03 +0200 +Subject: [PATCH] if_lua.c: new Lua 5.4.0 defines luaL_typeerror, so don't + define it twice + +--- + src/if_lua.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + diff --git a/src/if_lua.c b/src/if_lua.c -index 9852c61..21141d8 100644 +index 9852c618e..f25c47b53 100644 --- a/src/if_lua.c +++ b/src/if_lua.c -@@ -457,7 +457,7 @@ lua_enabled(int verbose) +@@ -120,6 +120,9 @@ static void luaV_call_lua_func_free(void *state); + #define luaL_loadbufferx dll_luaL_loadbufferx + #define luaL_argerror dll_luaL_argerror + #endif ++#if LUA_VERSION_NUM >= 504 ++#define luaL_typeerror dll_luaL_typeerror ++#endif + #define luaL_checkany dll_luaL_checkany + #define luaL_checklstring dll_luaL_checklstring + #define luaL_checkinteger dll_luaL_checkinteger +@@ -217,6 +220,9 @@ int (*dll_luaL_loadfilex) (lua_State *L, const char *filename, const char *mode) + int (*dll_luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode); + int (*dll_luaL_argerror) (lua_State *L, int numarg, const char *extramsg); + #endif ++#if LUA_VERSION_NUM >= 504 ++int (*dll_luaL_typeerror) (lua_State *L, int narg, const char *tname); ++#endif + void (*dll_luaL_checkany) (lua_State *L, int narg); + const char *(*dll_luaL_checklstring) (lua_State *L, int numArg, size_t *l); + lua_Integer (*dll_luaL_checkinteger) (lua_State *L, int numArg); +@@ -335,6 +341,9 @@ static const luaV_Reg luaV_dll[] = { + {"luaL_loadfilex", (luaV_function) &dll_luaL_loadfilex}, + {"luaL_loadbufferx", (luaV_function) &dll_luaL_loadbufferx}, + {"luaL_argerror", (luaV_function) &dll_luaL_argerror}, ++#endif ++#if LUA_VERSION_NUM >= 504 ++ {"luaL_typeerror", (luaV_function) &dll_luaL_typeerror}, + #endif + {"luaL_checkany", (luaV_function) &dll_luaL_checkany}, + {"luaL_checklstring", (luaV_function) &dll_luaL_checklstring}, +@@ -457,7 +466,7 @@ lua_enabled(int verbose) } #endif @@ -11,3 +51,6 @@ index 9852c61..21141d8 100644 static int luaL_typeerror(lua_State *L, int narg, const char *tname) { +-- +2.25.4 + diff --git a/vim.spec b/vim.spec index 63e34fcc..149f2982 100644 --- a/vim.spec +++ b/vim.spec @@ -299,8 +299,6 @@ make clean mv -f os_unix.h.save os_unix.h mv -f ex_cmds.c.save ex_cmds.c -# since Lua 5.4.0, we need to add lua linker flag -export LDFLAGS="%{build_ldflags} -llua" # python introduced incompatible change in getting linker flags for compiling programs # which use C python API. Remove %%if after F31 going EOL and leave the single export here. # This LDFLAGS settings needs to be before vim+gvim configuration and after vi configuration @@ -309,9 +307,9 @@ export LDFLAGS="%{build_ldflags} -llua" # because we already defined LDFLAGS above when Lua linker flag was added. If the manual # Lua linker flag adding goes away, use %%{build_ldflags} in the concatenation instead of LDFLAGS %if 0%{?fedora} > 31 || 0%{?rhel} > 8 -export LDFLAGS="$LDFLAGS $(python3-config --libs --embed)" +export LDFLAGS="%{build_ldflags} $(python3-config --libs --embed)" %else -export LDFLAGS="$LDFLAGS $(python3-config --libs)" +export LDFLAGS="%{build_ldflags} $(python3-config --libs)" %endif # More configure options: @@ -791,6 +789,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Mon Jul 13 2020 Zdenek Dohnal - 2:8.2.1199-1 +- FTBFS with Lua - backported patch from upstream pull request to prevent linking with lua + * Mon Jul 13 2020 Zdenek Dohnal - 2:8.2.1199-1 - patchlevel 1199 From 19385b74ef1d8dc9a4676818ff6389017d9b536c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 15 Jul 2020 12:28:48 +0200 Subject: [PATCH 187/584] fix python3 dynamic linking with python >= 3.8 --- ...ing-linker-errors-in-dynamically-lin.patch | 137 ++++++++++++++++++ vim.spec | 23 +-- 2 files changed, 145 insertions(+), 15 deletions(-) create mode 100644 0001-if_python3.c-Fixing-linker-errors-in-dynamically-lin.patch diff --git a/0001-if_python3.c-Fixing-linker-errors-in-dynamically-lin.patch b/0001-if_python3.c-Fixing-linker-errors-in-dynamically-lin.patch new file mode 100644 index 00000000..65f06bcd --- /dev/null +++ b/0001-if_python3.c-Fixing-linker-errors-in-dynamically-lin.patch @@ -0,0 +1,137 @@ +From 4fb89067dca5cee1611461badcbb80a1a36ae963 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Wed, 15 Jul 2020 10:45:26 +0200 +Subject: [PATCH] if_python3.c: Fixing linker errors in dynamically linked + python3 interpreter + +--- + src/if_python3.c | 31 +++++++++++++++++++++++-------- + 1 file changed, 23 insertions(+), 8 deletions(-) + +diff --git a/src/if_python3.c b/src/if_python3.c +index d540226b3..8c85708da 100644 +--- a/src/if_python3.c ++++ b/src/if_python3.c +@@ -203,6 +203,9 @@ typedef PySliceObject PySliceObject_T; + # define PySys_GetObject py3_PySys_GetObject + # define PySys_SetArgv py3_PySys_SetArgv + # define PyType_Ready py3_PyType_Ready ++# if PY_VERSION_HEX >= 0x030800f0 ++# define PyType_HasFeature py3_PyType_HasFeature ++# endif + #undef Py_BuildValue + # define Py_BuildValue py3_Py_BuildValue + # define Py_SetPythonHome py3_Py_SetPythonHome +@@ -233,6 +236,9 @@ typedef PySliceObject PySliceObject_T; + # define PyBytes_FromString py3_PyBytes_FromString + # undef PyBytes_FromStringAndSize + # define PyBytes_FromStringAndSize py3_PyBytes_FromStringAndSize ++# if defined(Py_DEBUG) || PY_VERSION_HEX >= 0x030800f0 ++# define _Py_Dealloc py3__Py_Dealloc ++# endif + # define PyFloat_FromDouble py3_PyFloat_FromDouble + # define PyFloat_AsDouble py3_PyFloat_AsDouble + # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr +@@ -247,12 +253,11 @@ typedef PySliceObject PySliceObject_T; + # ifdef Py_DEBUG + # define _Py_NegativeRefcount py3__Py_NegativeRefcount + # define _Py_RefTotal (*py3__Py_RefTotal) +-# define _Py_Dealloc py3__Py_Dealloc + # define PyModule_Create2TraceRefs py3_PyModule_Create2TraceRefs + # else + # define PyModule_Create2 py3_PyModule_Create2 + # endif +-# if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) ++# if (defined(Py_DEBUG) || PY_VERSION_HEX >= 0x030800f0) && !defined(Py_DEBUG_NO_PYMALLOC) + # define _PyObject_DebugMalloc py3__PyObject_DebugMalloc + # define _PyObject_DebugFree py3__PyObject_DebugFree + # else +@@ -282,7 +287,7 @@ typedef PySliceObject PySliceObject_T; + # define PyCapsule_New py3_PyCapsule_New + # define PyCapsule_GetPointer py3_PyCapsule_GetPointer + +-# if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) ++# if (defined(Py_DEBUG) || PY_VERSION_HEX >= 0x030800f0) && !defined(Py_DEBUG_NO_PYMALLOC) + # undef PyObject_NEW + # define PyObject_NEW(type, typeobj) \ + ( (type *) PyObject_Init( \ +@@ -352,6 +357,9 @@ static PyObject* (*py3_PyObject_Repr)(PyObject *); + static PyObject* (*py3_PyObject_GetItem)(PyObject *, PyObject *); + static int (*py3_PyObject_IsTrue)(PyObject *); + static PyObject* (*py3_Py_BuildValue)(char *, ...); ++# if PY_VERSION_HEX >= 0x030800f0 ++static int (*py3_PyType_HasFeature)(PyTypeObject *o, int feature); ++# endif + static int (*py3_PyType_Ready)(PyTypeObject *type); + static int (*py3_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item); + static PyObject* (*py3_PyUnicode_FromString)(const char *u); +@@ -396,6 +404,9 @@ static char* (*py3_PyBytes_AsString)(PyObject *bytes); + static int (*py3_PyBytes_AsStringAndSize)(PyObject *bytes, char **buffer, Py_ssize_t *length); + static PyObject* (*py3_PyBytes_FromString)(char *str); + static PyObject* (*py3_PyBytes_FromStringAndSize)(char *str, Py_ssize_t length); ++# if defined(Py_DEBUG) || PY_VERSION_HEX >= 0x030800f0 ++static void (*py3__Py_Dealloc)(PyObject *obj); ++# endif + static PyObject* (*py3_PyFloat_FromDouble)(double num); + static double (*py3_PyFloat_AsDouble)(PyObject *); + static PyObject* (*py3_PyObject_GenericGetAttr)(PyObject *obj, PyObject *name); +@@ -414,12 +425,11 @@ static void* (*py3_PyCapsule_GetPointer)(PyObject *, char *); + # ifdef Py_DEBUG + static void (*py3__Py_NegativeRefcount)(const char *fname, int lineno, PyObject *op); + static Py_ssize_t* py3__Py_RefTotal; +-static void (*py3__Py_Dealloc)(PyObject *obj); + static PyObject* (*py3_PyModule_Create2TraceRefs)(struct PyModuleDef* module, int module_api_version); + # else + static PyObject* (*py3_PyModule_Create2)(struct PyModuleDef* module, int module_api_version); + # endif +-# if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) ++# if (defined(Py_DEBUG) || PY_VERSION_HEX >= 0x030800f0) && !defined(Py_DEBUG_NO_PYMALLOC) + static void (*py3__PyObject_DebugFree)(void*); + static void* (*py3__PyObject_DebugMalloc)(size_t); + # else +@@ -525,6 +535,9 @@ static struct + {"PyObject_IsTrue", (PYTHON_PROC*)&py3_PyObject_IsTrue}, + {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong}, + {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New}, ++# if PY_VERSION_HEX >= 0x030800f0 ++ {"PyType_HasFeature", (PYTHON_PROC*)&py3_PyType_HasFeature}, ++# endif + {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready}, + {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString}, + {"PyLong_AsLong", (PYTHON_PROC*)&py3_PyLong_AsLong}, +@@ -562,6 +575,9 @@ static struct + {"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize}, + {"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString}, + {"PyBytes_FromStringAndSize", (PYTHON_PROC*)&py3_PyBytes_FromStringAndSize}, ++# if defined(Py_DEBUG) || PY_VERSION_HEX >= 0x030800f0 ++ {"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc}, ++# endif + {"PyFloat_FromDouble", (PYTHON_PROC*)&py3_PyFloat_FromDouble}, + {"PyFloat_AsDouble", (PYTHON_PROC*)&py3_PyFloat_AsDouble}, + {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr}, +@@ -578,12 +594,11 @@ static struct + # ifdef Py_DEBUG + {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount}, + {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal}, +- {"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc}, + {"PyModule_Create2TraceRefs", (PYTHON_PROC*)&py3_PyModule_Create2TraceRefs}, + # else + {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2}, + # endif +-# if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) ++# if (defined(Py_DEBUG) || PY_VERSION_HEX >= 0x030800f0) && !defined(Py_DEBUG_NO_PYMALLOC) + {"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree}, + {"_PyObject_DebugMalloc", (PYTHON_PROC*)&py3__PyObject_DebugMalloc}, + # else +@@ -777,7 +792,7 @@ static int python_end_called = FALSE; + static void + call_PyObject_Free(void *p) + { +-#if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) ++# if (defined(Py_DEBUG) || PY_VERSION_HEX >= 0x030800f0) && !defined(Py_DEBUG_NO_PYMALLOC) + _PyObject_DebugFree(p); + #else + PyObject_Free(p); +-- +2.25.4 + diff --git a/vim.spec b/vim.spec index 149f2982..7e0d7a6b 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: vim.sh @@ -62,6 +62,8 @@ Patch3017: vim-python3-tests.patch # fips warning Patch3018: vim-crypto-warning.patch Patch3019: vim-lua-ftbfs.patch +# fix dynamic python3 linking with python3.8 +Patch3020: 0001-if_python3.c-Fixing-linker-errors-in-dynamically-lin.patch # gcc is no longer in buildroot by default BuildRequires: gcc @@ -250,6 +252,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3017 -p1 -b .python-tests %patch3018 -p1 %patch3019 -p1 -b .lua-ftbfs +%patch3020 -p1 -b .python38-ftbfs %build cd src @@ -299,19 +302,6 @@ make clean mv -f os_unix.h.save os_unix.h mv -f ex_cmds.c.save ex_cmds.c -# python introduced incompatible change in getting linker flags for compiling programs -# which use C python API. Remove %%if after F31 going EOL and leave the single export here. -# This LDFLAGS settings needs to be before vim+gvim configuration and after vi configuration -# to prevent vi (doesn't have python embedded interpreter) be linked with python. -# When assigning to LDFLAGS, we join the current LDFLAGS with python linker flags - it is -# because we already defined LDFLAGS above when Lua linker flag was added. If the manual -# Lua linker flag adding goes away, use %%{build_ldflags} in the concatenation instead of LDFLAGS -%if 0%{?fedora} > 31 || 0%{?rhel} > 8 -export LDFLAGS="%{build_ldflags} $(python3-config --libs --embed)" -%else -export LDFLAGS="%{build_ldflags} $(python3-config --libs)" -%endif - # More configure options: # --enable-xim - enabling X Input Method - international input module for X, # it is for multibyte languages in Vim with X @@ -789,7 +779,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog -* Mon Jul 13 2020 Zdenek Dohnal - 2:8.2.1199-1 +* Wed Jul 15 2020 Zdenek Dohnal - 2:8.2.1199-1 +- fix python3 dynamic linking with python >= 3.8 + +* Tue Jul 14 2020 Zdenek Dohnal - 2:8.2.1199-1 - FTBFS with Lua - backported patch from upstream pull request to prevent linking with lua * Mon Jul 13 2020 Zdenek Dohnal - 2:8.2.1199-1 From 9a582c691a82520e8fb0316a97cc663143248d96 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 15 Jul 2020 12:47:17 +0200 Subject: [PATCH 188/584] clean up unused stuff --- 7.4.899 | 140 ------------- Changelog.rpm | 430 -------------------------------------- ftplugin-spec.vim | 210 ------------------- syntax-spec.vim | 236 --------------------- vi_help.txt | 126 ----------- vim-8.0-rhbz1365258.patch | 12 -- vim-lua-ftbfs.patch | 56 ----- vim.spec | 9 +- zip.vim | 387 ---------------------------------- 9 files changed, 3 insertions(+), 1603 deletions(-) delete mode 100644 7.4.899 delete mode 100644 Changelog.rpm delete mode 100644 ftplugin-spec.vim delete mode 100644 syntax-spec.vim delete mode 100644 vi_help.txt delete mode 100644 vim-8.0-rhbz1365258.patch delete mode 100644 vim-lua-ftbfs.patch delete mode 100644 zip.vim diff --git a/7.4.899 b/7.4.899 deleted file mode 100644 index df1534fd..00000000 --- a/7.4.899 +++ /dev/null @@ -1,140 +0,0 @@ -To: vim_dev@googlegroups.com -Subject: Patch 7.4.899 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.4.899 -Problem: README file is not optimal. -Solution: Move buttons, update some text. (closes #460) -Files: README.txt, README.md - - -*** ../vim-7.4.898/README.txt 2013-08-10 13:24:51.000000000 +0200 ---- README.txt 2015-10-25 13:50:34.962876572 +0100 -*************** -*** 1,7 **** - README.txt for version 7.4 of Vim: Vi IMproved. - - -! WHAT IS VIM - - Vim is an almost compatible version of the UNIX editor Vi. Many new features - have been added: multi-level undo, syntax highlighting, command line history, ---- 1,7 ---- - README.txt for version 7.4 of Vim: Vi IMproved. - - -! WHAT IS VIM? - - Vim is an almost compatible version of the UNIX editor Vi. Many new features - have been added: multi-level undo, syntax highlighting, command line history, -*************** -*** 21,26 **** ---- 21,30 ---- - - DISTRIBUTION - -+ You can often use your favorite package manager to install Vim. On Mac and -+ Linux a small version of Vim is pre-installed, you still need to install Vim -+ if you want more features. -+ - There are separate distributions for Unix, PC, Amiga and some other systems. - This README.txt file comes with the runtime archive. It includes the - documentation, syntax files and other files that are used at runtime. To run -*************** -*** 94,101 **** - The latest news about Vim can be found on the Vim home page: - http://www.vim.org/ - -! If you have problems, have a look at the Vim FAQ: -! http://vimdoc.sf.net/vimfaq.html - - If you still have problems or any other questions, use one of the mailing - lists to discuss them with Vim users and developers: ---- 98,106 ---- - The latest news about Vim can be found on the Vim home page: - http://www.vim.org/ - -! If you have problems, have a look at the Vim documentation or tips: -! http://www.vim.org/docs.php -! http://vim.wikia.com/wiki/Vim_Tips_Wiki - - If you still have problems or any other questions, use one of the mailing - lists to discuss them with Vim users and developers: -*************** -*** 110,115 **** - Send any other comments, patches, flowers and suggestions to: - - Bram Moolenaar E-mail: Bram@vim.org -- Finsterruetihof 1 -- 8134 Adliswil -- Switzerland ---- 115,117 ---- -*** ../vim-7.4.898/README.md 2015-09-25 17:50:16.350057915 +0200 ---- README.md 2015-10-25 13:50:31.734914034 +0100 -*************** -*** 1,7 **** - `README.md` for version 7.4 of Vim: Vi IMproved. - - -! ## What is VIM ## - - Vim is an almost compatible version of the UNIX editor Vi. Many new features - have been added: multi-level undo, syntax highlighting, command line history, ---- 1,9 ---- - `README.md` for version 7.4 of Vim: Vi IMproved. -+ [![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim) -+ [![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master) - - -! ## What is Vim? ## - - Vim is an almost compatible version of the UNIX editor Vi. Many new features - have been added: multi-level undo, syntax highlighting, command line history, -*************** -*** 21,26 **** ---- 23,32 ---- - - ## Distribution ## - -+ You can often use your favorite package manager to install Vim. On Mac and -+ Linux a small version of Vim is pre-installed, you still need to install Vim -+ if you want more features. -+ - There are separate distributions for Unix, PC, Amiga and some other systems. - This `README.md` file comes with the runtime archive. It includes the - documentation, syntax files and other files that are used at runtime. To run -*************** -*** 29,37 **** - want or must compile it yourself. Check http://www.vim.org/download.php for - an overview of currently available distributions. - -- [![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim) -- [![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master) -- - - ## Documentation ## - ---- 35,40 ---- -*** ../vim-7.4.898/src/version.c 2015-10-13 20:55:46.058715228 +0200 ---- src/version.c 2015-10-25 13:52:02.669858690 +0100 -*************** -*** 743,744 **** ---- 743,746 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 899, - /**/ - --- -hundred-and-one symptoms of being an internet addict: -45. You buy a Captain Kirk chair with a built-in keyboard and mouse. - - /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ an exciting new programming language -- http://www.Zimbu.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// diff --git a/Changelog.rpm b/Changelog.rpm deleted file mode 100644 index 86e85af1..00000000 --- a/Changelog.rpm +++ /dev/null @@ -1,430 +0,0 @@ -* Tue Aug 28 2012 Karsten Hopp 7.3.638-1 -- patchlevel 638 - -* Mon Aug 06 2012 Karsten Hopp 2:7.3.622-2 -- add epoch to spec.vim and automatic changelog entries - -* Mon Aug 06 2012 Karsten Hopp 7.3.622-1 -- patchlevel 622 - -* Mon Aug 06 2012 Karsten Hopp 7.3.604-1 -- drop vim-6.1-rh3.patch, (bz #754801) - -* Wed Jul 18 2012 Karsten Hopp 7.3.604-1 -- patchlevel 604 - -* Wed Jul 11 2012 Petr Pisar - 2:7.3.594-2 -- Perl 5.16 rebuild - -* Tue Jul 10 2012 Karsten Hopp 7.3.594-1 -- patchlevel 594 - -* Tue Jul 10 2012 Karsten Hopp 7.3.592-1 -- patchlevel 592 - -* Mon Jul 09 2012 Petr Pisar - 2:7.3.584-2 -- Perl 5.16 rebuild - -* Mon Jul 02 2012 Karsten Hopp 7.3.584-1 -- patchlevel 584 - -* Thu Jun 28 2012 Petr Pisar - 2:7.3.556-2 -- Perl 5.16 rebuild - -* Mon Jun 18 2012 Karsten Hopp 7.3.556-1 -- patchlevel 556 - -* Mon Jun 11 2012 Petr Pisar - 2:7.3.515-2 -- Perl 5.16 rebuild - -* Mon May 21 2012 Karsten Hopp 7.3.515-1 -- enable highlighting for older log files (#816848) - -* Tue May 08 2012 Karsten Hopp 7.3.515-1 -- patchlevel 515 - -* Fri Mar 16 2012 Karsten Hopp 7.3.471-1 -- patchlevel 471 - -* Mon Feb 13 2012 Karsten Hopp 7.3.444-1 -- patchlevel 444 - -* Tue Feb 07 2012 Karsten Hopp 7.3.434-1 -- patchlevel 434 - -* Tue Feb 07 2012 Karsten Hopp 7.3.393-3 -- update spec file template, bugzilla 736774 - -* Thu Jan 26 2012 Harald Hoyer 7.3.393-3 -- rebuild against the new ruby library - -* Thu Jan 26 2012 Harald Hoyer 7.3.393-2 -- install everything in /usr - https://fedoraproject.org/wiki/Features/UsrMove - -* Thu Jan 05 2012 Karsten Hopp 7.3.393-1 -- patchlevel 393 -- fix boolean key 'Terminal' in gvim.desktop - -* Fri Dec 23 2011 Karsten Hopp 7.3.386-1 -- patchlevel 386 - -* Mon Sep 26 2011 Karsten Hopp 7.3.322-1 -- patchlevel 322 - -* Wed Sep 21 2011 Karsten Hopp 7.3.315-1 -- patchlevel 315 - -* Mon Aug 29 2011 Karsten Hopp 7.3.289-1 -- patchlevel 289 - -* Mon Aug 29 2011 Karsten Hopp 7.3.244-4 -- Remove old patched files. (Ricky Zhou ) - (bugzilla #709456) - -* Thu Jul 21 2011 Petr Sabata - 2:7.3.244-3 -- Perl mass rebuild - -* Thu Jul 21 2011 Petr Sabata - 2:7.3.244-2 -- Perl mass rebuild - -* Mon Jul 11 2011 Karsten Hopp 7.3.244-1 -- patchlevel 244 - -* Tue Jun 14 2011 Marcela Mašláňová - 2:7.3.206-3 -- Perl mass rebuild - -* Tue May 31 2011 Ville Skyttä - 2:7.3.206-2 -- Own the /usr/share/vim/vim73 dir. - -* Mon May 30 2011 Karsten Hopp 7.3.206-1 -- drop xxd-locale patch -- update to patchlevel 206 - -* Wed May 11 2011 Karsten Hopp 7.3.189-1 -- patchlevel 189 - -* Wed Mar 16 2011 Karsten Hopp 7.3.138-1 -- patchlevel 138 - -* Mon Feb 07 2011 Fedora Release Engineering - 2:7.3.107-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 24 2011 Karsten Hopp 7.3.107-1 -- patchlevel 107 - -* Mon Jan 10 2011 Karsten Hopp 7.3.099-1 -- patchlevel 099 - -* Mon Jan 03 2011 Karsten Hopp 7.3.094-1 -- patchlevel 094 - -* Thu Dec 09 2010 Karsten Hopp 7.3.081-1 -- patchlevel 081 - -* Wed Dec 08 2010 Karsten Hopp 7.3.080-1 -- patchlevel 080 - -* Fri Dec 03 2010 Karsten Hopp 7.3.075-1 -- patchlevel 075 - -* Thu Dec 02 2010 Karsten Hopp 7.3.073-1 -- patchlevel 073 - -* Thu Nov 25 2010 Karsten Hopp 7.3.069-1 -- patchlevel 069 - -* Wed Nov 24 2010 Karsten Hopp 7.3.068-1 -- patchlevel 068 - -* Wed Nov 24 2010 Karsten Hopp 7.3.063-1 -- patchlevel 063 - -* Wed Nov 17 2010 Karsten Hopp 7.3.062-1 -- patchlevel 062 - -* Tue Nov 16 2010 Karsten Hopp 7.3.061-1 -- patchlevel 061 - -* Tue Nov 16 2010 Karsten Hopp 7.3.056-1 -- patchlevel 056 - -* Thu Nov 11 2010 Karsten Hopp 7.3.055-1 -- patchlevel 055 - -* Wed Nov 10 2010 Karsten Hopp 7.3.051-1 -- patchlevel 051 - -* Thu Nov 04 2010 Karsten Hopp 7.3.050-1 -- patchlevel 050 - -* Thu Nov 04 2010 Karsten Hopp 7.3.048-1 -- patchlevel 048 - -* Thu Oct 28 2010 Karsten Hopp 7.3.047-1 -- patchlevel 047 - -* Wed Oct 27 2010 Karsten Hopp 7.3.046-1 -- patchlevel 046 - -* Wed Oct 27 2010 Karsten Hopp 7.3.039-1 -- patchlevel 039 - -* Sun Oct 24 2010 Karsten Hopp 7.3.035-1 -- patchlevel 035 - -* Sat Oct 23 2010 Karsten Hopp 7.3.034-1 -- patchlevel 034 - -* Sat Oct 23 2010 Karsten Hopp 7.3.033-1 -- patchlevel 033 - -* Thu Oct 21 2010 Karsten Hopp 7.3.032-1 -- patchlevel 032 - -* Wed Oct 20 2010 Karsten Hopp 7.3.031-1 -- patchlevel 031 - -* Sat Oct 16 2010 Karsten Hopp 7.3.029-1 -- patchlevel 029 - -* Fri Oct 15 2010 Karsten Hopp 7.3.028-1 -- patchlevel 028 - -* Thu Oct 14 2010 Karsten Hopp 7.3.027-1 -- patchlevel 027 - -* Wed Oct 13 2010 Karsten Hopp 7.3.026-1 -- patchlevel 026 - -* Sun Oct 10 2010 Karsten Hopp 7.3.021-1 -- patchlevel 021 - -* Sat Oct 09 2010 Karsten Hopp 7.3.020-1 -- patchlevel 020 - -* Fri Oct 01 2010 Karsten Hopp 7.3.019-1 -- patchlevel 019 - -* Thu Sep 30 2010 Karsten Hopp 7.3.018-1 -- patchlevel 018 - -* Thu Sep 30 2010 Karsten Hopp 7.3.011-3 -- add filesystem subpackage (#628293) - -* Wed Sep 29 2010 jkeating - 2:7.3.011-2 -- Rebuilt for gcc bug 634757 - -* Wed Sep 22 2010 Karsten Hopp 7.3.011-1 -- update to VIM 7.3 patchlevel 011 - -# vim:nrformats-=octal -* Tue Jul 27 2010 Mamoru Tasaka 7.2.446-2 -- Rebuild against python 2.7 - -* Tue Jul 13 2010 Karsten Hopp 7.2.446-1 -- patchlevel 446 - -* Thu Jul 08 2010 Karsten Hopp 7.2.445-1 -- patchlevel 445 - -* Wed Jun 23 2010 Karsten Hopp 7.2.444-2 -- rebuild with perl-5.12 - -* Sun Jun 13 2010 Karsten Hopp 7.2.444-1 -- patchlevel 444 - -* Sun Jun 13 2010 Karsten Hopp 7.2.443-1 -- patchlevel 443 - -* Sat Jun 05 2010 Karsten Hopp 7.2.442-1 -- patchlevel 442 - -* Wed Jun 02 2010 Marcela Maslanova - 2:7.2.441-2 -- Mass rebuild with perl-5.12.0 - -* Sun May 30 2010 Karsten Hopp 7.2.441-1 -- patchlevel 441 - -* Sat May 29 2010 Karsten Hopp 7.2.440-1 -- patchlevel 440 - -* Wed May 26 2010 Karsten Hopp 7.2.438-1 -- patchlevel 438 - -* Sat May 22 2010 Karsten Hopp 7.2.437-1 -- patchlevel 437 - -* Sun May 16 2010 Karsten Hopp 7.2.436-1 -- patchlevel 436 - -* Sat May 15 2010 Karsten Hopp 7.2.433-1 -- patchlevel 433 - -* Fri May 14 2010 Karsten Hopp 7.2.427-1 -- patchlevel 427 - -* Thu May 13 2010 Karsten Hopp 7.2.422-1 -- patchlevel 422 - -* Fri May 07 2010 Karsten Hopp 7.2.416-1 -- patchlevel 416 - -* Tue Apr 20 2010 Karsten Hopp 7.2.411-2 -- fix rvim manpage (#583180) - -* Wed Mar 24 2010 Karsten Hopp 7.2.411-1 -- patchlevel 411 - -* Tue Mar 23 2010 Karsten Hopp 7.2.410-1 -- patchlevel 410 - -* Sat Mar 20 2010 Karsten Hopp 7.2.403-1 -- patchlevel 403 - -* Thu Mar 18 2010 Karsten Hopp 7.2.402-1 -- patchlevel 402 - -* Wed Mar 17 2010 Karsten Hopp 7.2.399-1 -- patchlevel 399 - -* Wed Mar 10 2010 Karsten Hopp 7.2.394-1 -- patchlevel 394 - -* Wed Mar 03 2010 Karsten Hopp 7.2.385-1 -- patchlevel 385 - -* Tue Mar 02 2010 Karsten Hopp 7.2.384-1 -- patchlevel 384 - -* Tue Mar 02 2010 Karsten Hopp 7.2.381-1 -- patchlevel 381 - -* Sat Feb 27 2010 Karsten Hopp 7.2.377-1 -- patchlevel 377 - -* Wed Feb 24 2010 Karsten Hopp 7.2.376-1 -- patchlevel 376 - -* Thu Feb 18 2010 Karsten Hopp 7.2.368-1 -- patchlevel 368 - -* Thu Feb 18 2010 Karsten Hopp 7.2.367-1 -- patchlevel 367 - -* Wed Feb 17 2010 Karsten Hopp 7.2.365-1 -- patchlevel 365 - -* Fri Feb 12 2010 Karsten Hopp 7.2.359-1 -- patchlevel 359 - -* Thu Feb 11 2010 Karsten Hopp 7.2.357-1 -- patchlevel 357 - -* Thu Feb 04 2010 Karsten Hopp 7.2.356-1 -- patchlevel 356 - -* Wed Feb 03 2010 Karsten Hopp 7.2.354-1 -- patchlevel 354 - -* Fri Jan 29 2010 Karsten Hopp 7.2.351-1 -- patchlevel 351 - -* Thu Jan 28 2010 Karsten Hopp 7.2.350-1 -- patchlevel 350 - -* Mon Dec 7 2009 Stepan Kasal - 2:7.2.315-2 -- rebuild against perl 5.10.1 - -* Wed Dec 03 2009 Karsten Hopp 7.2.315-1 -- patchlevel 315 -- fix vimrc location in man page (#456992) -- correct syntax highlighting of httpd config files in /etc/httpd (#499123) -- Buildrequire ruby, ruby-devel (#503872) -- Remove check for static gravity (#510307) -- sort tags file (#517725) -- use one gvim to open multiple file selections from nautilus (#519265) -- use elinks -source instead of elinks -dump (#518791) -- add ext4 keyword to /etc/fstab syntax highlighting (#498290) - -* Mon Nov 09 2009 Karsten Hopp 7.2.284-1 -- patchlevel 284 - -* Thu Aug 20 2009 Karsten Hopp 7.2.245-3 -- change range of system ids in /etc/profile.d/vim/* (#518555) - -* Mon Aug 03 2009 Karsten Hopp 7.2.245-2 -- add fix for glibc fortify segfault (#514717, Adam Tkac) - -* Sat Aug 01 2009 Karsten Hopp 7.2.245-1 -- add 97 upstream patches to get to patchlevel 245 - -* Sun Jul 26 2009 Fedora Release Engineering - 2:7.2.148-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Mar 27 2009 Karsten Hopp 7.2.148-1 -- patchlevel 148, fixes #461417 - -* Tue Mar 10 2009 Karsten Hopp 7.2.132-1 -- patchlevel 132, fixes accesses to freed memory - -* Wed Mar 04 2009 Karsten Hopp 7.2.131-1 -- patchlevel 131 - -* Tue Feb 24 2009 Karsten Hopp 7.2.127-1 -- patchlevel 127 - -* Mon Feb 23 2009 Karsten Hopp 7.2.124-1 -- patchlevel 124 - -* Mon Jan 26 2009 Karsten Hopp 7.2.088-1 -- patchlevel 88 - -* Thu Jan 08 2009 Karsten Hopp 7.2.079-2 -- patchlevel 79 - -* Thu Dec 04 2008 Jesse Keating - 7.2.060-2 -- Rebuild for new python. - -* Mon Dec 01 2008 Karsten Hopp 7.2.060-1 -- patchlevel 60 - -* Mon Nov 10 2008 Karsten Hopp 7.2.032-1 -- patchlevel 32 - -* Mon Nov 03 2008 Karsten Hopp 7.2.026-2 -- add more /usr/share/vim/vimfiles directories (#444387) - -* Mon Nov 03 2008 Karsten Hopp 7.2.026-1 -- patchlevel 26 -- own some directories in /usr/share/vim/vimfiles (#469491) - -* Tue Oct 21 2008 Karsten Hopp 7.2.025-2 -- re-enable clean - -* Mon Oct 20 2008 Karsten Hopp 7.2.025-1 -- patchlevel 25 -- add Categories tag to desktop file (#226526) -- add requirement on hicolor-icon-theme to vim-X11 (#226526) -- drop Amiga info files (#226526) -- remove non-utf8 man pages (#226526) -- drop Application from categories (#226526) - -* Tue Sep 30 2008 Karsten Hopp 7.2.022-1 -- patchlevel 22 - -* Mon Sep 08 2008 Karsten Hopp 7.2.013-1 -- patchlevel 13 - -* Mon Aug 25 2008 Karsten Hopp 7.2.006-1 -- patchlevel 6 - -* Mon Aug 18 2008 Karsten Hopp 7.2.002-1 -- patchlevel 2 -- fix specfile template (#446070) -- old specfile changelog moved to Changelog.rpm - -* Fri Aug 14 2008 Karsten Hopp 7.2.000-1 -- vim 7.2 -- drop 330 patches - diff --git a/ftplugin-spec.vim b/ftplugin-spec.vim deleted file mode 100644 index 2a961f82..00000000 --- a/ftplugin-spec.vim +++ /dev/null @@ -1,210 +0,0 @@ -" Plugin to update the %changelog section of RPM spec files -" Filename: spec.vim -" Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com -" Former Maintainer: Gustavo Niemeyer (until March 2014) -" Last Change: Mon Jun 01 21:15 MSK 2015 Igor Gnatenko - -if exists("b:did_ftplugin") - finish -endif -let b:did_ftplugin = 1 - -let s:cpo_save = &cpo -set cpo&vim - -if !exists("no_plugin_maps") && !exists("no_spec_maps") - if !hasmapto("SpecChangelog") - map c SpecChangelog - endif -endif - -if !hasmapto("call SpecChangelog(\"\")") - noremap