diff --git a/vim.spec b/vim.spec index 2b457ad..b6bfeac 100644 --- a/vim.spec +++ b/vim.spec @@ -52,22 +52,22 @@ Source100: vim-spell-files.tar.bz2 %endif -Patch2002: vim-7.0-fixkeys.patch -Patch2003: vim-7.4-specsyntax.patch +Patch2000: vim-7.0-fixkeys.patch +Patch2001: vim-7.4-specsyntax.patch %if %{withhunspell} -Patch2011: vim-7.0-hunspell.patch +Patch2002: vim-7.0-hunspell.patch BuildRequires: hunspell-devel %endif -Patch3007: vim-7.4-fstabsyntax.patch -Patch3010: vim-7.3-manpage-typo-668894-675480.patch -Patch3011: vim-manpagefixes-948566.patch -Patch3013: vim-7.4-globalsyntax.patch -Patch3014: vim-7.4-releasestring-1318991.patch +Patch3000: vim-7.4-fstabsyntax.patch +Patch3001: vim-7.3-manpage-typo-668894-675480.patch +Patch3002: vim-manpagefixes-948566.patch +Patch3003: vim-7.4-globalsyntax.patch +Patch3004: vim-7.4-releasestring-1318991.patch # migrate shebangs in script to /usr/bin/python3 and use python2 when necessary -Patch3017: vim-python3-tests.patch +Patch3005: vim-python3-tests.patch # fips warning -Patch3018: vim-crypto-warning.patch +Patch3006: vim-crypto-warning.patch # uses autoconf in spec file @@ -308,10 +308,10 @@ sed -i -e 's,/usr/bin/python3,%{__python3},' %{PATCH3017} # fix rogue dependencies from sample code chmod -x runtime/tools/mve.awk -%patch2002 -p1 -b .fixkeys -%patch2003 -p1 +%patch2000 -p1 -b .fixkeys +%patch2001 -p1 %if %{withhunspell} -%patch2011 -p1 +%patch2002 -p1 %endif perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk @@ -320,13 +320,13 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %{__tar} xjf %{SOURCE100} %endif -%patch3007 -p1 -b .fstabsyntax -%patch3010 -p1 -%patch3011 -p1 -%patch3013 -p1 -%patch3014 -p1 -%patch3017 -p1 -b .python-tests -%patch3018 -p1 -b .fips-warning +%patch3000 -p1 -b .fstabsyntax +%patch3001 -p1 +%patch3002 -p1 +%patch3003 -p1 +%patch3004 -p1 +%patch3005 -p1 -b .python-tests +%patch3006 -p1 -b .fips-warning %build cd src