updated to 7.4.796

[packages/vim.git] / vim.spec

diff --git a/vim.spec b/vim.spec
index 103b88aed408948d3fffdb72e9e84ec20b4b6746..ba394098799af9d8f267a792a92a1c2482d78a76 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -28,7 +28,7 @@
 # VCS Commits: https://code.google.com/p/vim/source/browse/
 
 %define                ver             7.4
-%define                patchlevel      253
+%define                patchlevel      796
 %define                rel             1
 Summary:       Vi IMproved - a Vi clone
 Summary(de.UTF-8):     VIsual editor iMproved
@@ -52,8 +52,6 @@ Source1:      http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 # Source1-md5: bc4d1e115ca506ad7751b9bd2b773a7f
 Source2:       http://skawina.eu.org/mikolaj/usr_doc_pl.zip
 # Source2-md5: ff96284b1c913d55cf0877839b34d490
-Source3:       https://vim.googlecode.com/hg-history/v7-4-207/.hgignore
-# Source3-md5: 11760a30af26645127530e3c1bfc3405
 Source10:      g%{name}-athena.desktop
 Source11:      g%{name}-motif.desktop
 Source12:      g%{name}-gtk.desktop
@@ -118,11 +116,12 @@ Patch39:  %{name}-revert-7.4.165-noundo.patch
 URL:           http://www.vim.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
-BuildRequires: gettext-devel
 BuildRequires: gpm-devel
 %if "%{pld_release}" == "ac"
 %{?with_athena:BuildRequires:  XFree86-devel}
+BuildRequires: gettext-devel
 %else
+BuildRequires: gettext-tools
 %{?with_athena:BuildRequires:  xorg-lib-libXaw-devel}
 %endif
 %if %{with gtk} || %{with heavy}
@@ -140,6 +139,7 @@ BuildRequires:      perl-devel
 %endif
 %if %{with python} || %{with heavy}
 BuildRequires: python-devel
+BuildRequires: rpm-pythonprov
 %endif
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.426
@@ -739,9 +739,6 @@ jak również GUI GTK+2.
 %prep
 %setup -q -n %{name}74
 
-# make patch 7.4.208 able to apply
-cp -p %{SOURCE3} .
-
 # official patches
 %patchset_patch 1 %{patchlevel}
 
@@ -829,7 +826,7 @@ build() {
                --with-tlib="ncursesw"
 %endif
 
-       %{__make} distclean
+       %{__make} -j1 distclean
        # add common options, can override (disable) if needed with args
        %configure \
                --%{!?with_perl:dis}%{?with_perl:en}able-perlinterp \
@@ -1199,6 +1196,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{_datadir}/vim
 %dir %{_datadir}/vim/doc
+%verify(not md5 mtime size) %{_datadir}/vim/doc/tags
+%lang(pl) %verify(not md5 mtime size) %{_datadir}/vim/doc/tags-pl
+%verify(not md5 mtime size) %{_datadir}/vim/vimfiles/doc/tags
 
 %dir %{_datadir}/vim/vimfiles
 %dir %{_datadir}/vim/vimfiles/doc
@@ -1217,7 +1217,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/vim/vimfiles/plugin
 %dir %{_datadir}/vim/vimfiles/spell
 %dir %{_datadir}/vim/vimfiles/syntax
-%verify(not md5 mtime size) %{_datadir}/vim/vimfiles/doc/tags
 
 %{_datadir}/vim/*.vim
 
@@ -1331,11 +1330,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 # English
 %{_datadir}/vim/doc/*.txt.gz
-%verify(not md5 mtime size) %{_datadir}/vim/doc/tags
 
 # Polish
 %lang(pl) %{_datadir}/vim/doc/*.plx.gz
-%lang(pl) %verify(not md5 mtime size) %{_datadir}/vim/doc/tags-pl
 
 %files tutor
 %defattr(644,root,root,755)