r5884: require cups to build and install; remove restruction from winbindd.init to...

diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index d5124d05edbea97c39c4b28655a1b694b41fe440..dc15a5acc3ea092117f04e48b2d4e612f5741740 100644 (file)
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -16,8 +16,8 @@ Source998: filter-requires-samba_rh8.sh
 Source999: filter-requires-samba_rh9.sh
 
 Packager: Gerald Carter [Samba-Team] <jerry@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 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
        --with-fhs \
        --with-quotas \
        --with-smbmount \
+       --enable-cups \
        --with-pam \
        --with-pam_smbpass \
        --with-syslog \

diff --git a/packaging/RedHat/winbind.init b/packaging/RedHat/winbind.init
index 1635dca93be098f3bf4c7fc05490d01d9bae182d..289ca590834dbffa38448587c2fb93e109458204 100644 (file)
--- a/packaging/RedHat/winbind.init
+++ b/packaging/RedHat/winbind.init
@@ -26,11 +26,8 @@ CONFIG=/etc/samba/smb.conf
 
 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 @@ start() {
 }      
 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