[setools/f18] Rebuild using pristine source from Tresys

Daniel J Walsh dwalsh at fedoraproject.org
Thu Feb 28 14:11:00 UTC 2013


commit 0b9f99b04ce5a515e751ee1e510f8c0a5aa70629
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Thu Feb 28 09:10:47 2013 -0500

    Rebuild using pristine source from Tresys

 setools.spec |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/setools.spec b/setools.spec
index 8ee8d11..85925b0 100644
--- a/setools.spec
+++ b/setools.spec
@@ -13,6 +13,7 @@ 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
@@ -35,8 +36,8 @@ Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{r
 %define bwidget_ver 1.8
 %define gtk_ver 2.8
 %define python_ver 2.3
-%define sepol_ver 2.1.8-5
-%define selinux_ver 2.1.12-10
+%define sepol_ver 2.1.5-3
+%define selinux_ver 2.1.9-9
 %define sqlite_ver 3.2.0
 %define swig_ver 2.0.7-3
 %define tcltk_ver 8.4.9
@@ -173,6 +174,7 @@ 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
@@ -193,11 +195,9 @@ 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:
-aclocal
-autoreconf -if
+autoreconf
 
 %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,6 +248,7 @@ 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,-)
@@ -316,9 +317,6 @@ rm -rf ${RPM_BUILD_ROOT}
 * Tue Jan 29 2013 Dan Walsh <dwalsh at redhat.com> - 3.3.7-33
 - Apply swig patch to make apol work again.
 
-* Mon Jan 7 2013 Dan Walsh <dwalsh at redhat.com> - 3.3.7-32
-- Rebuild with new tool chain
-
 * Fri Sep 28 2012 Dan Walsh <dwalsh at redhat.com> - 3.3.7-31
 - Add filename_trans to python/setools/sesearch bindings
 


More information about the scm-commits mailing list