rpms/radvd/devel radvd.init,1.8,1.9 radvd.spec,1.58,1.59

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/radvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20001

Modified Files:
	radvd.init radvd.spec 
Log Message:
* Mon Jan 25 2010 Jiri Skala <jskala at redhat.com> - 1.5-3
- spec file uses Source1 for radvd.init no more init from tarball
- radvd.init modified to make rmplint more silent
- removed userdel usage from postun



Index: radvd.init
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- radvd.init	18 Oct 2009 20:43:51 -0000	1.8
+++ radvd.init	25 Jan 2010 15:18:04 -0000	1.9
@@ -2,10 +2,7 @@
 #
 # $Id$
 #
-### BEGIN INIT INFO
-# provides: radvd
 # chkconfig: - 54 46
-# short-Description: router advertisement daemon for IPv6
 # description:	radvd is the router advertisement daemon for IPv6.  It \
 #		listens to router solicitations and sends router \
 #		advertisements as described in "Neighbor Discovery for IP \
@@ -18,6 +15,10 @@
 # pidfile: /var/run/radvd.pid
 # config: /etc/radvd.conf
 # config: /etc/sysconfig/radvd
+
+### BEGIN INIT INFO
+# Provides: radvd
+# Short-Description: router advertisement daemon for IPv6
 ### END INIT INFO
 
 # Source function library.
@@ -35,58 +36,58 @@ LOCKFILE=/var/lock/subsys/radvd
 # See how we were called.
 case "$1" in
   start)
-    if [ ! -f /etc/radvd.conf ]; then
-      echo $"Configuration file /etc/radvd.conf missing" 1>&2
-      exit 6
-    fi
-    if [ `id -u` -ne 0 ]; then
-      echo $"Insufficient privilege" 1>&2
-      exit 4
-    fi
-    echo -n $"Starting $PROG: "
-    daemon radvd $OPTIONS
-    RETVAL=$?
-    echo
-    if [ $RETVAL -eq 0 ]; then
-        touch $LOCKFILE
-    else
-        if [ -f $LOCKFILE ]; then
-            RETVAL=0
-        fi
-    fi
-    ;;
+	if [ ! -f /etc/radvd.conf ]; then
+		echo $"Configuration file /etc/radvd.conf missing" 1>&2
+		exit 6
+	fi
+	if [ `id -u` -ne 0 ]; then
+		echo $"Insufficient privilege" 1>&2
+		exit 4
+	fi
+	echo -n $"Starting $PROG: "
+	daemon radvd $OPTIONS
+	RETVAL=$?
+	echo
+	if [ $RETVAL -eq 0 ]; then
+		touch $LOCKFILE
+	else
+		if [ -f $LOCKFILE ]; then
+			RETVAL=0
+		fi
+	fi
+	;;
   stop)
-    echo -n $"Stopping $PROG: "
-    killproc radvd
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
-    ;;
+	echo -n $"Stopping $PROG: "
+	killproc radvd
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
+	;;
   status)
-    status radvd
-    RETVAL=$?
-    ;;
+	status radvd
+	RETVAL=$?
+	;;
   restart)
-    $0 stop
-    $0 start
-    RETVAL=$?
-    ;;
+	$0 stop
+	$0 start
+	RETVAL=$?
+	;;
   reload|force-reload)
-    echo -n $"Reloading $PROG: "
-    killproc radvd -HUP
-    RETVAL=$?	
-    echo
-    ;;
+	echo -n $"Reloading $PROG: "
+	killproc radvd -HUP
+	RETVAL=$?	
+	echo
+	;;
   condrestart|try-restart)
-    if [ -f $LOCKFILE ]; then
-      $0 stop
-      $0 start
-      RETVAL=$?
-    fi
-    ;;  
+        if [ -f $LOCKFILE ]; then
+		$0 stop
+		$0 start
+		RETVAL=$?
+	fi
+        ;;  
   *)
-    echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
-    exit 2
+	echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+	exit 2
 esac
 
 exit $RETVAL


Index: radvd.spec
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- radvd.spec	13 Jan 2010 15:02:32 -0000	1.58
+++ radvd.spec	25 Jan 2010 15:18:04 -0000	1.59
@@ -5,12 +5,13 @@
 Summary:    A Router Advertisement daemon
 Name:       radvd
 Version:    1.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
 License:    BSD with advertising
 Group:      System Environment/Daemons
 URL:        http://www.litech.org/radvd/
 Source:     http://www.litech.org/radvd/dist/%{name}-%{version}.tar.gz
+Source1:    radvd.init
 Requires(postun):   chkconfig, /usr/sbin/userdel, initscripts
 Requires(preun):    chkconfig, initscripts
 Requires(post):     chkconfig
@@ -57,7 +58,7 @@ mkdir -p $RPM_BUILD_ROOT%{initdir}
 mkdir -p $RPM_BUILD_ROOT/var/run/radvd
 
 install -m 644 redhat/radvd.conf.empty $RPM_BUILD_ROOT%{_sysconfdir}/radvd.conf
-install -m 755 redhat/radvd.init $RPM_BUILD_ROOT%{initdir}/radvd
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/radvd
 install -m 644 redhat/radvd.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/radvd
 
 %clean
@@ -67,9 +68,6 @@ install -m 644 redhat/radvd.sysconfig $R
 if [ "$1" -ge "1" ]; then
     /sbin/service radvd condrestart >/dev/null 2>&1
 fi
-if [ $1 = 0 ]; then
-        /usr/sbin/userdel radvd > /dev/null 2>&1 || :
-fi
 
 %post
 /sbin/chkconfig --add radvd
@@ -97,6 +95,11 @@ fi
 %{_sbindir}/radvdump
 
 %changelog
+* Mon Jan 25 2010 Jiri Skala <jskala at redhat.com> - 1.5-3
+- spec file uses Source1 for radvd.init no more init from tarball
+- radvd.init modified to make rmplint more silent
+- removed userdel usage from postun
+
 * Wed Jan 13 2010 Jan Gorig <jgorig at redhat.com> - 1.5-2
 - mistake in last build