[setools] Fix to build with latest swig

[Daniel J Walsh]

commit b606c9e8b9eb814b9ea5ad5d2cd6c67690080081
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Wed Jul 11 14:07:04 2012 -0400

    Fix to build with latest swig

 0010-missing-SWIGTYPE_p_int.java.patch |   22 ++++++++++++++++++++++
 setools.spec                           |   10 ++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/0010-missing-SWIGTYPE_p_int.java.patch b/0010-missing-SWIGTYPE_p_int.java.patch
new file mode 100644
index 0000000..921bef7
--- /dev/null
+++ b/0010-missing-SWIGTYPE_p_int.java.patch
@@ -0,0 +1,22 @@
+diff -up setools-3.3.7/libqpol/swig/java/Makefile.am~ setools-3.3.7/libqpol/swig/java/Makefile.am
+--- setools-3.3.7/libqpol/swig/java/Makefile.am~	2010-05-03 12:37:54.000000000 -0400
++++ setools-3.3.7/libqpol/swig/java/Makefile.am	2012-07-11 14:00:59.592367094 -0400
+@@ -48,7 +48,6 @@ BUILT_SOURCES = qpol_wrap.c \
+ 	qpol_type_t.java \
+ 	qpol_user_t.java \
+ 	qpol_validatetrans_t.java \
+-	SWIGTYPE_p_int.java \
+ 	SWIGTYPE_p_unsigned_int.java \
+ 	SWIGTYPE_p_void.java
+ 
+diff -up setools-3.3.7/libqpol/swig/java/Makefile.in~ setools-3.3.7/libqpol/swig/java/Makefile.in
+--- setools-3.3.7/libqpol/swig/java/Makefile.in~	2010-05-12 10:01:08.000000000 -0400
++++ setools-3.3.7/libqpol/swig/java/Makefile.in	2012-07-11 14:01:15.124459866 -0400
+@@ -396,7 +396,6 @@ BUILT_SOURCES = qpol_wrap.c \
+ 	qpol_type_t.java \
+ 	qpol_user_t.java \
+ 	qpol_validatetrans_t.java \
+-	SWIGTYPE_p_int.java \
+ 	SWIGTYPE_p_unsigned_int.java \
+ 	SWIGTYPE_p_void.java
+ 
diff --git a/setools.spec b/setools.spec
index d7ddaa9..248f855 100644
--- a/setools.spec
+++ b/setools.spec
@@ -5,7 +5,7 @@
 
 Name: setools
 Version: %{setools_maj_ver}.%{setools_min_ver}
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2
 URL: http://oss.tresys.com/projects/setools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -23,6 +23,8 @@ Patch6: 0006-Changes-to-support-named-file_trans-rules.patch
 Patch7: 0007-Remove-unused-variables.patch
 Patch8: 0008-Fix-output-to-match-policy-lines.patch
 Patch9: 0009-selinux_current_policy_path.patch
+Patch10: 0010-missing-SWIGTYPE_p_int.java.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}
@@ -36,7 +38,7 @@ Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{r
 %define sepol_ver 2.1.5-3
 %define selinux_ver 2.1.9-9
 %define sqlite_ver 3.2.0
-%define swig_ver 1.3.28
+%define swig_ver 2.0.7-3
 %define tcltk_ver 8.4.9
 
 %description
@@ -203,6 +205,7 @@ This package includes the following graphical tools:
 %patch7 -p 1 -b .unused 
 %patch8 -p 1 -b .fixoutput
 %patch9 -p 1 -b .current
+%patch10 -p 1 -b .swig
 
 %ifarch sparc sparcv9 sparc64 s390 s390x
     for file in `find . -name Makefile.am`; do
@@ -370,6 +373,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %postun libs-tcl -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 11 2012 Dan Walsh <dwalsh at redhat.com> - 3.3.7-24
+- Fix to build with latest swig
+
 * Mon Apr 23 2012 Dan Walsh <dwalsh at redhat.com> - 3.3.7-23
 - Rebuild to get latest libsepol which fixes the file_name transition problems
 - Use selinux_current_policy_path to read by default policy