rpms/setools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- fixup configure.ac to expect SWIG 2.0.0; bump the python version to 2.7

Browse Source 
in patch 1
This commit is contained in:
dmalcolm 2010-07-26 21:47:56 +00:00
parent 019b809b55
commit 277093cf8e
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setools-python.patch
View File

@ -6,7 +6,7 @@ diff -up setools-3.3.6/configure.ac.python setools-3.3.6/configure.ac
do_swigify=yes do_swigify=yes
fi fi
+ +
+AM_PATH_PYTHON(2.6) +AM_PATH_PYTHON(2.7)
+ +
AC_ARG_ENABLE(swig-python, AC_ARG_ENABLE(swig-python,
AC_HELP_STRING([--enable-swig-python], AC_HELP_STRING([--enable-swig-python],

12
setools.spec
View File

@ -5,7 +5,7 @@
Name: setools Name: setools
Version: %{setools_maj_ver}.%{setools_min_ver} Version: %{setools_maj_ver}.%{setools_min_ver}
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2 License: GPLv2
URL: http://oss.tresys.com/projects/setools URL: http://oss.tresys.com/projects/setools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -188,6 +188,12 @@ This package includes the following graphical tools:
%setup -q %setup -q
%patch1 -p 1 -b .python %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 %build
%configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check \ %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 --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 %postun libs-tcl -p /sbin/ldconfig
%changelog %changelog
* Mon Jul 26 2010 David Malcolm <dmalcolm@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@redhat.com> - 3.3.7-3 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 3.3.7-3
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild