- ac25x patch needed for autoconf 2.53

- added workaround to fix broken ncurses version

Changed files:
    vim-ac25x.patch -> 1.1
    vim.spec -> 1.112

diff --git a/vim-ac25x.patch b/vim-ac25x.patch
new file mode 100644 (file)
index 0000000..ad2eaae
--- /dev/null
+++ b/vim-ac25x.patch
@@ -0,0 +1,11 @@
+--- vim61/src/configure.in.orig        Sat Mar  9 18:29:18 2002
++++ vim61/src/configure.in     Wed Mar 27 23:14:12 2002
+@@ -2035,7 +2035,7 @@
+ fi
+ 
+ dnl Check for dynamic linking loader
+-AC_CHECK_HEADER(dlfcn.h, DLL=dlfcn.h, AC_CHECK_HEADER(dl.h, DLL=dl.h))
++AC_CHECK_HEADER(dlfcn.h, DLL=dlfcn.h, [AC_CHECK_HEADER(dl.h, DLL=dl.h)])
+ if test x${DLL} = xdlfcn.h; then
+   AC_DEFINE(HAVE_DLFCN_H, 1, [ Define if we have dlfcn.h. ])
+   AC_MSG_CHECKING([for dlopen()])

diff --git a/vim.spec b/vim.spec
index 4ea15830c79a8611f75ff53a07ab20c171002e3d..fa8c5d9a48cf1845072dc2c6323cae00dbf33d15 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -43,6 +43,7 @@ Patch1:               %{name}-visual.patch
 Patch2:                %{name}-paths.patch
 Patch3:                %{name}-ispell.patch
 Patch4:                %{name}-ispell-axp.patch
+Patch5:                %{name}-ac25x.patch
 URL:           http://www.vim.org/
 BuildRequires: autoconf
 BuildRequires: gettext-devel
@@ -414,9 +415,10 @@ GNOME, 
 %ifarch alpha
 %{?_with_ispell:%patch4 -p1}
 %endif
+%patch5 -p1
 
 ## # these patches are to "extra" package which we don't need (nor use)
-## rm -f patches/6.0.{027,048,053,064,070,073,093,106,107,115,116,117,119,123,121,122,125,135,161,162,164,165,179,186,188,205,207}
+## rm -f patches/6.0.{ , }
 ## # apply the rest of official patches
 ## for f in patches/6.0.* ; do
 ##     echo "Applying official patch `basename $f` ..."
@@ -426,6 +428,8 @@ GNOME, 
 %build
 cd src
 autoconf
+# needed to prevent deconfiguring
+cp -f configure auto
 %configure \
        --disable-gui \
        --without-x \
@@ -446,7 +450,6 @@ autoconf
 
 %{__make} vim
 mv -f vim vim.ncurses
-
 %{__make} xxd/xxd
 
 %if %{!?_without_static:1}%{?_without_static:0}
@@ -656,7 +659,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files rt
 %defattr(644,root,root,755)
-%doc vim2html.pl
 %attr(755,root,root) %{_bindir}/vimtutor
 %dir %{_sysconfdir}/vim
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vim/vimrc