From d755431f35b59ea11d7629e2b6087731243c23e1 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 14 May 2020 08:35:54 +0200 Subject: [PATCH 001/416] 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 002/416] - 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 003/416] - 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 004/416] 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 005/416] - 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 006/416] 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 007/416] - 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 008/416] 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 009/416] - 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 010/416] - 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 011/416] - 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 012/416] - 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 013/416] - 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 014/416] 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 015/416] %%{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 016/416] - 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 017/416] - 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 018/416] 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 019/416] 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 020/416] 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