upgrading package: inn 2.3.5 -> 2.4.0

inn/inn.patch

@@ -1,5 +1,5 @@
---- inn-2.3.5/scripts/innwatch.in.dist  Wed Dec  4 15:02:05 2002
-+++ inn-2.3.5/scripts/innwatch.in       Wed Dec  4 15:05:21 2002
+--- scripts/innwatch.in.dist  Wed Dec  4 15:02:05 2002
++++ scripts/innwatch.in       Wed Dec  4 15:05:21 2002
 @@ -126,7 +126,12 @@
  NEXTSLEEP=1
  HASEXITED=false

inn/inn.spec

@@ -24,7 +24,7 @@
 ##
 
 #   package versions
-%define       V_inn        2.3.5
+%define       V_inn        2.4.0
 %define       V_cleanfeed  20010805
 
 #   package information
@@ -37,7 +37,7 @@ Distribution: OpenPKG [BASE]
 Group:        News
 License:      ISC
 Version:      %{V_inn}
-Release:      20030409
+Release:      20030511
 
 #   list of sources
 Source0:      ftp://ftp.isc.org/isc/inn/inn-%{V_inn}.tar.gz
@@ -62,6 +62,7 @@ AutoReqProv:  no
 %prep
     %setup0 -q -c
     %setup1 -q -T -D -a 1
+    cd inn-%{V_inn}
     %patch0 -p0
 
 %build
@@ -81,8 +82,8 @@ AutoReqProv:  no
 
     #   configure the source tree
     CC="%{l_cc}" \
-    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
-    LDFLAGS="`%{l_prefix}/bin/fsl-config --ldflags --all`" \
+    CFLAGS="%{l_cflags -O} %{l_cppflags}" \
+    LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --ldflags --all`" \
     LIBS="`%{l_prefix}/bin/fsl-config --libs --all`" \
     ./configure \
         --prefix=%{l_prefix} \
@@ -95,7 +96,7 @@ AutoReqProv:  no
         --with-log-dir=%{l_prefix}/var/inn/log \
         --with-run-dir=%{l_prefix}/var/inn/run \
         --with-spool-dir=%{l_prefix}/var/inn/spool \
-        --with-tmp-path=%{l_prefix}/var/inn/tmp \
+        --with-tmp-dir=%{l_prefix}/var/inn/tmp \
         --with-openssl=%{l_prefix} \
         --with-berkeleydb=%{l_prefix} \
         --with-news-user=%{l_musr} \
@@ -146,9 +147,6 @@ AutoReqProv:  no
       rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/inn/filter/*.py
       rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/inn/*.tcl
       rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/inn/lib*.a
-      rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/inn/ovdb_upgrade
-      ln $RPM_BUILD_ROOT%{l_prefix}/libexec/inn/ovdb_recover \
-         $RPM_BUILD_ROOT%{l_prefix}/libexec/inn/ovdb_upgrade
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
 
       #   adjust configuration