- a little reorganization with kloczek's blessing. Base should be

  lynx with ssl, in (near) future spec should also produce socks5
  package. If someone needs nossl version - he should prepare spec
  on his own :-)
- version 2.8.4dev3
- the newest was lynx+ssl+socks5.spec, so it became lynx.spec
- some path corrections

Changed files:
    lynx.spec -> 1.56

diff --git a/lynx.spec b/lynx.spec
index fe6a14785235edc58e08c93793a685fbc83d3571..67b40380b3bfef6d7782e2719f57e1f3793d10c1 100644 (file)
--- a/lynx.spec
+++ b/lynx.spec
@@ -4,123 +4,108 @@ Summary(fr):        Navigateur en mode texte pour le world wide web
 Summary(pl):   Przegl±darka WWW pracuj±ca w trybie tekstowym
 Summary(tr):   Metin ekranda WWW tarayýcý
 Name:          lynx
-Version:       2.8.3dev.18
-Release:       5
+Version:       2.8.4dev.3
+Release:       1
 License:       GPL
+URL:           http://lynx.browser.org
 Group:         Applications/Networking
 Group(pl):     Aplikacje/Sieciowe
-Source0:       http://sol.slcc.edu/lynx/current/%{name}%{version}.tar.bz2
-Source1:       lynx.desktop
+Source0:       http://lynx.isc.org/current/%{name}%{version}.tar.bz2
+Source1:       lynx.wmconfig
 Patch0:                lynx-pld.patch
-Patch1:                lynx-overflow.patch
-Patch2:                lynx-config.patch
-Patch3:                lynx.cfg.patch
-Patch4:                lynx-helpdir.patch
-Patch5:                lynx-DESTDIR.patch
-Patch6:                lynx-283d16-ssl.patch
-Patch7:                lynx2-8-3-ipv6-20-02-00.patch.gz   
-URL:           http://lynx.browser.org/
+Patch1:                lynx-config.patch
+Patch2:                lynx.cfg.patch
+Patch3:                http://www.moxienet.com/lynx/lynx-283-ssl.patch.bz2
+Patch4:                lynx-overflow.patch
+Patch5:                lynx-po_DESTDIR.patch
 BuildRequires: zlib-devel
-BuildRequires: ncurses-devel >= 5.0
-Provides:      webclient
+BuildRequires: slang-devel
+# BuildRequires:       socks5-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _libdir         %{_datadir}/lynx
-
 %description
-This a terminal based WWW browser. While it does not make any attempt at
-displaying graphics, it has good support for HTML text formatting, forms,
-and tables.
+This a terminal based WWW browser. While it does not make any attempt
+at displaying graphics, it has good support for HTML text formatting,
+forms, and tables.
+
+%description -l pl
+Lynx jest przegl±dark± WWW dzia³aj±c± w trybie tekstowym. Dobrze
+formatuje tekst w HTML, ale nie pozwala na wy¶wietlanie grafiki.
 
 %description -l de
 Dies ist ein WWW-Browser auf Terminal-Basis. Während kein Versuch
-unternommen wird, Grafiken darzustellen, so bietet er doch guten  Support
-für HTML-Textformatierung, Formulare und Tabellen.
+unternommen wird, Grafiken darzustellen, so bietet er doch guten
+Support für HTML-Textformatierung, Formulare und Tabellen.
 
 %description -l fr
-Navigateur WWW en mode texte. Bien qu'il n'affiche aucun graphique, il sait
-bien gérer le formatage HTML du texte, les formulaires et les tableaux.
-
-%description -l pl
-Lynx jest przegl±dark± WWW dzia³aj±c± w trybie tekstowym. Dobrze formatuje
-tekst w HTML, ale nie pozwala na wy¶wietlanie grafiki.
+Navigateur WWW en mode texte. Bien qu'il n'affiche aucun graphique, il
+sait bien gérer le formatage HTML du texte, les formulaires et les
+tableaux.
 
 %description -l tr
-Metin ekranda çalýþan bir WWW tarayýcýdýr. Þekil gösteremese de, formlar ve
-tablolar için desteði vardýr.
+Metin ekranda çalýþan bir WWW tarayýcýdýr. Þekil gösteremese de,
+formlar ve tablolar için desteði vardýr.
 
 %prep
-%setup  -q -n %{name}2-8-3
+%setup  -q -n %{name}2-8-4
 %patch0 -p1 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
-CFLAGS="-w -I/usr/include/ncurses"; export CFLAGS
-LDFLAGS="-s"; export LDFLAGS
+export CFLAGS="-w -D_USE_PLD"
+export LDFLAGS="-s"
 %configure \
-       --with-screen=ncurses \
-       --enable-nls \
+       --with-screen=slang \
        --without-included-gettext \
-       --enable-charset-choice \
-       --enable-cjk        \
-       --enable-default-colors \
-       --enable-file-upload \
-       --enable-justify-elts \
-       --enable-kbd-layout \
-       --enable-read-eta \
-       --enable-scrollbar \
-       --enable-warnings \
+       --with-zlib \
+       --with-ssl \
+       --enable-addrlist-page \
+       --enable-cgi-links \
        --enable-default-colors \
+       --enable-exec-links \
+       --enable-exec-scripts \
        --enable-externs \
+       --enable-gzip-help \
        --enable-internal-links \
+       --enable-libjs \
+       --enable-nls \
        --enable-nsl-fork \
        --enable-persistent-cookies \
-       --enable-gzip-help \
-       --enable-libjs \
-       --enable-addrlist-page \
        --enable-prettysrc \
        --enable-source-cache \
-       --enable-color-style \
-       --enable-cgi-links \
-       --enable-exec-links \
-       --enable-exec-scripts \
-       --disable-cjk \
-       --with-zlib \
-       --without-socks \
-       --without-socks5 \
-       --with-ssl
+       --enable-warnings 
+#      --with-socks5=%{_prefix} \
+#      --enable-color-style \
 
-make
+make   SSL_LIBS= "-lssl -lsslcrypto " \
+       SSL_DEFINES= "-I%{_includedir}/ssl -DUSE_SSL"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_applnkdir}/Network/WWW
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/wmconfig \
+       $RPM_BUILD_ROOT%{_datadir}/lynx/help/keystrokes
 
 make install install-help \
-       DESTDIR=$RPM_BUILD_ROOT \
-       helpdir=%{_libdir}/help
+       DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/WWW/lynx.desktop
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/wmconfig/lynx
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
        C[HO]* PROBLEMS README samples/* test/* docs/README*
 
-%find_lang %{name}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
 %doc C[HO]* PROBLEMS.gz README.gz samples test docs/README*
 
-%{_applnkdir}/Network/WWW/lynx.desktop
+%config %verify(not size mtime md5) %{_libdir}/lynx.cfg
+%config(missingok) %{_sysconfdir}/X11/wmconfig/lynx
 
 %attr(755,root,root) %{_bindir}/*