libnetfilter_queue: Update to 1.0.2.

[people/ms/ipfire-3.x.git] / libselinux / libselinux.nm

diff --git a/libselinux/libselinux.nm b/libselinux/libselinux.nm
index 727cd7fa353a4b496be3d6077263504ca0a43eb3..0be2a677d77cbac3caebbffb93756764356898f6 100644 (file)
--- a/libselinux/libselinux.nm
+++ b/libselinux/libselinux.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libselinux
-version    = 2.1.8
+version    = 2.1.10
 release    = 1
 
 groups     = System/Libraries
@@ -30,17 +30,19 @@ build
 
        build
                make clean
-               make CC=gcc LIBDIR="%{libdir}" CFLAGS="-g %{CFLAGS}" swigify
-               make CC=gcc LIBDIR="%{libdir}" CFLAGS="-g %{CFLAGS}" all
-               make CC=gcc LIBDIR="%{libdir}" CFLAGS="-g %{CFLAGS}" pywrap
+               make CC=gcc LIBDIR="%{libdir}" SHLIBDIR="%{libdir}" CFLAGS="-g %{CFLAGS}" swigify
+               make CC=gcc LIBDIR="%{libdir}" SHLIBDIR="%{libdir}" CFLAGS="-g %{CFLAGS}" all
+               make CC=gcc LIBDIR="%{libdir}" SHLIBDIR="%{libdir}" CFLAGS="-g %{CFLAGS}" pywrap
        end
 
-       make_install_targets += LIBDIR="%{BUILDROOT}%{libdir}" \
-               SHLIBDIR="%{BUILDROOT}/%{lib}"
+       # Install libraries to correct place.
+       make_install_targets += install-pywrap \
+               BINDIR="%{BUILDROOT}%{bindir}" \
+               SBINDIR="%{BUILDROOT}%{sbindir}" \
+               LIBDIR="%{BUILDROOT}%{libdir}" \
+               SHLIBDIR="%{BUILDROOT}%{libdir}"
 
        install_cmds
-               make install-pywrap DESTDIR=%{BUILDROOT} LIBDIR="%{BUILDROOT}%{libdir}"
-
                # Remove unwanted binaries
                rm -f %{BUILDROOT}/usr/sbin/compute_*
                rm -f %{BUILDROOT}/usr/sbin/deftype
@@ -56,8 +58,8 @@ build
                rm -f %{BUILDROOT}/usr/sbin/getseuser
                rm -f %{BUILDROOT}/usr/sbin/selinux_check_securetty_context
 
-               # Move binaries from /sbin to /usr/sbin
-               mv %{BUILDROOT}/sbin/* %{BUILDROOT}/usr/sbin
+               # Fix weird symlink.
+               ln -svf libselinux.so.1 %{BUILDROOT}%{libdir}/libselinux.so
        end
 end
 
@@ -76,7 +78,7 @@ packages
 
                files
                        /usr/sbin/*
-                       /usr/share/man/man{5,8}/*
+                       /usr/share/man/man{5,8}
                end
        end
        
@@ -85,7 +87,7 @@ packages
                description = SELinux python bindings for libselinux.
        
                def files
-                       /usr/lib/python*
+                       %{libdir}/python*
                end
        end