libselinux: Make package work on x86_64.

Conflicts:

	libselinux/libselinux.nm

diff --git a/libselinux/libselinux.nm b/libselinux/libselinux.nm
index 1624a35b92265a25269560c51dac03d0aaa8ea01..d3982b0e19b12b62519e4b6c3e52ace8c34c9cb7 100644 (file)
--- a/libselinux/libselinux.nm
+++ b/libselinux/libselinux.nm
@@ -5,7 +5,7 @@
 
 name       = libselinux
 version    = 2.1.9
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.selinuxproject.org
@@ -35,11 +35,13 @@ build
                make CC=gcc LIBDIR="%{libdir}" CFLAGS="-g %{CFLAGS}" pywrap
        end
 
-       make_install_targets += LIBDIR="%{BUILDROOT}%{libdir}" \
+       # Install libraries to correct place.
+       make_install_targets += \
+               LIBDIR="%{BUILDROOT}%{libdir}" \
                SHLIBDIR="%{BUILDROOT}/%{lib}"
 
        install_cmds
-               make install-pywrap DESTDIR=%{BUILDROOT} LIBDIR="%{BUILDROOT}%{libdir}"
+               make install-pywrap %{make_install_targets} DESTDIR=%{BUILDROOT}
 
                # Remove unwanted binaries
                rm -f %{BUILDROOT}/usr/sbin/compute_*
@@ -85,7 +87,7 @@ packages
                description = SELinux python bindings for libselinux.
        
                def files
-                       /usr/lib/python*
+                       %{libdir}/python*
                end
        end