audit: Make package work on x86_64.

diff --git a/audit/audit.nm b/audit/audit.nm
index 66017be7b8f9c46a6a6bb781cc9b7ee994462c2c..239c63f9fd1a96871af44e11a35bf25c0e78f5f7 100644 (file)
--- a/audit/audit.nm
+++ b/audit/audit.nm
@@ -5,7 +5,7 @@
 
 name       = audit
 version    = 2.1.3
-release    = 7
+release    = 8
 
 groups     = System/Daemons
 url        = http://people.redhat.com/sgrubb/audit/
@@ -34,7 +34,7 @@ build
        configure_options += \
                --sysconfdir=/etc \
                --sbindir=/sbin \
-               --libdir=/lib \
+               --libdir=/%{lib} \
                --without-prelude \
                --without-libwrap \
                --enable-gssapi-krb5=no \
@@ -44,14 +44,10 @@ build
                autoreconf -fvi
        end
 
-       test
-               make check
-       end
-
        install_cmds
-               rm -vf %{BUILDROOT}/lib/libau{dit,parse}.so
-               ln -svf ../../lib/libaudit.so.1 %{BUILDROOT}/usr/lib/libaudit.so
-               ln -svf ../../lib/libauparse.so.0 %{BUILDROOT}/usr/lib/libauparse.so
+               rm -vf %{BUILDROOT}/%{lib}/libau{dit,parse}.so
+               ln -svf ../../%{lib}/libaudit.so.1 %{BUILDROOT}%{libdir}/libaudit.so
+               ln -svf ../../%{lib}/libauparse.so.0 %{BUILDROOT}%{libdir}/libauparse.so
 
                mkdir -pv %{BUILDROOT}/usr/sbin/
                mv -v %{BUILDROOT}/sbin/audisp*remote %{BUILDROOT}/usr/sbin/
@@ -91,6 +87,12 @@ packages
 
        package %{name}-devel
                template DEVEL
+
+               # Just require the libs to link
+               # against them.
+               requires
+                       %{name}-libs = %{thisver}
+               end
        end
 
        package python-%{name}