- 2.8.4pre.1, updated lynx.cfg, autoconf, config patches

- removed obsolete ssl patch (at last!)

Changed files:
    lynx-autoconf.patch -> 1.2
    lynx-config.patch -> 1.5
    lynx.cfg.patch -> 1.6
    lynx.spec -> 1.71

diff --git a/lynx-autoconf.patch b/lynx-autoconf.patch
index 64d17dcbc3cb604784772d44df78fe2de9c2fb8a..4bcd045f464c7b5976b5903d34882767336cb676 100644 (file)
--- a/lynx-autoconf.patch
+++ b/lynx-autoconf.patch
@@ -1,7 +1,7 @@
-diff -Naur lynx2-8-4.ori/aclocal.m4 lynx2-8-4/aclocal.m4
---- lynx2-8-4.ori/aclocal.m4   Thu Aug  3 19:19:52 2000
-+++ lynx2-8-4/aclocal.m4       Sat Aug  5 08:15:10 2000
-@@ -1677,9 +1677,6 @@
+diff -Nur lynx2-8-4.orig/aclocal.m4 lynx2-8-4/aclocal.m4
+--- lynx2-8-4.orig/aclocal.m4  Sun Jun  3 21:58:00 2001
++++ lynx2-8-4/aclocal.m4       Sun Jun 10 16:11:56 2001
+@@ -1751,9 +1751,6 @@
  ])dnl
  dnl ---------------------------------------------------------------------------
  dnl Insert text into the help-message, for readability, from AC_ARG_WITH.
@@ -11,9 +11,9 @@ diff -Naur lynx2-8-4.ori/aclocal.m4 lynx2-8-4/aclocal.m4
  dnl ---------------------------------------------------------------------------
  dnl For Lynx, check if the libraries we have found give us inet_aton, or
  dnl inet_addr.  If not, try to find the latter function with -lbind or
-diff -Naur lynx2-8-4.ori/configure.in lynx2-8-4/configure.in
---- lynx2-8-4.ori/configure.in Thu Aug  3 19:19:52 2000
-+++ lynx2-8-4/configure.in     Sat Aug  5 08:15:43 2000
+diff -Nur lynx2-8-4.orig/configure.in lynx2-8-4/configure.in
+--- lynx2-8-4.orig/configure.in        Sun Jun  3 21:58:00 2001
++++ lynx2-8-4/configure.in     Sun Jun 10 16:13:21 2001
 @@ -3,7 +3,6 @@
  dnl by T.E.Dickey <dickey@clark.net>
  dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -32,7 +32,7 @@ diff -Naur lynx2-8-4.ori/configure.in lynx2-8-4/configure.in
  CF_DISABLE_ECHO
  
  # special case for WWW/*
-@@ -258,9 +254,6 @@
+@@ -265,9 +261,6 @@
  dnl --------------------------------------------------------------------------
  dnl --------------------------------------------------------------------------
  
@@ -42,17 +42,17 @@ diff -Naur lynx2-8-4.ori/configure.in lynx2-8-4/configure.in
  dnl internationalization macros
  CF_BUNDLED_INTL(makefile)
  
-@@ -587,9 +580,6 @@
+@@ -622,9 +615,6 @@
  dnl Experimental options that don't need to test system features
  dnl --------------------------------------------------------------------------
  
 -CF_HELP_MESSAGE(
 -Experimental Options:)
 -
- AC_MSG_CHECKING(if configuration info should be browsable)
- CF_ARG_DISABLE(config-info,
- [  --disable-config-info   disable browsable configuration-info],
-@@ -789,9 +779,6 @@
+ AC_MSG_CHECKING(if bibp: URLs should be supported)
+ CF_ARG_DISABLE(bibp-urls,
+ [  --disable-bibp-urls     disable support for bibp: URLs],
+@@ -838,9 +828,6 @@
  dnl Miscellaneous options that don't need to test system features
  dnl --------------------------------------------------------------------------
  
@@ -62,7 +62,7 @@ diff -Naur lynx2-8-4.ori/configure.in lynx2-8-4/configure.in
  AC_MSG_CHECKING(if alternative line-edit bindings should be used)
  CF_ARG_ENABLE(alt-bindings,
  [  --disable-alt-bindings  disable alternative line-edit bindings],
-@@ -985,9 +972,6 @@
+@@ -1037,9 +1024,6 @@
  dnl DirEd (directory-editor) options
  dnl --------------------------------------------------------------------------
  
@@ -72,7 +72,7 @@ diff -Naur lynx2-8-4.ori/configure.in lynx2-8-4/configure.in
  # All DirEd functions that were enabled on compilation can be disabled
  # or modified at run time via DIRED_MENU symbols in lynx.cfg.
  AC_MSG_CHECKING(if directory-editor code should be used)
-@@ -1058,7 +1042,6 @@
+@@ -1111,7 +1095,6 @@
  dnl Test features that rely on configure-definitions
  dnl --------------------------------------------------------------------------
  if test $cf_cv_screen = pdcurses ; then

diff --git a/lynx-config.patch b/lynx-config.patch
index 86fbdbe696c497d6968ecd2ea65e5b29e92ded88..34085885757698b27c8ecc04c90a0814398305cc 100644 (file)
--- a/lynx-config.patch
+++ b/lynx-config.patch
@@ -1,7 +1,7 @@
 diff -Nur lynx2-8-4.orig/configure.in lynx2-8-4/configure.in
---- lynx2-8-4.orig/configure.in        Thu Feb 22 00:35:42 2001
-+++ lynx2-8-4/configure.in     Thu Feb 22 01:43:52 2001
-@@ -410,7 +410,7 @@
+--- lynx2-8-4.orig/configure.in        Sun Jun 10 16:24:29 2001
++++ lynx2-8-4/configure.in     Sun Jun 10 16:16:44 2001
+@@ -434,7 +434,7 @@
  cf_libdir=`echo $cf_libdir | sed -e s@'^NONE/'@$prefix/@ -e s@'^NONE/'@$ac_default_prefix/@`
  
  AC_MSG_CHECKING(for location of config-file)
@@ -10,7 +10,7 @@ diff -Nur lynx2-8-4.orig/configure.in lynx2-8-4/configure.in
  AC_DEFINE_UNQUOTED(LYNX_CFG_FILE,"$LYNX_CFG_FILE")
  AC_MSG_RESULT($LYNX_CFG_FILE)
  
-@@ -660,7 +660,7 @@
+@@ -696,7 +696,7 @@
        AC_MSG_RESULT(yes)
  
        AC_MSG_CHECKING(for location of style-sheet file)
@@ -20,8 +20,8 @@ diff -Nur lynx2-8-4.orig/configure.in lynx2-8-4/configure.in
        AC_MSG_RESULT($LYNX_LSS_FILE)
        INSTALL_LSS=install-lss
 diff -Nur lynx2-8-4.orig/lynx.cfg lynx2-8-4/lynx.cfg
---- lynx2-8-4.orig/lynx.cfg    Thu Feb 22 00:35:41 2001
-+++ lynx2-8-4/lynx.cfg Thu Feb 22 01:46:27 2001
+--- lynx2-8-4.orig/lynx.cfg    Sun Jun 10 16:24:29 2001
++++ lynx2-8-4/lynx.cfg Sun Jun 10 16:16:44 2001
 @@ -1,12 +1,12 @@
  # lynx.cfg file.
 -# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
@@ -71,8 +71,8 @@ diff -Nur lynx2-8-4.orig/lynx.cfg lynx2-8-4/lynx.cfg
  .h2 DEFAULT_INDEX_FILE
  # DEFAULT_INDEX_FILE is the default file retrieved when the
 diff -Nur lynx2-8-4.orig/makefile.in lynx2-8-4/makefile.in
---- lynx2-8-4.orig/makefile.in Thu Feb 22 00:35:41 2001
-+++ lynx2-8-4/makefile.in      Thu Feb 22 01:46:14 2001
+--- lynx2-8-4.orig/makefile.in Mon Apr  2 02:51:46 2001
++++ lynx2-8-4/makefile.in      Sun Jun 10 16:29:52 2001
 @@ -48,15 +48,15 @@
  MANDIR= $(DESTDIR)$(mandir)
  
@@ -92,33 +92,33 @@ diff -Nur lynx2-8-4.orig/makefile.in lynx2-8-4/makefile.in
  HELPDIR= $(DESTDIR)$(helpdir)
  
  ##set the relative location of the WWW library Implementation directory,
-@@ -378,7 +378,7 @@
+@@ -360,7 +360,7 @@
        @-rm -f help_files.tmp
  
  install-help : help_files.sed $(HELPDIR)
--      (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's@/lynx_help$$@@'` && test $$WD != $$HEAD && rm -rf *)
-+      (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's@/lynx/help$$@@'` && test $$WD != $$HEAD && rm -rf *)
+-      (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && rm -rf *)
++      (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx/help$$!!'` && test $$WD != $$HEAD && rm -rf *)
  @LYNXCFG_MAKE@        @echo 'Making htmlized lynx.cfg'
  @LYNXCFG_MAKE@        cd src && make LYReadCFG.i
  @LYNXCFG_MAKE@        @-rm -f alphatoc.html body.html cattoc.html
-@@ -456,12 +456,12 @@
+@@ -438,12 +438,12 @@
  
  uninstall \
  uninstall-help ::
--      -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's@/lynx_help$$@@'` && test $$WD != $$HEAD && rm -rf $(HELPDIR)
-+      -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's@/lynx/help$$@@'` && test $$WD != $$HEAD && rm -rf $(HELPDIR)
+-      -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && rm -rf $(HELPDIR)
++      -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx/help$$!!'` && test $$WD != $$HEAD && rm -rf $(HELPDIR)
  
  uninstall \
  uninstall-doc ::
-       -test -d $(DOCDIR) && WD=`cd $(DOCDIR) && pwd` && HEAD=`echo $$WD|sed -e 's@/lynx_doc$$@@'` && test $$WD != $$HEAD && rm -rf $(DOCDIR)
--      -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's@/lynx_help$$@@'` && test $$WD != $$HEAD && cd $(HELPDIR) && rm -f COPYING COPYHEADER
-+      -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's@/lynx/help$$@@'` && test $$WD != $$HEAD && cd $(HELPDIR) && rm -f COPYING COPYHEADER
+       -test -d $(DOCDIR) && WD=`cd $(DOCDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_doc$$!!'` && test $$WD != $$HEAD && rm -rf $(DOCDIR)
+-      -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && cd $(HELPDIR) && rm -f COPYING COPYHEADER
++      -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx/help$$!!'` && test $$WD != $$HEAD && cd $(HELPDIR) && rm -f COPYING COPYHEADER
  
  $(BINDIR) $(MANDIR) $(LIBDIR) $(HELPDIR) $(DOCDIR) :
        $(srcdir)/mkdirs.sh $@
 diff -Nur lynx2-8-4.orig/userdefs.h lynx2-8-4/userdefs.h
---- lynx2-8-4.orig/userdefs.h  Thu Feb 22 00:35:41 2001
-+++ lynx2-8-4/userdefs.h       Thu Feb 22 01:43:52 2001
+--- lynx2-8-4.orig/userdefs.h  Sun Jun 10 16:24:29 2001
++++ lynx2-8-4/userdefs.h       Sun Jun 10 16:16:44 2001
 @@ -93,7 +93,7 @@
   * mailcap files (see the examples in the samples directory).
   */

diff --git a/lynx.cfg.patch b/lynx.cfg.patch
index 3d6d9e769084f6b27545a7c7b85f3a4f15f4a6a2..92c80c7822923ec9b2e088efd20e8b5c573fc8ac 100644 (file)
--- a/lynx.cfg.patch
+++ b/lynx.cfg.patch
@@ -41,7 +41,7 @@ diff -ru lynx2-8-2.old/lynx.cfg lynx2-8-2/lynx.cfg
  
  # The global and personal MAILCAP files allow you to specify external
  # viewers to be spawned when Lynx encounters different MIME types, which
-@@ -1903,14 +1906,14 @@
+@@ -1903,15 +1906,14 @@
  #
  # Uncomment and change any of the compilation defaults.
  #
@@ -52,6 +52,7 @@ diff -ru lynx2-8-2.old/lynx.cfg lynx2-8-2/lynx.cfg
 -#COLOR:4:magenta:white
 -#COLOR:5:blue:white
 -#COLOR:6:red:white
+-COLOR:6:brightred:black
 -#COLOR:7:magenta:cyan
 +COLOR:0:black:lightgray
 +COLOR:1:blue:lightgray

diff --git a/lynx.spec b/lynx.spec
index 8483da9afc05abb2f4e6f4be7c90a95edf066226..02178e304f79d327072e0057a07993d31e3fef88 100644 (file)
--- a/lynx.spec
+++ b/lynx.spec
@@ -4,8 +4,8 @@ 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.4dev.14
-Release:       5
+Version:       2.8.4pre.1
+Release:       1
 License:       GPL
 Group:         Applications/Networking
 Group(pl):     Aplikacje/Sieciowe
@@ -13,12 +13,11 @@ Source0:    http://lynx.isc.org/current/%{name}%{version}.tar.bz2
 Source1:       %{name}.desktop
 Patch0:                %{name}-pld.patch
 Patch1:                %{name}.cfg.patch
-Patch2:                http://www.moxienet.com/lynx/%{name}-283-ssl.patch.bz2
-Patch3:                %{name}-po_DESTDIR.patch
-Patch4:                %{name}-config.hin.patch
-Patch5:                %{name}-autoconf.patch
-Patch6:                %{name}-config.patch
-Patch7:                %{name}-SA_LEN.patch
+Patch2:                %{name}-po_DESTDIR.patch
+Patch3:                %{name}-config.hin.patch
+Patch4:                %{name}-autoconf.patch
+Patch5:                %{name}-config.patch
+Patch6:                %{name}-SA_LEN.patch
 URL:           http://lynx.browser.org/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: zlib-devel
@@ -62,12 +61,10 @@ formlar ve tablolar i
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %build
+rm -f configure
 autoconf
-LDFLAGS="-lcrypto -lssl %{rpmldflags}"
-CFLAGS="-I/usr/include/openssl -DUSE_SSL %{rpmcflags}"
 %configure \
        --with-screen=slang \
        --without-included-gettext \
@@ -93,8 +90,7 @@ CFLAGS="-I/usr/include/openssl -DUSE_SSL %{rpmcflags}"
 #      --with-socks5=%{_prefix} \
 #      --enable-color-style \
 
-%{__make} SSL_LIBS="-lssl -lcrypto" \
-       SSL_DEFINES="-I%{_includedir}/openssl -DUSE_SSL"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT