- Upgrade to upstream version

setools.spec

@@ -1,16 +1,14 @@
 Summary: SELinux tools for managing policy
 Name: setools
-Version: 2.1.3
+Version: 2.2
 Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2
 Source1: setools.pam
 Source2: apol.console
-Source3: seuserx.console
 Source4: seaudit.console
 Source5: apol.desktop
-Source6: seuserx.desktop
 Source7: seaudit.desktop
 Source8: sediffx.console
 Source9: sediffx.desktop
@@ -40,19 +38,10 @@ Multi-level Security.
 
 The tools and libraries in this release include:
 
-1. seuser: A GUI and command line user manager tool for SELinux.  This 
+1. libapol: The main policy.conf analysis library, which is the core 
-is a tool that actually manages a portion of a running policy (i.e., 
-user accounts).  
-
-2. seuser scripts: A set of shell scripts: seuseradd, seusermod, and 
-seuserdel.  These scripts combine the functions of the associated s* 
-commands with seuser to provide a single interface to manage users in 
-SE Linux.
-
-3. libapol: The main policy.conf analysis library, which is the core 
 library for all our tools.
 
-See the help files for apol, sepcut, and seuser for help on using the 
+See the help files for apol and sepcutfor help on using the 
 tools.
 
 %package gui
@@ -86,7 +75,7 @@ setools libraries.  We use this to test our GUIs (apol and seuser have the
 interpreter compiled within them).  One could conceivably write one's own 
 GUI tools using TCL/TK as extended via awish.
 
-See the help files for apol, sepcut, and seuser for help on using the 
+See the help files for apol and sepcut for help on using the 
 tools.
 
 %prep
@@ -105,30 +94,24 @@ mkdir -p $RPM_BUILD_ROOT%{_includedir}/selinux/apol
 mkdir -p $RPM_BUILD_ROOT/usr/share/doc/setools-%{version}
 mkdir -p $RPM_BUILD_ROOT/usr/share/tcl8.4
 make DESTDIR="${RPM_BUILD_ROOT}" INSTALL_HELPDIR=$RPM_BUILD_ROOT/usr/share/doc/setools-%{version} LIBDIR=%{_libdir} install install-bwidget
-rm -f ${RPM_BUILD_ROOT}/etc/selinux/strict/src/policy/domains/program/seuser.te
-rm -f ${RPM_BUILD_ROOT}/etc/selinux/strict/src/policy/file_contexts/program/seuser.fc
 rm -f ${RPM_BUILD_ROOT}/usr/bin/findcon
 rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon
 rm -f ${RPM_BUILD_ROOT}/usr/bin/searchcon
 rm -f ${RPM_BUILD_ROOT}/usr/bin/indexcon
 install -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/apol
-install -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seuserx
 install -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit
 install -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/sediffx
 install -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/sepcut
 install -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/apol
-install -D %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seuserx
 install -D %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit
 install -D %{SOURCE8} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/sediffx
 install -D %{SOURCE10} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/sepcut
 install -D %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop
-install -D %{SOURCE6} ${RPM_BUILD_ROOT}%{_datadir}/applications/seuserx.desktop
 install -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
 install -D %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
 install -D %{SOURCE11} ${RPM_BUILD_ROOT}%{_datadir}/applications/sepcut.desktop
 cd $RPM_BUILD_ROOT/%{_bindir}/
 ln -sf consolehelper apol 
-ln -sf consolehelper seuserx
 ln -sf consolehelper seaudit
 ln -sf consolehelper sepcut
 ln -sf consolehelper sediffx
@@ -143,8 +126,6 @@ rm -rf ${RPM_BUILD_ROOT}
 /usr/share/tcl8.4/BWidget-1.4.1/*
 %{_bindir}/apol
 %{_sbindir}/apol
-%{_bindir}/seuserx
-%{_sbindir}/seuserx
 %{_bindir}/sediff
 %{_bindir}/sediffx
 %{_sbindir}/sediffx
@@ -155,17 +136,14 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/sepcut
 %{_sbindir}/sepcut
 %{_datadir}/applications/apol.desktop
-%{_datadir}/applications/seuserx.desktop
 %{_datadir}/applications/seaudit.desktop
 %{_datadir}/applications/sediffx.desktop
 %{_datadir}/applications/sepcut.desktop
 %config %{_sysconfdir}/pam.d/apol
-%config %{_sysconfdir}/pam.d/seuserx
 %config %{_sysconfdir}/pam.d/seaudit
 %config %{_sysconfdir}/pam.d/sediffx
 %config %{_sysconfdir}/pam.d/sepcut
 %config %{_sysconfdir}/security/console.apps/apol
-%config %{_sysconfdir}/security/console.apps/seuserx
 %config %{_sysconfdir}/security/console.apps/seaudit
 %config %{_sysconfdir}/security/console.apps/sediffx
 %config %{_sysconfdir}/security/console.apps/sepcut
@@ -185,10 +163,6 @@ Headers, static libraries and API docs for SETools.
 
 %files
 %defattr(-,root,root)
-%{_bindir}/seuser
-%{_bindir}/seuseradd
-%{_bindir}/seuserdel
-%{_bindir}/seusermod
 %{_bindir}/seinfo
 %{_bindir}/sesearch
 %dir /usr/share/setools
@@ -197,6 +171,9 @@ Headers, static libraries and API docs for SETools.
 /usr/share/doc/setools-%{version}/*
 
 %changelog
+* Thu Nov 3 2005 Dan Walsh <dwalsh@redhat.com> 2.2
+- Upgrade to upstream version
+
 * Thu Oct 13 2005 Dan Walsh <dwalsh@redhat.com> 2.1.3-1
 - Upgrade to upstream version