diff --git a/setools-python.patch b/setools-python.patch index 49c43d0..03596e3 100644 --- a/setools-python.patch +++ b/setools-python.patch @@ -6,7 +6,7 @@ diff -up setools-3.3.6/configure.ac.python setools-3.3.6/configure.ac 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], diff --git a/setools.spec b/setools.spec index 6c8822d..910778b 100644 --- a/setools.spec +++ b/setools.spec @@ -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 graphical tools: %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 - 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 - 3.3.7-3 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild