Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

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

diff --git a/libselinux/libselinux.nm b/libselinux/libselinux.nm
index dbd857a1dc5a8a9830d6b47119ca7b662428ee10..0be2a677d77cbac3caebbffb93756764356898f6 100644 (file)
--- a/libselinux/libselinux.nm
+++ b/libselinux/libselinux.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = libselinux
-version    = 2.0.96
-release    = 2
+version    = 2.1.10
+release    = 1
 
 groups     = System/Libraries
 url        = http://www.selinuxproject.org
@@ -13,34 +13,36 @@ license    = Public Domain
 summary    = SELinux library and simple utilities.
 
 description
-       libselinux provides an API for SELinux applications to get and set \
-       process and file security contexts and to obtain security policy \
+       libselinux provides an API for SELinux applications to get and set
+       process and file security contexts and to obtain security policy
        decisions.
 end
 
-source_dl  =
 sources    = %{thisapp}.tgz
 
 build
        requires
                libsepol-devel
+               libsepol-static
                python-devel
                swig
        end
 
        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,18 +58,14 @@ 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
-
-               # Remove python module
-               rm -rvf %{BUILDROOT}/usr/lib/python*
+               # Fix weird symlink.
+               ln -svf libselinux.so.1 %{BUILDROOT}%{libdir}/libselinux.so
        end
 end
 
 packages
        package %{name}
-       end
-
+       
        package %{name}-devel
                template DEVEL
        end
@@ -80,20 +78,18 @@ packages
 
                files
                        /usr/sbin/*
-                       /usr/share/man/man{5,8}/*
+                       /usr/share/man/man{5,8}
+               end
+       end
+       
+       package python-selinux
+               summary =  SELinux python bindings.
+               description = SELinux python bindings for libselinux.
+       
+               def files
+                       %{libdir}/python*
                end
        end
-
-       #package python-selinux
-       #       summary =  SELinux python bindings.
-       #       description = SELinux python bindings for libselinux.
-       #
-       #       def files
-       #               /usr/lib/python*
-       #       end
-       #end
-
-
 
        package %{name}-debuginfo
                template DEBUGINFO