From 35817905bfcff1a79c8fd2751ccef8c328803d5f50e9737f9b55052f203ae601 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Oct 2009 21:51:32 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=23 --- avahi-glib2.spec | 3 --- avahi-init_unused-not-dead.patch | 12 ------------ avahi-mono.spec | 3 --- avahi-qt4.spec | 3 --- avahi.changes | 6 ------ avahi.spec | 3 --- 6 files changed, 30 deletions(-) delete mode 100644 avahi-init_unused-not-dead.patch diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 23ce71d..0d80edf 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -69,8 +69,6 @@ Patch2: avahi-init-lsb.patch Patch3: avahi-empty-share-dir.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default Patch10: avahi-unicastdomains.patch -# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead -Patch11: avahi-init_unused-not-dead.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: @@ -638,7 +636,6 @@ things, like correct mDNS reflection across LAN segments. %setup -q -n %{_name}-%{version} %patch0 %patch1 -p1 -%patch11 -p1 %patch2 %patch3 %patch10 -p1 diff --git a/avahi-init_unused-not-dead.patch b/avahi-init_unused-not-dead.patch deleted file mode 100644 index d3385aa..0000000 --- a/avahi-init_unused-not-dead.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur avahi-0.6.25/initscript/suse/avahi-daemon.in avahi-0.6.25.patched/initscript/suse/avahi-daemon.in ---- avahi-0.6.25/initscript/suse/avahi-daemon.in 2008-06-18 01:13:44.000000000 +0200 -+++ avahi-0.6.25.patched/initscript/suse/avahi-daemon.in 2009-10-07 21:28:43.000000000 +0200 -@@ -37,7 +37,7 @@ - ;; - status) - echo -n "Checking for Avahi daemon: " -- $AVAHI_BIN -c -+ $AVAHI_BIN -c || _rc_status=3 - rc_status -v - ;; - *) diff --git a/avahi-mono.spec b/avahi-mono.spec index a87a6cf..88f9e8b 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -69,8 +69,6 @@ Patch2: avahi-init-lsb.patch Patch3: avahi-empty-share-dir.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default Patch10: avahi-unicastdomains.patch -# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead -Patch11: avahi-init_unused-not-dead.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: @@ -637,7 +635,6 @@ things, like correct mDNS reflection across LAN segments. %setup -q -n %{_name}-%{version} %patch0 %patch1 -p1 -%patch11 -p1 %patch2 %patch3 %patch10 -p1 diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 51e8f47..15b0331 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -69,8 +69,6 @@ Patch2: avahi-init-lsb.patch Patch3: avahi-empty-share-dir.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default Patch10: avahi-unicastdomains.patch -# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead -Patch11: avahi-init_unused-not-dead.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: @@ -640,7 +638,6 @@ things, like correct mDNS reflection across LAN segments. %setup -q -n %{_name}-%{version} %patch0 %patch1 -p1 -%patch11 -p1 %patch2 %patch3 %patch10 -p1 diff --git a/avahi.changes b/avahi.changes index 92bf17a..ba8b1fe 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Oct 7 21:36:26 CEST 2009 - dimstar@opensuse.org - -- Add avahi-init_unused-not-dead.patch, init scripts report - service dead instead of unused after a stop (bnc#329708). - ------------------------------------------------------------------- Thu Aug 13 19:11:24 CEST 2009 - vuntz@novell.com diff --git a/avahi.spec b/avahi.spec index c00fbbf..6a99c34 100644 --- a/avahi.spec +++ b/avahi.spec @@ -71,8 +71,6 @@ Patch2: avahi-init-lsb.patch Patch3: avahi-empty-share-dir.patch #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default Patch10: avahi-unicastdomains.patch -# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead -Patch11: avahi-init_unused-not-dead.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: @@ -643,7 +641,6 @@ things, like correct mDNS reflection across LAN segments. %patch2 %patch3 %patch10 -p1 -%patch11 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la.