diff --git a/vim-6.1-rh3.patch b/vim-6.1-rh3.patch deleted file mode 100644 index 5d3b8cf..0000000 --- a/vim-6.1-rh3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vim61/runtime/scripts.vim.rh3 2003-02-12 13:00:49.000000000 +0100 -+++ vim61/runtime/scripts.vim 2003-02-12 13:01:37.000000000 +0100 -@@ -22,6 +22,8 @@ - endif - endif - -+set formatoptions=tcql nocindent comments& -+ - " Line continuation is used here, remove 'C' from 'cpoptions' - let s:cpo_save = &cpo - set cpo&vim diff --git a/vim.spec b/vim.spec index 24c5bfc..7d50bfb 100644 --- a/vim.spec +++ b/vim.spec @@ -663,15 +663,14 @@ Patch604: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.604 Patch3000: vim-7.3-syntax.patch Patch3002: vim-7.1-nowarnings.patch -Patch3003: vim-6.1-rh3.patch -Patch3004: vim-7.0-rclocation.patch -Patch3006: vim-6.4-checkhl.patch -Patch3007: vim-7.3-fstabsyntax.patch -Patch3008: vim-7.0-warning.patch -Patch3009: vim-7.0-syncolor.patch -Patch3010: vim-7.0-specedit.patch -Patch3011: vim72-rh514717.patch -Patch3012: vim-7.3-bug816848.patch +Patch3003: vim-7.0-rclocation.patch +Patch3004: vim-6.4-checkhl.patch +Patch3005: vim-7.3-fstabsyntax.patch +Patch3006: vim-7.0-warning.patch +Patch3007: vim-7.0-syncolor.patch +Patch3008: vim-7.0-specedit.patch +Patch3009: vim72-rh514717.patch +Patch3010: vim-7.3-bug816848.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel ncurses-devel gettext perl-devel @@ -1421,14 +1420,12 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3002 -p1 %patch3003 -p1 %patch3004 -p1 - +%patch3005 -p1 %patch3006 -p1 %patch3007 -p1 %patch3008 -p1 %patch3009 -p1 %patch3010 -p1 -%patch3011 -p1 -%patch3012 -p1 %build cp -f %{SOURCE5} . @@ -1866,6 +1863,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* 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