- /usr/lib/lynx.cfg -> /etc/lynx.cfg

- default start page = user's home directory (previous didn't exist)
- fixed default help file
- BuildRequires: autoconf
- release 3

Changed files:
    lynx-config.patch -> 1.4
    lynx.spec -> 1.68

diff --git a/lynx-config.patch b/lynx-config.patch
index a3fc85d015a8f7ad5c544ce08e3c7ddd07570781..86fbdbe696c497d6968ecd2ea65e5b29e92ded88 100644 (file)
--- a/lynx-config.patch
+++ b/lynx-config.patch
@@ -1,10 +1,31 @@
-diff -Nur lynx2-8-2/lynx.cfg lynx2-8-2.pld/lynx.cfg
---- lynx2-8-2/lynx.cfg Fri Jun  4 14:31:38 1999
-+++ lynx2-8-2.pld/lynx.cfg     Fri Jun  4 14:31:10 1999
+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 @@
+ cf_libdir=`echo $cf_libdir | sed -e s@'^NONE/'@$prefix/@ -e s@'^NONE/'@$ac_default_prefix/@`
+ 
+ AC_MSG_CHECKING(for location of config-file)
+-LYNX_CFG_FILE=$cf_libdir/lynx.cfg
++LYNX_CFG_FILE=$sysconfdir/lynx.cfg
+ AC_DEFINE_UNQUOTED(LYNX_CFG_FILE,"$LYNX_CFG_FILE")
+ AC_MSG_RESULT($LYNX_CFG_FILE)
+ 
+@@ -660,7 +660,7 @@
+       AC_MSG_RESULT(yes)
+ 
+       AC_MSG_CHECKING(for location of style-sheet file)
+-      LYNX_LSS_FILE=$cf_libdir/lynx.lss
++      LYNX_LSS_FILE=$datadir/lynx/lynx.lss
+       AC_DEFINE_UNQUOTED(LYNX_LSS_FILE,"$LYNX_LSS_FILE")
+       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
 @@ -1,12 +1,12 @@
  # lynx.cfg file.
 -# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
-+# The default placement for this file is /usr/share/lynx/lynx.cfg (Unix)
++# The default placement for this file is /etc/lynx.cfg (Unix)
  #                                     or Lynx_Dir:lynx.cfg (VMS)
  #
  #
@@ -12,16 +33,116 @@ diff -Nur lynx2-8-2/lynx.cfg lynx2-8-2.pld/lynx.cfg
  # NO spaces are allowed between the pair items.
  #
 -#  If you do not have write access to /usr/local/lib you may change
-+#  If you do not have write access to /usr/bin you may change
++#  If you do not have write access to /etc you may change
  #  the default location of this file in the userdefs.h file and recompile,
  #  or specify its location on the command line with the "-cfg"
  #  command line option.
-@@ -32,7 +32,7 @@
+@@ -42,8 +42,8 @@
  #
  # Then in ~/lynx.cfg:
  #
 -#   INCLUDE:/usr/local/lib/lynx.cfg
-+#   INCLUDE:/usr/share/lynx/lynx.cfg
- #           ^^^^^^^^^^^^^^^^^^^^^^^ or whatever is appropriate on your system
+-#           ^^^^^^^^^^^^^^^^^^^^^^^ or whatever is appropriate on your system
++#   INCLUDE:/etc/lynx.cfg
++#           ^^^^^^^^^^^^^ or whatever is appropriate on your system
  # and now your own tweaks.
  #
+ # Starting with Lynx 2.8.2, the INCLUDE facility is yet more powerful.  You can
+@@ -88,7 +88,8 @@
+ # Normally we expect you will connect to a remote site, e.g., the Lynx starting
+ # site:
+ #STARTFILE:http://lynx.browser.org/
+-STARTFILE:file://localhost/usr/share/doc/HTML/index.html
++#STARTFILE:file://localhost/usr/share/doc/HTML/index.html
++STARTFILE:file://localhost/~/
+ #
+ # As an alternative, you may want to use a local URL.  A good choice for this is
+ # the user's home directory:
+@@ -112,9 +113,8 @@
+ #   This should be changed to the local path.
+ #
+ #HELPFILE:http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
+-.ex
+-HELPFILE:file://localhost/usr/share/lynx/help/lynx_help_main.html
+-
++# default in PLD is:
++#HELPFILE:file://localhost/usr/share/lynx/help/lynx_help_main.html.gz
+ 
+ .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
+@@ -48,15 +48,15 @@
+ MANDIR= $(DESTDIR)$(mandir)
+ 
+ ## Where you want the lynx.cfg file installed
+-libdir= @libdir@
++libdir= @sysconfdir@
+ LIBDIR= $(DESTDIR)$(libdir)
+ 
+ ## Where you want the doc-files installed
+-docdir= @libdir@/lynx_doc
++docdir= @datadir@/lynx_doc
+ DOCDIR= $(DESTDIR)$(docdir)
+ 
+ ## Where you want the help-files installed
+-helpdir= @libdir@/lynx_help
++helpdir= @datadir@/lynx/help
+ HELPDIR= $(DESTDIR)$(helpdir)
+ 
+ ##set the relative location of the WWW library Implementation directory,
+@@ -378,7 +378,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 *)
+ @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 @@
+ 
+ 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)
+ 
+ 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
+ 
+ $(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
+@@ -93,7 +93,7 @@
+  * mailcap files (see the examples in the samples directory).
+  */
+ #ifndef LYNX_CFG_FILE
+-#define LYNX_CFG_FILE "/usr/share/lynx/lynx.cfg"
++#define LYNX_CFG_FILE "/etc/lynx.cfg"
+ #endif /* LYNX_CFG_FILE */
+ 
+ /**************************
+@@ -277,7 +277,7 @@
+ #ifdef DOSPATH
+ #define LYNX_CFG_FILE "./lynx.cfg"
+ #else
+-#define LYNX_CFG_FILE "/usr/share/lynx/lynx.cfg"
++#define LYNX_CFG_FILE "/etc/lynx.cfg"
+ #endif /* DOSPATH */
+ #endif /* LYNX_CFG_FILE */
+ #endif /* HAVE_CONFIG_H */
+@@ -478,7 +478,7 @@
+  * http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
+  *   This should be changed here or in lynx.cfg to the local path.
+  */
+-#define HELPFILE "http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html"
++#define HELPFILE "file://localhost/usr/share/lynx/help/lynx_help_main.html.gz"
+ /* #define HELPFILE "file://localhost/PATH_TO/lynx_help/lynx_help_main.html" */
+ 
+ /*****************************

diff --git a/lynx.spec b/lynx.spec
index 23bf56a6c40962718436c1979b6abf2b7ea07c81..5a1eefe6ca069de148081f4ab7bea9801247d7ee 100644 (file)
--- a/lynx.spec
+++ b/lynx.spec
@@ -5,25 +5,26 @@ Summary(pl):  Przegl
 Summary(tr):   Metin ekranda WWW tarayýcý
 Name:          lynx
 Version:       2.8.4dev.14
-Release:       2
+Release:       3
 License:       GPL
 Group:         Applications/Networking
 Group(pl):     Aplikacje/Sieciowe
 Source0:       http://lynx.isc.org/current/%{name}%{version}.tar.bz2
 Source1:       %{name}.desktop
 Patch0:                %{name}-pld.patch
-Patch1:                %{name}-config.patch
-Patch2:                %{name}.cfg.patch
-Patch3:                http://www.moxienet.com/lynx/%{name}-283-ssl.patch.bz2
-Patch4:                %{name}-po_DESTDIR.patch
-Patch5:                %{name}-config.hin.patch
-Patch6:                %{name}-autoconf.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
 URL:           http://lynx.browser.org/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: zlib-devel
 BuildRequires: slang-devel
 BuildRequires: gettext-devel
-# BuildRequires:       socks5-devel
+BuildRequires: autoconf
+#BuildRequires:        socks5-devel
 Provides:      webclient
 Obsoletes:     lynx-ssl
 
@@ -96,14 +97,10 @@ CFLAGS="-I/usr/include/openssl -DUSE_SSL %{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAG
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_applnkdir}/Network/WWW \
        $RPM_BUILD_ROOT%{_datadir}/lynx/help
-#      $RPM_BUILD_ROOT%{_datadir}/lynx/help/keystrokes
 
 %{__make} install install-help \
        DESTDIR=$RPM_BUILD_ROOT
 
-# fix help
-mv -f $RPM_BUILD_ROOT%{_libdir}/lynx_help/* $RPM_BUILD_ROOT%{_datadir}/lynx/help
-
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/WWW
 
 gzip -9nf C[HO]* PROBLEMS README samples/* test/* docs/README*
@@ -117,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc C[HO]* PROBLEMS.gz README.gz samples test docs/README*
 
-%config %verify(not size mtime md5) %{_libdir}/lynx.cfg
+%config %verify(not size mtime md5) %{_sysconfdir}/lynx.cfg
 %{_applnkdir}/Network/WWW/lynx.desktop
 
 %attr(755,root,root) %{_bindir}/*