From f5cbdd237a51aa14c641c25ed97fae9686946bfe Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 08:08:59 +0000
Subject: [PATCH] auto-import changelog data from lynx-2.8.5-14.src.rpm Mon Dec
 01 2003 Tim Waugh <twaugh@redhat.com> 2.8.5-14 - Updated to dev16, fixing bug
 #110196. - No longer need crlf patch. - Use shipped ja translations. - Use
 %find_lang. - Default config file now sets UTF-8 (bug #110986).

---
 .cvsignore |  3 +--
 lynx.spec  | 31 +++++++++++++------------------
 sources    |  3 +--
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 37e40c2..0cbe9cd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-lynx2-8-2.ja.po.bz2
-lynx2.8.5dev.7.tar.bz2
+lynx2.8.5dev.16.tar.bz2
diff --git a/lynx.spec b/lynx.spec
index 22c0e34..e9324fe 100644
--- a/lynx.spec
+++ b/lynx.spec
@@ -1,12 +1,11 @@
 Summary: A text-based Web browser.
 Name: lynx
 Version: 2.8.5
-Release: 13
+Release: 14
 License: GPL
 Group: Applications/Internet
-Source: http://lynx.isc.org/current/lynx2.8.5dev.7.tar.bz2
+Source: http://lynx.isc.org/current/lynx2.8.5dev.16.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/
@@ -14,7 +13,6 @@ 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: lynx2.8.4rel.1c.patch
 Requires: indexhtml
 Provides: webclient
 BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5, slang-devel, zlib-devel
@@ -32,7 +30,6 @@ exits quickly and swiftly displays webpages.
 %patch1 -p1 -b .telnet
 %patch2 -p1 -b .i18ncfg
 %patch3 -p1 -b .salen
-%patch4 -p1 -b .crlf
 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
 
@@ -70,7 +67,7 @@ fi
 	--enable-libjs --enable-cgi-links --enable-nls \
 	--enable-ipv6 \
 	--with-ssl=%{_libdir}
-OLD_PO_FILE_INPUT=yes make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,7 +77,6 @@ install -m444 %{SOURCE1} $RPM_BUILD_ROOT/etc
 install -m444 %{SOURCE3} $RPM_BUILD_ROOT/etc
 install -m444 %{SOURCE4} $RPM_BUILD_ROOT/etc
 mkdir -p $RPM_BUILD_ROOT/usr/share/locale/ja/LC_MESSAGES/
-( bzcat %{SOURCE2} | msgfmt -o $RPM_BUILD_ROOT/usr/share/locale/ja/LC_MESSAGES/lynx.mo - )
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Internet
 
@@ -88,24 +84,16 @@ cat >$RPM_BUILD_ROOT%{_sysconfdir}/lynx-site.cfg <<EOF
 # Place any local lynx configuration options (proxies etc.) here.
 EOF
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc docs README INSTALLATION samples
 %doc test lynx.hlp lynx_help
 %{_bindir}/lynx
-%lang(cs) %{_prefix}/share/locale/cs/LC_MESSAGES/*
-%lang(da) %{_prefix}/share/locale/da/LC_MESSAGES/*
-%lang(de) %{_prefix}/share/locale/de/LC_MESSAGES/*
-%lang(fr) %{_prefix}/share/locale/fr/LC_MESSAGES/*
-%lang(ja) %{_prefix}/share/locale/ja/LC_MESSAGES/*
-%lang(nl) %{_prefix}/share/locale/nl/LC_MESSAGES/*
-%lang(pt_BR) %{_prefix}/share/locale/pt_BR/LC_MESSAGES/*
-%lang(ru) %{_prefix}/share/locale/ru/LC_MESSAGES/*
-%lang(sl) %{_prefix}/share/locale/sl/LC_MESSAGES/*
-%lang(sv) %{_prefix}/share/locale/sv/LC_MESSAGES/*
 %{_mandir}/*/*
 %config %{_sysconfdir}/lynx.cfg
 %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
@@ -114,6 +102,13 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sk) %config %{_sysconfdir}/lynx.cfg.sk
 
 %changelog
+* Mon Dec  1 2003 Tim Waugh <twaugh@redhat.com> 2.8.5-14
+- Updated to dev16, fixing bug #110196.
+- No longer need crlf patch.
+- Use shipped ja translations.
+- Use %%find_lang.
+- Default config file now sets UTF-8 (bug #110986).
+
 * Fri Jun 06 2003 Adrian Havill <havill@redhat.com> 2.8.5-13
 - use wide version of ncurses for UTF-8
 
diff --git a/sources b/sources
index 6dabfeb..a016f8d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-2201d137b3df5fa07c435595294c3083  lynx2-8-2.ja.po.bz2
-2b325d9b17a43c72ec1be3bad4996978  lynx2.8.5dev.7.tar.bz2
+d5c50ea7334ee3256a82722be2f0d9a3  lynx2.8.5dev.16.tar.bz2