From 4f9d20dd3645990907e8e96a6c2002ff0393ea0c Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 08:07:44 +0000
Subject: [PATCH] auto-import lynx-2.8.5-3 from lynx-2.8.5-3.src.rpm

---
 .cvsignore |  2 +-
 lynx.spec  | 36 +++++++++++++++++++++---------------
 sources    |  2 +-
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 0a1db57..37e40c2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 lynx2-8-2.ja.po.bz2
-lynx2.8.4rel.1.tar.bz2
+lynx2.8.5dev.7.tar.bz2
diff --git a/lynx.spec b/lynx.spec
index a1cd03e..bf14230 100644
--- a/lynx.spec
+++ b/lynx.spec
@@ -1,21 +1,20 @@
 Summary: A text-based Web browser.
 Name: lynx
-Version: 2.8.4
-Release: 18.1
+Version: 2.8.5
+Release: 3
 License: GPL
 Group: Applications/Internet
-Source: http://lynx.isc.org/current/lynx2.8.4rel.1.tar.bz2
+Source: http://lynx.isc.org/current/lynx2.8.5dev.7.tar.bz2
 Source1: lynx.cfg.ja
 Source2: lynx2-8-2.ja.po.bz2
 Source3: lynx.cfg.cs
 Source4: lynx.cfg.sk
 URL: http://lynx.isc.org/
-Patch0: lynx2-8-3-redhat.patch
+Patch0: lynx-2.8.4-redhat.patch
 Patch1: lynx2-8-2-telnet.patch
 Patch2: lynx-284-i18ncfg.patch
 Patch3: lynx-284-ipv6-salen.patch
-Patch4: lynx-2.8.4-sitecfg.patch
-Patch5: lynx2.8.4rel.1c.patch
+Patch4: lynx-2.8.5-ncurses.patch
 Requires: indexhtml
 Provides: webclient
 BuildRequires: openssl-devel, ncurses-devel, slang-devel, zlib-devel
@@ -28,19 +27,18 @@ advantage Lynx has over graphical browsers is speed; Lynx starts and
 exits quickly and swiftly displays webpages.
 
 %prep
-%setup -q -n lynx2-8-4
-%patch0 -p0
+%setup -q -n lynx2-8-5
+%patch0 -p1 -b .redhat
 %patch1 -p1 -b .telnet
 %patch2 -p1 -b .i18ncfg
 %patch3 -p1 -b .salen
-%patch4 -p1 -b .sitecfg
-%patch5 -p1 -b .crlf
+%patch4 -p1 -b .ncurses
 perl -pi -e "s,^HELPFILE:.*,HELPFILE:file://localhost/usr/share/doc/lynx-%{version}/lynx_help/lynx_help_main.html,g" lynx.cfg
 perl -pi -e "s,^DEFAULT_INDEX_FILE:.*,DEFAULT_INDEX_FILE:http://www.google.com/,g" lynx.cfg
 
 %build
 export CFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION" CXXFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION"
-%configure --libdir=/etc \
+./configure --libdir=/etc \
 	--with-screen=ncurses --enable-warnings \
 	--enable-default-colors --enable-externs \
 	--enable-internal-links --enable-nsl-fork \
@@ -54,6 +52,8 @@ export CFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION" CXXFLAGS=
 	--enable-libjs --enable-cgi-links --enable-nls \
 	--enable-ipv6 \
 	--with-ssl=/usr
+# Work around autoconf bug
+echo "#define ANSI_VARARGS 1" >>lynx_cfg.h
 OLD_PO_FILE_INPUT=yes make
 
 %install
@@ -110,11 +110,17 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sk) %config %{_sysconfdir}/lynx.cfg.sk
 
 %changelog
-* Wed Jan 22 2003 Tim Waugh <twaugh@redhat.com> 2.8.4-18.1
-- Fix CRLF issue.
+* Mon Mar  4 2002 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.5-3
+- dev7
+- Fix build with current ncurses
+- Work around autoconf bug
 
-* Fri Mar 15 2002 Tim Powers <timp@redhat.com>
-- rebuilt in new environment
+* Thu Nov 22 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.5-2
+- Update (dev5)
+
+* Wed Oct 24 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.5-1
+- Update (dev3)
+- Use "display" as image viewer (#54184)
 
 * Tue Jul 31 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.4-17
 - 2.8.4 release - no need to ship prerelease code...
diff --git a/sources b/sources
index 9c58314..6dabfeb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 2201d137b3df5fa07c435595294c3083  lynx2-8-2.ja.po.bz2
-6916c0127839f1e454052b683e4691c4  lynx2.8.4rel.1.tar.bz2
+2b325d9b17a43c72ec1be3bad4996978  lynx2.8.5dev.7.tar.bz2