make: Update to 4.2.1

[ipfire-3.x.git] / libdb / libdb.nm

diff --git a/libdb/libdb.nm b/libdb/libdb.nm
index 9fd650894ccfc62618eb796cc35e39612f20d12f..7b7a3a940e99c80d79ad7e7ea4e095d08a7e6bb4 100644 (file)
--- a/libdb/libdb.nm
+++ b/libdb/libdb.nm
@@ -4,9 +4,9 @@
 ###############################################################################
 
 name       = libdb
-version_major = 5
-version_minor = 2
-version_patch = 36
+version_major = 6
+version_minor = 1
+version_patch = 26
 version    = %{version_major}.%{version_minor}.%{version_patch}
 release    = 2
 thisapp    = db-%{version}
@@ -28,10 +28,12 @@ source_dl  = http://download.oracle.com/berkeley-db/
 
 build
        requires
+               automake
                chrpath
                gcc-c++
                libtool
                perl
+               zlib-devel
        end
 
        CFLAGS += -fno-strict-aliasing
@@ -39,8 +41,12 @@ build
        DIR_APP = %{DIR_SRC}/%{thisapp}/dist/dist-tls
 
        prepare_cmds
-               mkdir %{DIR_APP} && cd %{DIR_APP}
-               ln -s ../configure .
+               for i in $(find %{DIR_SRC}/%{thisapp} -name config.guess -or -name config.sub); do
+                       cp -vf %{datadir}/automake-*/config.{guess,sub} $(dirname ${i})
+               done
+
+               mkdir -pv %{DIR_APP} && cd %{DIR_APP}
+               ln -svf ../configure .
        end
 
        MACRO_FIX_LIBTOOL
@@ -87,6 +93,17 @@ packages
        package %{name}-devel
                template DEVEL
 
+               obsoletes
+                       compat-db-headers
+               end
+
+               # You cannot install libdb-devel and db4-devel
+               # at the same time.
+               conflicts
+                       compat-db-headers
+                       db4-devel
+               end
+
                files += !%{libdir}/libdb-%{soversion}.so
                files += !%{libdir}/libdb_sql-%{soversion}.so
        end