rediff patches; rel 3

diff --git a/lynx-config.patch b/lynx-config.patch
index 76d2b560a9723e1dee98fe8ebe6af45d6df09a05..83bb8661101584febb8614e66a673be1f4ea3e47 100644 (file)
--- a/lynx-config.patch
+++ b/lynx-config.patch
@@ -1,7 +1,7 @@
 --- lynx2-8-7/lynx.cfg~        2010-06-21 13:58:02.215705722 +0200
 +++ lynx2-8-7/lynx.cfg 2010-06-21 14:00:28.895674991 +0200
 @@ -1,6 +1,6 @@
- # $LynxId: lynx.cfg,v 1.180 2009/06/07 17:02:21 tom Exp $
+ # $LynxId: lynx.cfg,v 1.302 2018/07/08 15:22:44 tom Exp $
  # lynx.cfg file.
 -# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 +# The default placement for this file is /etc/lynx.cfg (Unix)
@@ -9,8 +9,8 @@
  #
  # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
 @@ -12,7 +12,7 @@
- # Definition pairs are of the form  VARIABLE:DEFINITION
- # NO spaces are allowed between the pair items.
+ #     VARIABLE:DEFINITION
+ # NO spaces are allowed around the colon ":" 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 /etc you may change
@@ -24,7 +24,7 @@
 -#   INCLUDE:/usr/local/lib/lynx.cfg
 +#   INCLUDE:/etc/lynx.cfg
  #           ^^^^^^^^^^^^^^^^^^^^^^^ or whatever is appropriate on your system
- # and now your own tweaks.
+ # and now your own tweaks.  If you omit the directory name, e.g.,
  #
 --- lynx2-8-7/makefile.in~     2010-06-21 11:27:35.000000000 +0200
 +++ lynx2-8-7/makefile.in      2010-06-21 14:04:23.622318548 +0200
@@ -47,7 +47,7 @@
 +#define LYNX_CFG_FILE "/etc/lynx.cfg"
  #endif /* LYNX_CFG_FILE */
  
- /**************************
+ #ifndef LYNX_CFG_PATH
 @@ -510,8 +510,9 @@
   * The definition here can be overridden at run time by defining a
   * "LYNX_HELPFILE" environment variable.

diff --git a/lynx-etc_dir.patch b/lynx-etc_dir.patch
index 537569ef70326cc778f40f1f008f7aafc137b422..b4282a1f8f37205e3b74d6ffa71abdffa94f5902 100644 (file)
--- a/lynx-etc_dir.patch
+++ b/lynx-etc_dir.patch
@@ -53,7 +53,7 @@
        /*
         * Home_Dir() has a bug if this ever happens.  - FM
 @@ -5416,6 +5444,7 @@
-           (strncmp(file, "./", 2) ? file : (file + 2)));
+           (StrNCmp(file, "./", 2) ? file : (file + 2)));
  #endif /* VMS */
      FREE(home);
 +      }

diff --git a/lynx-pld.patch b/lynx-pld.patch
index 7b6a45f142452ed4cfe37d2b975e9948dea274e8..108306db5d61c77939dc8dbe09dcde282763dcf7 100644 (file)
--- a/lynx-pld.patch
+++ b/lynx-pld.patch
@@ -8,7 +8,7 @@
 +#define LYNX_CFG_FILE "/usr/share/lynx/lynx.cfg"
  #endif /* LYNX_CFG_FILE */
  
- /**************************
+ #ifndef LYNX_CFG_PATH
 @@ -115,8 +115,8 @@
   * Mappings in these global and personal files override any SUFFIX
   * definitions in lynx.cfg and built-in defaults from src/HTInit.c.

diff --git a/lynx.cfg.patch b/lynx.cfg.patch
index 6a24aca392721b6343812cb43aee39cf1fa57609..5e5f12a8b1c31eb9f4aaf77008025b334932f788 100644 (file)
--- a/lynx.cfg.patch
+++ b/lynx.cfg.patch
@@ -28,8 +28,8 @@
 -#NCR_IN_BOOKMARKS:FALSE
 +NCR_IN_BOOKMARKS:TRUE
  
- 
  .h2 FORCE_8BIT_TOUPPER
+ # FORCE_8BIT_TOUPPER overrides locale settings and uses internal 8-bit
 @@ -2998,9 +2998,18 @@ MINIMAL_COMMENTS:TRUE
  #COLOR:4:magenta:white
  #COLOR:5:blue:white

diff --git a/lynx.spec b/lynx.spec
index e72dfa1f2f51050e0402ff3c95d81c867b81472e..b0a72f0f52e9b3305a2cd87429a048f3970d166b 100644 (file)
--- a/lynx.spec
+++ b/lynx.spec
@@ -11,7 +11,7 @@ Summary(pt_BR.UTF-8): Navegador web modo texto
 Summary(tr.UTF-8):     Metin ekranda WWW tarayıcı
 Name:          lynx
 Version:       2.8.9rel.1
-Release:       2
+Release:       3
 License:       GPL v2
 Group:         Applications/Networking
 Source0:       https://invisible-mirror.net/archives/lynx/tarballs/%{name}%{version}.tar.bz2