svn commit: samba r5884 - in branches/SAMBA_3_0/packaging/RedHat: .

[jerry at samba.org]

Author: jerry
Date: 2005-03-18 15:58:47 +0000 (Fri, 18 Mar 2005)
New Revision: 5884

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5884

Log:
require cups to build and install; remove restruction from winbindd.init to have 'idmap [g|u]id' range set in smb.conf
Modified:
   branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl
   branches/SAMBA_3_0/packaging/RedHat/winbind.init


Changeset:
Modified: branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl
===================================================================
--- branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl	2005-03-18 15:06:17 UTC (rev 5883)
+++ branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl	2005-03-18 15:58:47 UTC (rev 5884)
@@ -16,8 +16,8 @@
 Source999: filter-requires-samba_rh9.sh
 
 Packager: Gerald Carter [Samba-Team] <jerry at samba.org>
-Requires: pam openldap krb5-libs 
-BuildRequires: openldap-devel krb5-devel pam-devel
+Requires: pam openldap krb5-libs cups
+BuildRequires: openldap-devel krb5-devel pam-devel cups-devel
 Prereq: chkconfig fileutils /sbin/ldconfig
 Provides: samba = %{version}
 Obsoletes: samba-common, samba-client, samba-swat
@@ -90,6 +90,7 @@
 	--with-fhs \
 	--with-quotas \
 	--with-smbmount \
+	--enable-cups \
 	--with-pam \
 	--with-pam_smbpass \
 	--with-syslog \

Modified: branches/SAMBA_3_0/packaging/RedHat/winbind.init
===================================================================
--- branches/SAMBA_3_0/packaging/RedHat/winbind.init	2005-03-18 15:06:17 UTC (rev 5883)
+++ branches/SAMBA_3_0/packaging/RedHat/winbind.init	2005-03-18 15:58:47 UTC (rev 5884)
@@ -26,11 +26,8 @@
 
 start() {
 	echo -n "Starting Winbind services: "
-	RETVAL=1
-	if [ "`egrep -i '(idmap.*uid|winbind.*uid)' $CONFIG | egrep -v [\#\;]`" ]; then
-		daemon winbindd 
-		RETVAL=$?
-	fi
+	daemon winbindd 
+	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/winbind || \
 	   RETVAL=1
@@ -38,11 +35,8 @@
 }	
 stop() {
 	echo -n "Shutting down Winbind services: "
-	RETVAL=1
-	if [ "`egrep -i '(idmap.*uid|winbind.*uid)' $CONFIG | egrep -v [\#\;]`" ]; then
-		killproc winbindd
-		RETVAL=$?
-	fi
+	killproc winbindd
+	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/winbind
 	return $RETVAL