]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commitdiff
db4: Make package work on x86_64.
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Dec 2011 13:46:37 +0000 (14:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Dec 2011 13:46:37 +0000 (14:46 +0100)
db4/db4.nm

index 3fd97ebc03f9cf19136f2eaae8df79ea4a336c86..0613b24672ad456ae0e0d139a53883babe62e76d 100644 (file)
@@ -7,7 +7,7 @@ name       = db4
 version_major = 4.8
 version_minor = 30
 version    = %{version_major}.%{version_minor}
-release    = 2
+release    = 3
 epoch      = 1
 thisapp    = db-%{version}
 
@@ -35,11 +35,13 @@ build
                cd %{DIR_APP}/build_unix
                CC=gcc \
                ../dist/configure \
-                       --prefix=/usr \
+                       %{configure_options} \
                        --enable-compat185 \
                        --enable-cxx \
                        --disable-static
 
+               %{MACRO_FIX_LIBTOOL}
+
                make %{PARALLELISMFLAGS}
        end
 
@@ -59,8 +61,7 @@ packages
                # Overwrite because of epoch != 0.
                requires = %{name}=%{epoch}:%{thisver}
 
-               files += \
-                       !/usr/lib*/libdb-%{version_major}.so
+               files += !%{libdir}/libdb-%{version_major}.so
        end
 
        package db4-utils
@@ -77,7 +78,7 @@ packages
                description = %{summary}
 
                files
-                       /usr/lib*/libdb_cxx-%{version_major}.so
+                       %{libdir}/libdb_cxx-%{version_major}.so
                end
        end