[setools] Rebuild using pristine source from Tresys

[Daniel J Walsh]

commit 9bac5f8821aa20bbe940bc6f0cc7fec055e862a9
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Wed Jan 30 11:37:44 2013 -0500

    Rebuild using pristine source from Tresys

 ...tools-seinfo-and-sesearch-python-bindings.patch | 2960 --------------------
 ...Changes-to-support-named-file_trans-rules.patch |   22 -
 setools.spec                                       |   12 +-
 sources                                            |    2 +-
 4 files changed, 7 insertions(+), 2989 deletions(-)
---
diff --git a/0006-Changes-to-support-named-file_trans-rules.patch b/0006-Changes-to-support-named-file_trans-rules.patch
index af927ef..3cd7127 100644
--- a/0006-Changes-to-support-named-file_trans-rules.patch
+++ b/0006-Changes-to-support-named-file_trans-rules.patch
@@ -1492,17 +1492,6 @@ diff -up setools-3.3.7/libapol/include/apol/Makefile.am.filenametrans setools-3.
  	terule-query.h \
  	type-query.h \
  	types-relation-analysis.h \
-diff -up setools-3.3.7/libapol/include/apol/Makefile.in.filenametrans setools-3.3.7/libapol/include/apol/Makefile.in
---- setools-3.3.7/libapol/include/apol/Makefile.in.filenametrans	2010-05-12 10:01:06.000000000 -0400
-+++ setools-3.3.7/libapol/include/apol/Makefile.in	2011-10-26 16:25:07.834107745 -0400
-@@ -378,6 +378,7 @@ apol_HEADERS = \
- 	relabel-analysis.h \
- 	render.h \
- 	role-query.h \
-+	ftrule-query.h \
- 	terule-query.h \
- 	type-query.h \
- 	types-relation-analysis.h \
 diff -up setools-3.3.7/libqpol/include/qpol/Makefile.am.filenametrans setools-3.3.7/libqpol/include/qpol/Makefile.am
 --- setools-3.3.7/libqpol/include/qpol/Makefile.am.filenametrans	2011-10-26 16:22:28.723523155 -0400
 +++ setools-3.3.7/libqpol/include/qpol/Makefile.am	2011-10-26 16:22:41.283493767 -0400
@@ -1514,14 +1503,3 @@ diff -up setools-3.3.7/libqpol/include/qpol/Makefile.am.filenametrans setools-3.
  	type_query.h \
  	user_query.h \
  	util.h
-diff -up setools-3.3.7/libqpol/include/qpol/Makefile.in.filenametrans setools-3.3.7/libqpol/include/qpol/Makefile.in
---- setools-3.3.7/libqpol/include/qpol/Makefile.in.filenametrans	2010-05-12 10:01:07.000000000 -0400
-+++ setools-3.3.7/libqpol/include/qpol/Makefile.in	2011-10-26 16:22:56.375457650 -0400
-@@ -376,6 +376,7 @@ qpol_HEADERS = \
- 	role_query.h \
- 	syn_rule_query.h \
- 	terule_query.h \
-+	ftrule_query.h \
- 	type_query.h \
- 	user_query.h \
- 	util.h
diff --git a/setools.spec b/setools.spec
index 1c597ca..8ee8d11 100644
--- a/setools.spec
+++ b/setools.spec
@@ -5,7 +5,7 @@
 
 Name: setools
 Version: %{setools_maj_ver}.%{setools_min_ver}
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: GPLv2
 URL: http://oss.tresys.com/projects/setools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -13,7 +13,6 @@ Source: http://oss.tresys.com/projects/setools/chrome/site/dists/setools-%{versi
 Source1: setools.pam
 Source2: apol.desktop
 Source3: seaudit.desktop
-#Patch1: 0001-add-setools-seinfo-and-sesearch-python-bindings.patch
 Patch2: 0002-setools-should-exit-with-an-error-status-if-it-gets-.patch
 Patch3: 0003-Since-we-do-not-ship-neverallow-rules-all-always-fai.patch
 Patch4: 0004-Fix-man-pages-and-getoptions.patch
@@ -174,7 +173,6 @@ This package includes the following graphical tools:
 
 %prep
 %setup -q
-#%patch1 -p 1 -b .python
 %patch2 -p 1 -b .exitstatus
 %patch3 -p 1 -b .neverallow
 %patch4 -p 1 -b .manpage
@@ -196,11 +194,10 @@ This package includes the following graphical tools:
 sed -i -e "s|AC_PROG_SWIG(1.3.28)|AC_PROG_SWIG(2.0.0)|g" configure.ac
 # and rebuild the autotooled files:
 aclocal
-automake --add-missing
-autoconf
-
+autoreconf -if
 
 %build
+automake
 %configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check \
     --enable-swig-python --enable-swig-tcl
 # work around issue with gcc 4.3 + gnu99 + swig-generated code:
@@ -313,6 +310,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %postun libs-tcl -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 30 2013 Dan Walsh <dwalsh at redhat.com> - 3.3.7-34
+- Rebuild using pristine source from Tresys
+
 * Tue Jan 29 2013 Dan Walsh <dwalsh at redhat.com> - 3.3.7-33
 - Apply swig patch to make apol work again.
 
diff --git a/sources b/sources
index 1a9fb5f..870085d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-206d1b31d1dda4ace2fbf6ce02d13814  setools-3.3.7.tar.bz2
+0377d7a06028825434cd7b41a80865a5  setools-3.3.7.tar.bz2