packaging: Remove SWAT references from RHEL-CTDB

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>

3 files changed, 3 insertions, 52 deletions

diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index a2d35ea01d6..0409f50c65f 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -44,8 +44,6 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \
 	--mandir=${_mandir} \
 	--with-piddir=/var/run \
 	--with-privatedir=${_sysconfdir}/samba \
-	--with-sambabook=${_datadir}/swat/using_samba \
-	--with-swatdir=${_datadir}/swat \
 	--disable-cups \
 	--with-acl-support \
 	--with-ads \
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 6380158bec8..fe214d27faf 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -100,19 +100,6 @@ packages of Samba.
 
 
 #######################################################################
-%package swat
-Summary: The Samba SMB server configuration program.
-Group: Applications/System
-Requires: samba = %{version} xinetd
-Provides: samba-swat = %{version}-%{release}
-
-%description swat
-The samba-swat package includes the new SWAT (Samba Web Administration
-Tool), for remotely managing Samba's smb.conf file using your favorite
-Web browser.
-
-
-#######################################################################
 %package doc
 Summary:      Samba Documentation
 Group:        Documentation/Other
@@ -120,9 +107,9 @@ Provides:     samba-doc = %{version}-%{release}
 Requires:       /usr/bin/find /bin/rm /usr/bin/xargs
 
 %description doc
-The samba-doc package includes the HTML versions of the Samba manpages
-utilized by SWAT as well as the HTML and PDF version of "Using Samba",
-"Samba By Example", and "The Official Samba HOWTO and Reference Guide".
+The samba-doc package includes the HTML versions of the Samba manpages as well
+as the HTML and PDF version of "Using Samba", "Samba By Example", and "The
+Official Samba HOWTO and Reference Guide".
 
 
 #######################################################################
@@ -226,7 +213,6 @@ find examples docs -type f | xargs -r chmod -x
 rm -rf $RPM_BUILD_ROOT
 
 # Create the target build directory hierarchy
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/samba/swat/{help,include,using_samba/{figs,gifsa}}
 mkdir -p $RPM_BUILD_ROOT%{_includedir}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT{%{_libarchdir},%{_includedir}}
@@ -280,7 +266,6 @@ cp -p source3/bin/winbind_krb5_locator.so ${RPM_BUILD_ROOT}/%{_libarchdir}/krb5/
 # Install the miscellany
 echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
 
-install -m644 setup/swat $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
 install -m644 setup/samba.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
 install -m755 setup/smb.init $RPM_BUILD_ROOT%{initdir}/smb
 install -m755 setup/winbind.init $RPM_BUILD_ROOT%{initdir}/winbind
@@ -339,12 +324,6 @@ exit 0
 
 #%postun
 
-%post swat
-# Add swat entry to /etc/services if not already there.
-if [ ! "`grep ^\s**swat /etc/services`" ]; then
-        echo 'swat        901/tcp     # Add swat service used via inetd' >> /etc/services
-fi
-
 %post common
 /sbin/ldconfig
 
@@ -463,17 +442,6 @@ exit 0
 
 ##########
 
-%files swat
-%defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/xinetd.d/swat
-%dir %{_datadir}/samba/swat
-%{_datadir}/samba/swat/*
-%{_sbindir}/swat
-%{_mandir}/man8/swat.8*
-%attr(755,root,root) %{_datadir}/samba/codepages/*.msg
-
-##########
-
 %files client
 %defattr(-,root,root)
 
diff --git a/packaging/RHEL-CTDB/setup/swat b/packaging/RHEL-CTDB/setup/swat
deleted file mode 100644
index 8b62348dde3..00000000000
--- a/packaging/RHEL-CTDB/setup/swat
+++ /dev/null
@@ -1,15 +0,0 @@
-# default: off
-# description: SWAT is the Samba Web Admin Tool. Use swat \
-#	       to configure your Samba server. To use SWAT, \
-#	       connect to port 901 with your favorite web browser.
-service swat
-{
-	port		= 901
-	socket_type	= stream
-	wait 		= no
-	only_from 	= 127.0.0.1
-	user		= root
-	server		= /usr/sbin/swat
-	log_on_failure	+= USERID
-	disable		= yes
-}