[PATCH 1/8] setools -- Fix FTBFS with swig >= 2.0

[PATCH 1/8] setools -- Fix FTBFS with swig >= 2.0

[Laurent Bigonville]

Hi,

Here a series of patches applied to the setools package in debian


Cheers,
Laurent Bigonville


Description: Fix FTBFS with swig >= 2.0
Author: Sebastian Ramacher <s.ramacher@gmx.at>
Date: Tue, 28 Jun 2011 22:19:49 +0200
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=631800

--- setools-3.3.6.ds.orig/m4/ac_pkg_swig.m4	2007-02-09 18:32:41.000000000 +0100
+++ setools-3.3.6.ds/m4/ac_pkg_swig.m4	2011-06-27 14:12:03.000000000 +0200
@@ -106,15 +106,18 @@
                         if test -z "$available_patch" ; then
                                 [available_patch=0]
                         fi
-                        if test $available_major -ne $required_major \
-                                -o $available_minor -ne $required_minor \
-                                -o $available_patch -lt $required_patch ; then
-                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
-                                SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
-                        else
+                        if test $available_major -gt $required_major || \
+                                ( test $available_major -eq $required_major && \
+                                      test $available_minor -gt $required_minor ) || \
+                                ( test $available_major -eq $required_major && \
+                                        test $available_minor -eq $required_minor && \
+                                        test $available_patch -ge $required_patch ) ; then
                                 AC_MSG_NOTICE([SWIG executable is '$SWIG'])
                                 SWIG_LIB=`$SWIG -swiglib`
                                 AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
+                        else
+                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
+                                SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
                         fi
                 else
                         AC_MSG_WARN([cannot determine SWIG version])

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Since we are sending patches for setools upstream.

[Daniel J Walsh]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Here is the current patches for Fedora setools.

http://people.fedoraproject.org/~dwalsh/SELinux/setools/0001-add-setools-seinfo-and-sesearch-python-bindings.patch
http://people.fedoraproject.org/~dwalsh/SELinux/setools/0002-setools-should-exit-with-an-error-status-if-it-gets-.patch
http://people.fedoraproject.org/~dwalsh/SELinux/setools/0003-Since-we-do-not-ship-neverallow-rules-all-always-fai.patch
http://people.fedoraproject.org/~dwalsh/SELinux/setools/0004-Fix-man-pages-and-getoptions.patch
http://people.fedoraproject.org/~dwalsh/SELinux/setools/0005-Fix-sepol-calls-to-work-with-latest-libsepol.patch
http://people.fedoraproject.org/~dwalsh/SELinux/setools/0006-Changes-to-support-named-file_trans-rules.patch
http://people.fedoraproject.org/~dwalsh/SELinux/setools/0007-Remove-unused-variables.patch
http://people.fedoraproject.org/~dwalsh/SELinux/setools/0008-Fix-output-to-match-policy-lines.patch
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk9yKC8ACgkQrlYvE4MpobON1QCgkfZNJOrsJ7Ji06ty0olRwSgV
7ZoAoMvbXo+cFiJJ4+MpymSDeo6W1kmT
=aCvo
-----END PGP SIGNATURE-----

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.