rpms/setools/devel setools-python.patch, 1.2, 1.3 setools.spec, 1.97, 1.98

[dmalcolm]

Author: dmalcolm

Update of /cvs/pkgs/rpms/setools/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1736

Modified Files:
	setools-python.patch setools.spec 
Log Message:
* Mon Jul 26 2010 David Malcolm <dmalcolm at redhat.com> - 3.3.7-4
- fixup configure.ac to expect SWIG 2.0.0; bump the python version to 2.7 in
patch 1


setools-python.patch:
 Makefile.am                |    2 
 Makefile.in                |    4 
 configure.ac               |    6 
 python/Makefile.am         |    1 
 python/Makefile.in         |  715 +++++++++++++++++++++++++++++++++++++++++++++
 python/setools/Makefile.am |   36 ++
 python/setools/Makefile.in |  549 ++++++++++++++++++++++++++++++++++
 python/setools/__init__.py |   49 +++
 python/setools/seinfo.c    |  649 ++++++++++++++++++++++++++++++++++++++++
 python/setools/sesearch.c  |  477 ++++++++++++++++++++++++++++++
 python/setools/setup.py    |   25 +
 11 files changed, 2509 insertions(+), 4 deletions(-)

Index: setools-python.patch
===================================================================
RCS file: /cvs/pkgs/rpms/setools/devel/setools-python.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- setools-python.patch	11 Aug 2009 21:36:40 -0000	1.2
+++ setools-python.patch	26 Jul 2010 21:47:56 -0000	1.3
@@ -6,7 +6,7 @@ diff -up setools-3.3.6/configure.ac.pyth
     do_swigify=yes
  fi
 +
-+AM_PATH_PYTHON(2.6)
++AM_PATH_PYTHON(2.7)
 +
  AC_ARG_ENABLE(swig-python,
                AC_HELP_STRING([--enable-swig-python],


Index: setools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/setools/devel/setools.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- setools.spec	22 Jul 2010 06:29:33 -0000	1.97
+++ setools.spec	26 Jul 2010 21:47:56 -0000	1.98
@@ -5,7 +5,7 @@
 
 Name: setools
 Version: %{setools_maj_ver}.%{setools_min_ver}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 URL: http://oss.tresys.com/projects/setools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -188,6 +188,12 @@ This package includes the following grap
 %setup -q
 %patch1 -p 1 -b .python
 
+# Fixup expected version of SWIG:
+sed -i -e "s|AC_PROG_SWIG(1.3.28)|AC_PROG_SWIG(2.0.0)|g" configure.ac
+# and rebuild the configure script:
+autoconf
+
+
 %build
 %configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check \
     --enable-swig-python --enable-swig-java --enable-swig-tcl --with-java-prefix=/usr/lib/jvm/java
@@ -347,6 +353,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %postun libs-tcl -p /sbin/ldconfig
 
 %changelog
+* Mon Jul 26 2010 David Malcolm <dmalcolm at redhat.com> - 3.3.7-4
+- fixup configure.ac to expect SWIG 2.0.0; bump the python version to 2.7 in
+patch 1
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 3.3.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild