[setools/f18] Rebuild using pristine source from Tresys

Daniel J Walsh dwalsh at fedoraproject.org
Thu Feb 28 14:34:01 UTC 2013


commit 6642f8afecee25bf5cfe674d26c31289bf349d3b
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Thu Feb 28 09:33:58 2013 -0500

    Rebuild using pristine source from Tresys

 setools.spec |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/setools.spec b/setools.spec
index 85925b0..90f933f 100644
--- a/setools.spec
+++ b/setools.spec
@@ -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
@@ -195,9 +193,11 @@ This package includes the following graphical tools:
 # 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 autotooled files:
-autoreconf
+aclocal
+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:
@@ -248,7 +248,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %ifarch x86_64 ppc64 sparc64 s390x
 %{pkg_py_arch}/
 %endif
-%{python_sitearch}/setools*.egg-info
 
 %files libs-tcl
 %defattr(-,root,root,-)


More information about the scm-commits mailing list