New upstream release of setools.

.cvsignore

@@ -1 +1 @@
-setools-3.3.6.tar.bz2
+setools-3.3.7.tar.bz2

setools-qpol.patch

@@ -1,24 +0,0 @@
-diff -up setools-3.3.6/libqpol/include/qpol/Makefile.am~ setools-3.3.6/libqpol/include/qpol/Makefile.am
---- setools-3.3.6/libqpol/include/qpol/Makefile.am~	2009-07-14 14:03:27.000000000 -0400
-+++ setools-3.3.6/libqpol/include/qpol/Makefile.am	2009-07-28 09:01:32.000000000 -0400
-@@ -17,7 +17,7 @@ qpol_HEADERS = \
- 	netifcon_query.h \
- 	nodecon_query.h \
- 	permissive_query.h \
--	polcap_query.h
-+	polcap_query.h \
- 	policy.h \
- 	policy_extend.h \
- 	portcon_query.h \
-diff -up setools-3.3.6/libseaudit/swig/python/Makefile.am~ setools-3.3.6/libseaudit/swig/python/Makefile.am
---- setools-3.3.6/libseaudit/swig/python/Makefile.am~	2007-08-02 17:16:33.000000000 -0400
-+++ setools-3.3.6/libseaudit/swig/python/Makefile.am	2009-08-11 12:40:39.000000000 -0400
-@@ -10,7 +10,7 @@ BUILT_SOURCES = seaudit_wrap.c
- 
- AM_CFLAGS = @DEBUGCFLAGS@ @WARNCFLAGS@ @PROFILECFLAGS@ @SELINUX_CFLAGS@ \
- 	@QPOL_CFLAGS@ @APOL_CFLAGS@ -I$(top_builddir) -fpic \
--	-I$(top_srcdir)/libseaudit/include -D__attribute__\(x\)=''
-+	-I$(top_srcdir)/libseaudit/include
- AM_LDFLAGS = @DEBUGLDFLAGS@ @WARNLDFLAGS@ @PROFILELDFLAGS@ \
- 	@APOL_LIB_FLAG@ @QPOL_LIB_FLAG@ @SEAUDIT_LIB_FLAG@ @XML_LIBS@
- DEPENDENCIES = $(top_builddir)/libqpol/src/libqpol.so \

setools.spec

@@ -1,11 +1,11 @@
 %define setools_maj_ver 3.3
-%define setools_min_ver 6
+%define setools_min_ver 7
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: setools
 Version: %{setools_maj_ver}.%{setools_min_ver}
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 URL: http://oss.tresys.com/projects/setools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -14,8 +14,7 @@ Source1: setools.pam
 Source2: apol.desktop
 Source3: seaudit.desktop
 Source4: sediffx.desktop
-Patch1: setools-qpol.patch
-Patch2: setools-python.patch
+Patch1: setools-python.patch
 Summary: Policy analysis tools for SELinux
 Group: System Environment/Base
 Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{release} setools-gui = %{version}-%{release} setools-console = %{version}-%{release}
@@ -187,8 +186,7 @@ This package includes the following graphical tools:
 
 %prep
 %setup -q
-%patch1 -p 1 -b .qpol
-%patch2 -p 1 -b .python
+%patch1 -p 1 -b .python
 
 %build
 %configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check \
@@ -349,6 +347,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %postun libs-tcl -p /sbin/ldconfig
 
 %changelog
+* Wed May 12 2010 Chris PeBenito <cpebenito@tresys.com> 3.3.7-1
+- New upstream release.
+
 * Tue Aug 11 2009 Dan Walsh <dwalsh@redhat.com> 3.3.6-4
 - Add python bindings for sesearch and seinfo
 

sources

@@ -1 +1 @@
-93db5be0bfc32519f8e7fbf769542db5  setools-3.3.6.tar.bz2
+206d1b31d1dda4ace2fbf6ce02d13814  setools-3.3.7.tar.bz2