apr-util: Don't link against nss.

Also fix packaging the openssl package and update
to libdb (was db4).

diff --git a/apr-util/apr-util.nm b/apr-util/apr-util.nm
index a4632da94ab0561b7abfb1919c3a073f786f57aa..7cc97fbefd79339872f63c1f24810bd7ae827b40 100644 (file)
--- a/apr-util/apr-util.nm
+++ b/apr-util/apr-util.nm
@@ -5,7 +5,7 @@
 
 name       = apr-util
 version    = 1.4.1
-release    = 2
+release    = 3
 
 groups     = System/Libraries
 url        = http://apr.apache.org/
@@ -23,11 +23,10 @@ source_dl  = http://www.apache.org/dist/apr/
 build
        requires
                autoconf
-               db4-devel
+               libdb-devel
                expat-devel
                libapr-devel
                libuuid-devel
-               nss-devel
                openssl-devel
        end
 
@@ -35,8 +34,7 @@ build
                --with-apr=/usr \
                --with-berkeley-db \
                --with-crypto \
-               --with-openssl \
-               --with-nss
+               --with-openssl
 
        install_cmds
                # Remove unneeded file.
@@ -47,25 +45,22 @@ end
 packages
        package %{name}
 
-       package %{name}-nss
-               summary = APR utility library NSS crytpo support.
-               description = %{summary}
-
-               requires = apr-util=%{thisver}
-
-               files = /usr/lib/apr-util*/apr_crypto_nss*
-       end
-
        package %{name}-openssl
                summary = APR utility library OpenSSL crytpo support.
                description = %{summary}
 
-               requires = apr-util=%{thisver}
+               requires
+                       apr-util = %{thisver}
+               end
 
-               files = /usr/lib/apr-util*/apr_crypto_openssl*
+               files = %{libdir}/apr-util*/apr_crypto_openssl*
        end
 
        package %{name}-devel
                template DEVEL
        end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
 end