From e766e58b2cc96a870b45e43d189333661d0bccd629234b6089b976eb9226d927 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 19 Mar 2015 14:28:30 +0000 Subject: [PATCH] Accepting request 291415 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/291415 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=114 --- avahi-glib2.spec | 2 +- avahi-mono.spec | 3 ++- avahi-outdated-URL.patch | 19 +++++++++++++++++++ avahi-qt4.spec | 2 +- avahi.changes | 8 ++++++++ avahi.spec | 5 ++++- 6 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 avahi-outdated-URL.patch diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 97f0a92..253711d 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-glib2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/avahi-mono.spec b/avahi-mono.spec index 099291a..e50ceb5 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-mono # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -725,6 +725,7 @@ correct mDNS reflection across LAN segments. %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +License: LGPL-2.1+ Group: Development/Languages/Mono Requires: gtk-sharp2 Requires: libavahi-client3 >= %{version} diff --git a/avahi-outdated-URL.patch b/avahi-outdated-URL.patch new file mode 100644 index 0000000..8c25c19 --- /dev/null +++ b/avahi-outdated-URL.patch @@ -0,0 +1,19 @@ +Index: avahi-0.6.31/avahi-compat-libdns_sd/warn.c +=================================================================== +--- avahi-0.6.31.orig/avahi-compat-libdns_sd/warn.c ++++ avahi-0.6.31/avahi-compat-libdns_sd/warn.c +@@ -113,12 +113,12 @@ void avahi_warn_linkage(void) { + if (!w && !getenv("AVAHI_COMPAT_NOWARN")) { + avahi_warn("The program '%s' uses the "COMPAT_LAYER" compatibility layer of Avahi.", avahi_exe_name()); + avahi_warn("Please fix your application to use the native API of Avahi!"); +- avahi_warn("For more information see ", avahi_exe_name()); ++ avahi_warn("For more information see "); + } + } + + void avahi_warn_unsupported(const char *function) { + avahi_warn("The program '%s' called '%s()' which is not supported (or only supported partially) in the "COMPAT_LAYER" compatibility layer of Avahi.", avahi_exe_name(), function); + avahi_warn("Please fix your application to use the native API of Avahi!"); +- avahi_warn("For more information see ", avahi_exe_name(), function); ++ avahi_warn("For more information see "); + } diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 48f279d..a153469 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-qt4 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/avahi.changes b/avahi.changes index f5693cd..f1c4188 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 22 15:51:33 UTC 2015 - dimstar@opensuse.org + +- Add avahi-outdated-URL.patch: Do not redirect users to + , which no + longer exists, but bring them to the more generic blog entry + http://0pointer.de/blog/projects/avahi-compat.html (boo#914298). + ------------------------------------------------------------------- Sat Apr 26 20:06:15 UTC 2014 - dmueller@suse.com diff --git a/avahi.spec b/avahi.spec index 686df0d..4724c90 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,7 +1,7 @@ # # spec file for package avahi # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -94,6 +94,8 @@ Patch14: avahi-enable-ipv6.patch Patch15: avahi-move-everything-to-run.patch # PATCH-FIX-OPENSUSE avahi-reserve-space-for-record-data-when-size-e.patch bnc#835984 jlee@suse.com -- avahi-core: reserve space for record data when size estimate Patch16: avahi-reserve-space-for-record-data-when-size-e.patch +# PATCH-FIX-UPSTREAM avahi-outdated-URL.patch boo#914298 dimstar@opensuse.org -- Replace reference to no longer existing address with a more generic explanation URL +Patch17: avahi-outdated-URL.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -771,6 +773,7 @@ translation-update-upstream %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions