[setools/f18] Remove tools that we do not want to support
Daniel J Walsh
dwalsh at fedoraproject.org
Tue Sep 18 16:45:00 UTC 2012
commit ff8f52de46ec584f4f88bb3b273adb0aa3ca2822
Author: rhatdan <dwalsh at redhat.com>
Date: Tue Sep 18 12:44:34 2012 -0400
Remove tools that we do not want to support
setools.spec | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
---
diff --git a/setools.spec b/setools.spec
index e485e78..555fcfc 100644
--- a/setools.spec
+++ b/setools.spec
@@ -5,7 +5,7 @@
Name: setools
Version: %{setools_maj_ver}.%{setools_min_ver}
-Release: 28%{?dist}
+Release: 29%{?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
-Source4: sediffx.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
@@ -24,6 +23,7 @@ Patch7: 0007-Remove-unused-variables.patch
Patch8: 0008-Fix-output-to-match-policy-lines.patch
Patch9: 0009-Fix-swig-coding-style-for-structures.patch
Patch10: 0010-selinux_current_policy_path.patch
+Patch11: 0011-setools-noship.patch
Summary: Policy analysis tools for SELinux
Group: System Environment/Base
@@ -163,10 +163,7 @@ libraries designed to facilitate SELinux policy analysis.
This package includes the following console tools:
- seaudit-report audit log analysis tool
- sechecker SELinux policy checking tool
- secmds command line tools: seinfo, sesearch, findcon,
- replcon, and indexcon
+ secmds command line tools: seinfo, sesearch
sediff semantic policy difference tool
%package gui
@@ -186,7 +183,6 @@ This package includes the following graphical tools:
apol policy analysis tool
seaudit audit log analysis tool
- sediffx semantic policy difference tool
%define setoolsdir %{_datadir}/setools-%{setools_maj_ver}
%define pkg_py_lib %{python_sitelib}/setools
@@ -206,6 +202,7 @@ This package includes the following graphical tools:
%patch8 -p 1 -b .fixoutput
%patch9 -p 1 -b .fixswig
%patch10 -p 1 -b .current
+%patch11 -p 1 -b .noship
%ifarch sparc sparcv9 sparc64 s390 s390x
for file in `find . -name Makefile.am`; do
@@ -237,8 +234,7 @@ install -p -m 644 packages/rpm/seaudit.console ${RPM_BUILD_ROOT}%{_sysconfdir}/s
install -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/applications
install -p -m 644 apol/apol.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/apol.png
install -p -m 644 seaudit/seaudit.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/seaudit.png
-install -p -m 644 sediff/sediffx.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/sediffx.png
-desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} %{SOURCE3} %{SOURCE4}
+desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
ln -sf consolehelper ${RPM_BUILD_ROOT}/%{_bindir}/seaudit
# replace absolute symlinks with relative symlinks
ln -sf ../setools-%{setools_maj_ver}/qpol.jar ${RPM_BUILD_ROOT}/%{javajardir}/qpol.jar
@@ -252,7 +248,6 @@ rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.a
chmod 0755 ${RPM_BUILD_ROOT}/%{_libdir}/*.so.*
chmod 0755 ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/*/*.so.*
chmod 0755 ${RPM_BUILD_ROOT}/%{pkg_py_arch}/*.so.*
-chmod 0755 ${RPM_BUILD_ROOT}/%{setoolsdir}/seaudit-report-service
chmod 0644 ${RPM_BUILD_ROOT}/%{tcllibdir}/*/pkgIndex.tcl
%clean
@@ -312,33 +307,18 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(-,root,root,-)
%{_bindir}/seinfo
%{_bindir}/sesearch
-%{_bindir}/indexcon
-%{_bindir}/findcon
-%{_bindir}/replcon
%{_bindir}/sechecker
%{_bindir}/sediff
%{_bindir}/seaudit-report
-%{setoolsdir}/sechecker-profiles/
-%{setoolsdir}/sechecker_help.txt
-%{setoolsdir}/seaudit-report-service
-%{setoolsdir}/seaudit-report.conf
-%{setoolsdir}/seaudit-report.css
-%{_mandir}/man1/findcon.1.gz
-%{_mandir}/man1/indexcon.1.gz
-%{_mandir}/man1/replcon.1.gz
-%{_mandir}/man1/sechecker.1.gz
%{_mandir}/man1/sediff.1.gz
%{_mandir}/man1/seinfo.1.gz
%{_mandir}/man1/sesearch.1.gz
-%{_mandir}/man8/seaudit-report.8.gz
%files gui
%defattr(-,root,root,-)
%{_bindir}/seaudit
-%{_bindir}/sediffx
%{_bindir}/apol
%{tcllibdir}/apol_tcl/
-%{setoolsdir}/sediff_help.txt
%{setoolsdir}/apol_help.txt
%{setoolsdir}/domaintrans_help.txt
%{setoolsdir}/file_relabel_help.txt
@@ -351,7 +331,6 @@ rm -rf ${RPM_BUILD_ROOT}
%{setoolsdir}/apol.gif
%{setoolsdir}/dot_seaudit
%{_mandir}/man1/apol.1.gz
-%{_mandir}/man1/sediffx.1.gz
%{_mandir}/man8/seaudit.8.gz
%{_sbindir}/seaudit
%config(noreplace) %{_sysconfdir}/pam.d/seaudit
@@ -372,6 +351,9 @@ rm -rf ${RPM_BUILD_ROOT}
%postun libs-tcl -p /sbin/ldconfig
%changelog
+* Mon Sep 16 2012 Dan Walsh <dwalsh at redhat.com> - 3.3.7-29
+- Remove tools that we do not want to support
+
* Mon Aug 20 2012 Dan HorĂ¡k <dan[at]danny.cz> - 3.3.7-28
- use autoreconf to rebuild all autotooled files (FTBFS)
More information about the scm-commits
mailing list