Accepting request 50492 from home:vuntz:branches:GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/50492
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=47
This commit is contained in:
Vincent Untz 2010-10-14 07:49:34 +00:00 committed by Git OBS Bridge
parent c9d11fa74c
commit cecb3e0c58
6 changed files with 44 additions and 0 deletions

View File

@ -68,6 +68,8 @@ Patch1: avahi-desktop.patch
Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
Patch3: avahi-empty-share-dir.patch
# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
Patch4: avahi-init-dnsconfd-fix-status.patch
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
@ -642,6 +644,7 @@ translation-update-upstream
%patch1 -p1
%patch2
%patch3
%patch4 -p1
%patch5 -p1
%patch10 -p1
%if !%build_core

View File

@ -0,0 +1,25 @@
From bd76c886b4bd44abad745b4b3c4bb99fe752c8f0 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 13 Oct 2010 16:36:35 +0200
Subject: [PATCH] init: suse, avahi-dnsconfd status reports dead instead of unused
---
initscript/suse/avahi-dnsconfd.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/initscript/suse/avahi-dnsconfd.in b/initscript/suse/avahi-dnsconfd.in
index e633b8d..4169737 100644
--- a/initscript/suse/avahi-dnsconfd.in
+++ b/initscript/suse/avahi-dnsconfd.in
@@ -37,7 +37,7 @@ case "$1" in
;;
status)
echo -n "Checking for Avahi DNS Configuration daemon: "
- $AVAHI_BIN -c
+ $AVAHI_BIN -c || _rc_status=3
rc_status -v
;;
*)
--
1.7.3.1

View File

@ -68,6 +68,8 @@ Patch1: avahi-desktop.patch
Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
Patch3: avahi-empty-share-dir.patch
# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
Patch4: avahi-init-dnsconfd-fix-status.patch
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
@ -641,6 +643,7 @@ translation-update-upstream
%patch1 -p1
%patch2
%patch3
%patch4 -p1
%patch5 -p1
%patch10 -p1
%if !%build_core

View File

@ -68,6 +68,8 @@ Patch1: avahi-desktop.patch
Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
Patch3: avahi-empty-share-dir.patch
# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
Patch4: avahi-init-dnsconfd-fix-status.patch
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
@ -644,6 +646,7 @@ translation-update-upstream
%patch1 -p1
%patch2
%patch3
%patch4 -p1
%patch5 -p1
%patch10 -p1
%if !%build_core

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Oct 13 16:43:18 CEST 2010 - vuntz@opensuse.org
- Add avahi-init-dnsconfd-fix-status.patch to make avahi-dnsconfd
init script report unused instead of dead in status when it's
unused.
-------------------------------------------------------------------
Tue Oct 5 10:52:15 CEST 2010 - vuntz@opensuse.org

View File

@ -70,6 +70,8 @@ Patch1: avahi-desktop.patch
Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
Patch3: avahi-empty-share-dir.patch
# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
Patch4: avahi-init-dnsconfd-fix-status.patch
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
@ -644,6 +646,7 @@ translation-update-upstream
%patch1 -p1
%patch2
%patch3
%patch4 -p1
%patch5 -p1
%patch10 -p1
%if !%build_core