rpms/avahi/devel avahi-0.6.21-initscript.patch, NONE, 1.1 avahi.spec, 1.92, 1.93
Martin Bacovsky (mbacovsk)
fedora-extras-commits at redhat.com
Tue Aug 28 18:31:40 UTC 2007
Author: mbacovsk
Update of /cvs/pkgs/rpms/avahi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3719
Modified Files:
avahi.spec
Added Files:
avahi-0.6.21-initscript.patch
Log Message:
* Tue Aug 28 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.21-3
- resolves: #246875: Initscript Review
avahi-0.6.21-initscript.patch:
--- NEW FILE avahi-0.6.21-initscript.patch ---
diff -up avahi-0.6.21/initscript/fedora/avahi-daemon.in.initscript avahi-0.6.21/initscript/fedora/avahi-daemon.in
--- avahi-0.6.21/initscript/fedora/avahi-daemon.in.initscript 2007-08-28 15:00:24.000000000 +0200
+++ avahi-0.6.21/initscript/fedora/avahi-daemon.in 2007-08-28 17:34:28.000000000 +0200
@@ -14,20 +14,25 @@ OTHER_AVAHI_OPTS=""
# Source function library.
. /etc/init.d/functions
-
. /etc/sysconfig/network
-# Check that networking is configured.
-[ ${NETWORKING} = "no" ] && exit 0
AVAHI_BIN=@sbindir@/avahi-daemon
-test -x $AVAHI_BIN || exit 5
+
+if [ $1 == 'status' ]; then
+ test -x $AVAHI_BIN || exit 4
+else
+ test -x $AVAHI_BIN || exit 5
+fi
LOCKFILE=/var/lock/subsys/avahi-daemon
base=${0##*/}
start() {
+ # Check that networking is configured.
+ [ ${NETWORKING} = "no" ] && exit 1
+
echo -n $"Starting Avahi daemon... "
if [ -s /etc/localtime ]; then
cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
@@ -96,7 +101,7 @@ case "$1" in
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart}"
- exit 1
+ exit 2
esac
exit $RETVAL
diff -up avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in.initscript avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in
--- avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in.initscript 2007-08-28 17:35:07.000000000 +0200
+++ avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in 2007-08-28 17:36:48.000000000 +0200
@@ -14,18 +14,21 @@ OTHER_AVAHI_OPTS=""
# Source function library.
. /etc/init.d/functions
-
. /etc/sysconfig/network
-# Check that networking is configured.
-[ ${NETWORKING} = "no" ] && exit 0
-
AVAHI_BIN=@sbindir@/avahi-dnsconfd
-test -x $AVAHI_BIN || exit 5
+if [ $1 == 'status' ]; then
+ test -x $AVAHI_BIN || exit 4
+else
+ test -x $AVAHI_BIN || exit 5
+fi
LOCKFILE=/var/lock/subsys/avahi-dnsconfd
start() {
+ # Check that networking is configured.
+ [ ${NETWORKING} = "no" ] && exit 1
+
echo -n $"Starting Avahi DNS daemon... "
$AVAHI_BIN -D
RETVAL=$?
@@ -92,7 +95,7 @@ case "$1" in
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart}"
- exit 1
+ exit 2
;;
esac
Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- avahi.spec 12 Aug 2007 19:41:49 -0000 1.92
+++ avahi.spec 28 Aug 2007 18:31:08 -0000 1.93
@@ -6,7 +6,7 @@
%endif
Name: avahi
Version: 0.6.21
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Local network service discovery
Group: System Environment/Base
License: LGPL
@@ -38,6 +38,7 @@
# enable mono's mcs to work in beehive buildroot:
Patch1: avahi-0.6.21-avahi-browse-help-fix.patch
Patch2: avahi-0.6.3-MONO_SHARED_DIR.patch
+Patch3: avahi-0.6.21-initscript.patch
%description
Avahi is a system which facilitates service discovery on
@@ -210,6 +211,7 @@
%patch1 -p0 -b .avahi-browse-help-fix
%if %{WITH_MONO}
%patch2 -p1 -b .MONO_SHARED_DIR
+%patch3 -p1 -b .initscript
%endif
%build
@@ -464,6 +466,9 @@
%endif
%changelog
+* Tue Aug 28 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.21-3
+- resolves: #246875: Initscript Review
+
* Sun Aug 12 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-2
- Fix avahi-browse --help output
More information about the scm-commits
mailing list