- Remove console apps for sediff, sediffx and apol

apol.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=APOL
+Name=SELinux Policy Analysis
 GenericName=SELinux Policy Analysis Tool 
 Comment=This tool can examine, search, and relate policy components and policy rules 
 #Icon=/usr/share/pixmaps/apol.xpm

seaudit.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=seaudit
+Name=SELinux Audit Log Analysis
 GenericName=SELinux Audit Log Analysis Tool
 Comment=The tool parses syslog files and extracts all policy , AVC and change of boolean messages. 
 #Icon=/usr/share/pixmaps/seaudit.xpm

sediffx.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=sediffx
+Name=SELinux Policy Difference
-GenericName=SELinux Policy Difference too
+GenericName=SELinux Policy Difference tool
 Comment=This tool allows you to compare two policy files
 Exec=/usr/bin/sediffx
 Type=Application

setools-rhat.patch

@@ -1,14 +1,3 @@
---- setools-2.3/apol/Makefile.rhat	2006-01-23 10:58:42.000000000 -0500
-+++ setools-2.3/apol/Makefile	2006-01-31 16:15:53.000000000 -0500
-@@ -85,7 +85,7 @@
- 	$(MAKE) -C .. libsefs
- 
- install: apol apol.tcl
--	install -m 755 apol $(BINDIR)
-+	install -m 755 apol $(SBINDIR)
- 	@if [ -n $(INSTALL_LIBDIR) ]; then \
- 		for file in $(TCL-FILES); do \
- 			if [ -f $(INSTALL_LIBDIR)/$$file ]; then \
 --- setools-2.3/Makefile.rhat	2006-01-23 10:58:42.000000000 -0500
 +++ setools-2.3/Makefile	2006-01-31 16:18:43.000000000 -0500
 @@ -12,7 +12,7 @@
@@ -29,15 +18,3 @@
  # all apps that have a te/fc file need to be listed here
  POLICYINSTALLDIRS 	= 
  # Help files here
---- setools-2.3/sediff/Makefile.rhat	2006-01-23 10:58:42.000000000 -0500
-+++ setools-2.3/sediff/Makefile	2006-01-31 16:15:53.000000000 -0500
-@@ -22,7 +22,8 @@
- 	install -m 644 ../man/sediff.1 $(MANDIR)/man1
- 
- install: all
--	install -m 755 sediff sediffx $(BINDIR);
-+	install -m 755 sediff $(BINDIR);
-+	install -m 755 sediffx $(SBINDIR);
- 	install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
- 	install -m 644 sediff_help.txt $(INSTALL_HELPDIR)
- 

setools.spec

@@ -1,17 +1,15 @@
 Summary: SELinux tools for managing policy
 Name: setools
 Version: 2.3
-Release: 1.2
+Release: 2
 License: GPL
 Group: System Environment/Base
 URL:	http://www.tresys.com/
 Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2
 Source1: setools.pam
-Source2: apol.console
 Source4: seaudit.console
 Source5: apol.desktop
 Source7: seaudit.desktop
-Source8: sediffx.console
 Source9: sediffx.desktop
 
 Prefix: %{_prefix}
@@ -105,21 +103,15 @@ rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/indexcon.1
 rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/replcon.1
 rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/findcon.1
 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/apol
 install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit
-install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/sediffx
 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps
-install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/apol
 install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit
-install -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/sediffx
 install -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/applications
 install -m 664 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop
 install -m 664 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
 install -m 664 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
 cd $RPM_BUILD_ROOT/%{_bindir}/
-ln -sf consolehelper apol 
 ln -sf consolehelper seaudit
-ln -sf consolehelper sediffx
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -129,9 +121,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir /usr/share/tcl8.4/BWidget-1.7.0
 /usr/share/tcl8.4/BWidget-1.7.0/*
 %{_bindir}/apol
-%{_sbindir}/apol
 %{_bindir}/sediffx
-%{_sbindir}/sediffx
 %{_bindir}/awish
 %{_bindir}/seaudit
 %{_sbindir}/seaudit
@@ -139,12 +129,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/applications/apol.desktop
 %{_datadir}/applications/seaudit.desktop
 %{_datadir}/applications/sediffx.desktop
-%config(noreplace) %{_sysconfdir}/pam.d/apol
 %config(noreplace) %{_sysconfdir}/pam.d/seaudit
-%config(noreplace) %{_sysconfdir}/pam.d/sediffx
-%config(noreplace) %{_sysconfdir}/security/console.apps/apol
 %config(noreplace) %{_sysconfdir}/security/console.apps/seaudit
-%config(noreplace) %{_sysconfdir}/security/console.apps/sediffx
 /usr/share/doc/setools-%{version}/apol*
 /usr/share/doc/setools-%{version}/seaudit_help.txt
 /usr/share/doc/setools-%{version}/types_relation_help.txt
@@ -234,6 +220,9 @@ Headers, static libraries and API docs for SETools.
 %{_libdir}/libsefs.so.1.2.1
 
 %changelog
+* Tue Mar 21 2006 Dan Walsh <dwalsh@redhat.com> 2.3-2
+- Remove console apps for sediff, sediffx and apol
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.3-1.2
 - bump again for double-long bug on ppc(64)