- use just "PLD Linux" in README.IPv6 (in ipv6 patch)

- added nolibnsl patch
- use db 4.x by default, bcond for db3

Changed files:
    webalizer-ipv6.patch -> 1.2
    webalizer-nolibnsl.patch -> 1.1
    webalizer.spec -> 1.46

diff --git a/webalizer-ipv6.patch b/webalizer-ipv6.patch
index e28ffdc99d54224fc52d493c79142f2e02f15e24..6f238138bd76589afe649d196f7c797655c94a1e 100644 (file)
--- a/webalizer-ipv6.patch
+++ b/webalizer-ipv6.patch
@@ -3,7 +3,7 @@ diff -Nur webalizer-2.01-10.orig/README.IPv6 webalizer-2.01-10/README.IPv6
 +++ webalizer-2.01-10/README.IPv6      Sun May  5 14:38:12 2002
 @@ -0,0 +1,2 @@
 +IPv6 port by Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
-+for PLD GNU/Linux, Sun Sep 2 2001
++for PLD Linux, Sun Sep 2 2001
 diff -Nur webalizer-2.01-10.orig/dns_resolv.c webalizer-2.01-10/dns_resolv.c
 --- webalizer-2.01-10.orig/dns_resolv.c        Tue Apr 16 22:46:20 2002
 +++ webalizer-2.01-10/dns_resolv.c     Sun May  5 14:47:20 2002

diff --git a/webalizer-nolibnsl.patch b/webalizer-nolibnsl.patch
new file mode 100644 (file)
index 0000000..1a44c6c
--- /dev/null
+++ b/webalizer-nolibnsl.patch
@@ -0,0 +1,10 @@
+--- webalizer-2.01-10/configure.in.orig        Fri Oct  6 09:51:49 2000
++++ webalizer-2.01-10/configure.in     Wed Feb 12 00:09:00 2003
+@@ -93,7 +93,6 @@
+     AC_CHECK_LIB(socket, main, LIBS="-lsocket ${LIBS}";)
+   fi
+   AC_CHECK_HEADERS(sys/socket.h)
+-  AC_CHECK_LIB(nsl, main, LIBS="-lnsl ${LIBS}")
+ fi
+ 
+ dnl Check for bsd 4.4 library -l44bsd:

diff --git a/webalizer.spec b/webalizer.spec
index 14107ef1ffcc7df63c7475e93895007a7e658042..81d7a972e0e47c06b129998b6ff7d402e52dc7ce 100644 (file)
--- a/webalizer.spec
+++ b/webalizer.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+# _with_db3    - use db3 instead of db package
+#
 %define                ver             2.01
 %define                patchlvl        10
 Summary:       The Webalizer - A web server log file analysis thingie
@@ -13,11 +17,13 @@ License:    GPL v2
 Group:         Networking/Utilities
 Source0:       ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlvl}-src.tar.bz2
 Patch0:                %{name}-ipv6.patch
+Patch1:                %{name}-nolibnsl.patch
 Icon:          webalizer.gif
 URL:           http://www.mrunix.net/webalizer/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: db-devel
+%{!?_with_db3:BuildRequires:   db-devel}
+%{?_with_db3:BuildRequires:    db3-devel}
 BuildRequires: gd-devel >= 2.0.1
 BuildRequires: libpng >= 1.0.8
 BuildRequires: zlib-devel
@@ -72,6 +78,7 @@ Webalizer - 
 %prep
 %setup -q -n %{name}-%{ver}-%{patchlvl}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}