dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ypbind
-# $Id: Makefile,v 1.1 2004/09/09 15:12:10 cvsdist Exp $
-NAME := ypbind
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ypbind.init

@@ -99,18 +99,18 @@ start() {
 	    		fi
 		fi
 		sleep 2
-		echo -n "..."
+		echo -n "."
 	done
 	if [ $RETVAL -eq 0 ]; then
-	    logger -t ypbind \
-	    	"NIS domain: `domainname`, NIS server: `ypwhich 2> /dev/null`"
-	    touch /var/lock/subsys/ypbind
-	    success
+		logger -t ypbind \
+			"NIS domain: `domainname`, NIS server: `ypwhich 2> /dev/null`"
+		touch /var/lock/subsys/ypbind
+		success
 	else
-	    logger -t ypbind \
-	    	"NIS server for domain `domainname` is not responding."
-	    failure
-	    #selinux_off
+		logger -t ypbind \
+			"NIS server for domain `domainname` is not responding."
+		failure
+		#selinux_off
 		RETVAL=100
 	fi
 	echo
@@ -121,10 +121,10 @@ stop() {
 	echo -n $"Shutting down NIS service: "
 	killproc ypbind
 	RETVAL=$?
-	if [ $RETVAL -eq 0 ] ; then
+	if [ $RETVAL -eq 0 ]; then
 		rm -f /var/lock/subsys/ypbind
 		# if  we used brute force (like kill -9) we don't want those around
-		if [ x$(domainname) != x ] ; then
+		if [ x$(domainname) != x ]; then
 			rm -f /var/yp/binding/$(domainname)*
 		fi
 	fi
@@ -138,30 +138,52 @@ restart() {
 	start
 }
 
+reload() {
+	echo -n $"Reloading NIS service: "
+        p=`/sbin/pidof -o %PPID 'ypbind'`
+        RETVAL=$?
+        if [ "$RETVAL" -eq 0 ]; then
+            /bin/kill -HUP $p
+            RETVAL=$?
+        fi
+        [ "$RETVAL" -eq 0 ] && success || failure
+        echo
+        return $RETVAL
+}
+
 RETVAL=0
 
 # See how we were called.
 case "$1" in
   start)
-	start 
-	[ $? -eq 100 ] && stop
+	start
+	RETVAL=$?
+	if [ $RETVAL -eq 100 ]; then stop; RETVAL=1; fi
 	;;
   stop)
 	stop
+	RETVAL=$?
 	;;
   status)
 	status ypbind
 	RETVAL=$?
 	;;
-  restart|reload)
+  restart)
 	restart
+	RETVAL=$?
 	;;
-  condrestart)
-        [ -f /var/lock/subsys/ypbind ] && restart || :
+  condrestart|try-restart)
+	if [ -e /var/lock/subsys/ypbind ]; then restart; fi
+	;;
+  reload)
+	reload
+	;;
+  force-reload)
+	if ! reload; then restart; fi
 	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-	exit 1
+	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
+	RETVAL=3
 esac
 
-exit $?
+exit $RETVAL

ypbind.spec

@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.20.4
-Release: 9%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -92,6 +92,14 @@ fi
 %doc README NEWS
 
 %changelog
+* Wed Apr  8 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.20.4-11
+- Remove LSB Header from init script
+  Resolves: #494827
+
+* Wed Mar 11 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.20.4-10
+- Fix init script
+  Resolves: #489200
+
 * Tue Oct 21 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.20.4-9
 - Merge Review - remove dot from end of the summary, convert all tags
   in %%changelog to utf-8, escape %% character in changelog, fix