libselinux: Update to 2.1.8.

Remove patch to link against shared object, because some tools doesn't work.

Conflicts:

	libselinux/libselinux.nm

diff --git a/libselinux/libselinux.nm b/libselinux/libselinux.nm
index be1c073cfa3b8430b39fbef823a53e5f631308cf..727cd7fa353a4b496be3d6077263504ca0a43eb3 100644 (file)
--- a/libselinux/libselinux.nm
+++ b/libselinux/libselinux.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = libselinux
-version    = 2.1.7
-release    = 3
+version    = 2.1.8
+release    = 1
 
 groups     = System/Libraries
 url        = http://www.selinuxproject.org
@@ -23,6 +23,7 @@ sources    = %{thisapp}.tgz
 build
        requires
                libsepol-devel
+               libsepol-static
                python-devel
                swig
        end
@@ -78,10 +79,6 @@ packages
                        /usr/share/man/man{5,8}/*
                end
        end
-
-       package %{name}-debuginfo
-               template DEBUGINFO
-       end
        
        package python-selinux
                summary =  SELinux python bindings.
@@ -91,4 +88,8 @@ packages
                        /usr/lib/python*
                end
        end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
 end

diff --git a/libselinux/patches/libselinux-ipfire.patch b/libselinux/patches/libselinux-ipfire.patch
deleted file mode 100644 (file)
index b955329..0000000
--- a/libselinux/patches/libselinux-ipfire.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur old/src/Makefile new/src/Makefile
---- old/src/Makefile   2011-11-04 13:57:23.000000000 +0100
-+++ new/src/Makefile   2011-11-19 12:24:54.163850653 +0100
-@@ -102,7 +102,7 @@
-       $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<
- 
- $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ)
--      $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) -Wl,-soname,$@
-+      $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -lsepol -L$(LIBDIR) -Wl,-soname,$@
- 
- %.o:  %.c policy.h
-       $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $<