Accepting request 23662 from home:coolo:branches:openSUSE:Factory:branched
Copy from home:coolo:branches:openSUSE:Factory:branched/avahi via accept of submit request 23662 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/23662 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=24
This commit is contained in:
Git OBS Bridge
parent
35817905bf
commit
be5527a520
@ -31,7 +31,7 @@ Name: avahi-glib2
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.25
|
||||
Release: 3
|
||||
Release: 4
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
# Create split spec files only when building per partes:
|
||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||
@ -69,6 +69,8 @@ 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:
|
||||
@ -639,6 +641,7 @@ 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.
|
||||
|
||||
12
avahi-init_unused-not-dead.patch
Normal file
12
avahi-init_unused-not-dead.patch
Normal file
@ -0,0 +1,12 @@
|
||||
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
|
||||
;;
|
||||
*)
|
||||
@ -31,7 +31,7 @@ Name: avahi-mono
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.25
|
||||
Release: 3
|
||||
Release: 4
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
# Create split spec files only when building per partes:
|
||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||
@ -69,6 +69,8 @@ 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,6 +640,7 @@ 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.
|
||||
|
||||
@ -31,7 +31,7 @@ Name: avahi-qt4
|
||||
%define build_qt3 0
|
||||
%define build_qt4 1
|
||||
Version: 0.6.25
|
||||
Release: 3
|
||||
Release: 4
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
# Create split spec files only when building per partes:
|
||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||
@ -69,6 +69,8 @@ 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:
|
||||
@ -641,6 +643,7 @@ 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.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Index: avahi-0.6.23/avahi-daemon/avahi-daemon.conf
|
||||
Index: avahi-0.6.25/avahi-daemon/avahi-daemon.conf
|
||||
===================================================================
|
||||
--- avahi-0.6.23.orig/avahi-daemon/avahi-daemon.conf
|
||||
+++ avahi-0.6.23/avahi-daemon/avahi-daemon.conf
|
||||
--- avahi-0.6.25.orig/avahi-daemon/avahi-daemon.conf
|
||||
+++ avahi-0.6.25/avahi-daemon/avahi-daemon.conf
|
||||
@@ -23,7 +23,7 @@
|
||||
[server]
|
||||
#host-name=foo
|
||||
@ -10,4 +10,4 @@ Index: avahi-0.6.23/avahi-daemon/avahi-daemon.conf
|
||||
+#browse-domains=0pointer.de, zeroconf.org
|
||||
use-ipv4=yes
|
||||
use-ipv6=no
|
||||
#check-response-ttl=no
|
||||
#allow-interfaces=eth0
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 3 19:11:57 UTC 2009 - coolo@novell.com
|
||||
|
||||
- updated patches to apply with fuzz=0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ Name: avahi
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.25
|
||||
Release: 3
|
||||
Release: 4
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
# Create split spec files only when building per partes:
|
||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||
@ -71,6 +71,8 @@ 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:
|
||||
@ -641,6 +643,7 @@ 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.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user