- 2.8.5dev.2, updated config patch

- removed SA_LEN patch (already in sources)
- removed %%requires_eq for openssl

Changed files:
    lynx-SA_LEN.patch -> 1.2
    lynx-config.patch -> 1.6
    lynx.spec -> 1.74

diff --git a/lynx-SA_LEN.patch b/lynx-SA_LEN.patch
deleted file mode 100644 (file)
index 3729bb5..0000000
--- a/lynx-SA_LEN.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lynx2-8-4/WWW/Library/Implementation/www_tcp.h.orig        Wed Oct 25 18:35:28 2000
-+++ lynx2-8-4/WWW/Library/Implementation/www_tcp.h     Thu Apr  5 13:42:01 2001
-@@ -826,6 +826,10 @@
- #ifdef SIN6_LEN
- #define SOCKADDR_LEN(soc_address) ((struct sockaddr *)&soc_address)->sa_len
- #else
-+#ifndef SA_LEN
-+#define SA_LEN(x) (((x)->sa_family == AF_INET6)?sizeof(struct sockaddr_in6): \
-+      (((x)->sa_family == AF_INET)?sizeof(struct sockaddr_in):sizeof(struct sockaddr)))
-+#endif
- #define SOCKADDR_LEN(soc_address) SA_LEN((struct sockaddr *)&soc_address)
- #endif /* SIN6_LEN */
- #else

diff --git a/lynx-config.patch b/lynx-config.patch
index 34085885757698b27c8ecc04c90a0814398305cc..f6ba0723c43a3598b52fbafb41e38ada46de4d1b 100644 (file)
--- a/lynx-config.patch
+++ b/lynx-config.patch
@@ -73,7 +73,7 @@ diff -Nur lynx2-8-4.orig/lynx.cfg lynx2-8-4/lynx.cfg
 diff -Nur lynx2-8-4.orig/makefile.in lynx2-8-4/makefile.in
 --- 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 @@
+@@ -48,16 +48,16 @@
  MANDIR= $(DESTDIR)$(mandir)
  
  ## Where you want the lynx.cfg file installed
@@ -85,13 +85,14 @@ diff -Nur lynx2-8-4.orig/makefile.in lynx2-8-4/makefile.in
 -docdir= @libdir@/lynx_doc
 +docdir= @datadir@/lynx_doc
  DOCDIR= $(DESTDIR)$(docdir)
+ docdir1= $(shell echo "$(docdir)"|sed -e 's!^/!!')
  
  ## Where you want the help-files installed
 -helpdir= @libdir@/lynx_help
 +helpdir= @datadir@/lynx/help
  HELPDIR= $(DESTDIR)$(helpdir)
+ helpdir1= $(shell echo "$(helpdir)"|sed -e 's!^/!!')
  
- ##set the relative location of the WWW library Implementation directory,
 @@ -360,7 +360,7 @@
        @-rm -f help_files.tmp
  

diff --git a/lynx.spec b/lynx.spec
index d31e53cebffb1bbf6d72318fb26973ac5fb83181..bfc3756ab7ffd7ac2df62f26f272ee5fc1c35f91 100644 (file)
--- a/lynx.spec
+++ b/lynx.spec
@@ -4,10 +4,11 @@ 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.4pre.1
-Release:       2
+Version:       2.8.5dev.2
+Release:       1
 License:       GPL
 Group:         Applications/Networking
+Group(de):     Applikationen/Netzwerkwesen
 Group(pl):     Aplikacje/Sieciowe
 Source0:       http://lynx.isc.org/current/%{name}%{version}.tar.bz2
 Source1:       %{name}.desktop
@@ -17,15 +18,13 @@ 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
 BuildRequires: slang-devel
 BuildRequires: gettext-devel
-BuildRequires: autoconf
+#BuildRequires:        autoconf
 BuildRequires: openssl-devel >= 0.9.6b
-%requires_eq   openssl
 #BuildRequires:        socks5-devel
 Provides:      webclient
 Obsoletes:     lynx-ssl
@@ -54,18 +53,15 @@ Metin ekranda 
 formlar ve tablolar için desteði vardýr.
 
 %prep
-%setup  -q -n %{name}2-8-4
+%setup  -q -n %{name}2-8-5
 %patch0 -p1 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
-#rm -f configure
-#chmod 644 aclocal.m4
 #aclocal
 #autoconf
 %configure2_13 \