From d51576696d93b97e4840c8aada06eb221b808902591bd32ff4081b0214123dc0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 30 May 2011 20:33:10 +0000 Subject: [PATCH 1/4] Accepting request 72181 from home:aturrini:branches:GNOME:Factory Fixed typos in descriptions of avahi-glib2.spec and of avahi.spec OBS-URL: https://build.opensuse.org/request/show/72181 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=59 --- avahi-glib2.spec | 44 ++++++++++++++++++++++---------------------- avahi.spec | 44 ++++++++++++++++++++++---------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index b478eaf..6dc4b1e 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -212,7 +212,7 @@ Obsoletes: avahi-compat-mDNSResponder < %{version} %description -n libdns_sd Apple mDNSResponder compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -222,7 +222,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libhowl0 License: LGPLv2.1+ @@ -235,7 +235,7 @@ Obsoletes: avahi-compat-howl < %{version} %description -n libhowl0 Howl compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -245,7 +245,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n python-avahi License: LGPLv2.1+ @@ -301,7 +301,7 @@ Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} %description -n libavahi-devel -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -311,7 +311,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel License: LGPLv2.1+ @@ -324,7 +324,7 @@ Obsoletes: mDNSResponder-devel < 107.5 %description compat-mDNSResponder-devel Apple mDNSResponder compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -334,7 +334,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package compat-howl-devel License: LGPLv2.1+ @@ -345,7 +345,7 @@ Group: Development/Libraries/C and C++ %description compat-howl-devel Howl compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -355,7 +355,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_glib2 @@ -408,7 +408,7 @@ Obsoletes: avahi-glib < %{version} %description -n libavahi-glib1 GLib support for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -418,7 +418,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 License: LGPLv2.1+ @@ -502,7 +502,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-glib.so %description -n libavahi-glib-devel GLib support for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -512,7 +512,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel License: LGPLv2.1+ @@ -548,7 +548,7 @@ Obsoletes: avahi-qt3 < %{version} %description -n libavahi-qt3-1 Qt3 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -558,7 +558,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel @@ -572,7 +572,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt3.so %description -n libavahi-qt3-devel Qt3 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -582,7 +582,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_qt4 @@ -598,7 +598,7 @@ Obsoletes: avahi-qt4 < %{version} %description -n libavahi-qt4-1 Qt4 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -608,7 +608,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel License: LGPLv2.1+ @@ -621,7 +621,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt4.so %description -n libavahi-qt4-devel Qt4 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -631,7 +631,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_core diff --git a/avahi.spec b/avahi.spec index 4dee2fb..1d569a2 100644 --- a/avahi.spec +++ b/avahi.spec @@ -214,7 +214,7 @@ Obsoletes: avahi-compat-mDNSResponder < %{version} %description -n libdns_sd Apple mDNSResponder compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -224,7 +224,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libhowl0 License: LGPLv2.1+ @@ -237,7 +237,7 @@ Obsoletes: avahi-compat-howl < %{version} %description -n libhowl0 Howl compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -247,7 +247,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n python-avahi License: LGPLv2.1+ @@ -303,7 +303,7 @@ Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} %description -n libavahi-devel -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -313,7 +313,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel License: LGPLv2.1+ @@ -326,7 +326,7 @@ Obsoletes: mDNSResponder-devel < 107.5 %description compat-mDNSResponder-devel Apple mDNSResponder compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -336,7 +336,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package compat-howl-devel License: LGPLv2.1+ @@ -347,7 +347,7 @@ Group: Development/Libraries/C and C++ %description compat-howl-devel Howl compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -357,7 +357,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_glib2 @@ -410,7 +410,7 @@ Obsoletes: avahi-glib < %{version} %description -n libavahi-glib1 GLib support for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -420,7 +420,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 License: LGPLv2.1+ @@ -504,7 +504,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-glib.so %description -n libavahi-glib-devel GLib support for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -514,7 +514,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel License: LGPLv2.1+ @@ -550,7 +550,7 @@ Obsoletes: avahi-qt3 < %{version} %description -n libavahi-qt3-1 Qt3 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -560,7 +560,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel @@ -574,7 +574,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt3.so %description -n libavahi-qt3-devel Qt3 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -584,7 +584,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_qt4 @@ -600,7 +600,7 @@ Obsoletes: avahi-qt4 < %{version} %description -n libavahi-qt4-1 Qt4 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -610,7 +610,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel License: LGPLv2.1+ @@ -623,7 +623,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt4.so %description -n libavahi-qt4-devel Qt4 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -633,7 +633,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_core From a8e957e1fa5d6938ce41093c196bc72f0ad3e2a88abc45bea991d0d34ab99b57 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 31 May 2011 10:46:15 +0000 Subject: [PATCH 2/4] Updating link to change in openSUSE:Factory/avahi revision 80.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=c1496ad7e9d525755286b1d97907acc3 --- avahi-glib2.spec | 1 + avahi-mono.spec | 1 + avahi-qt4.spec | 1 + avahi.spec | 1 + 4 files changed, 4 insertions(+) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 6dc4b1e..fb33b61 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -380,6 +380,7 @@ across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} + License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries diff --git a/avahi-mono.spec b/avahi-mono.spec index 0b0b4d9..c6d3048 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -379,6 +379,7 @@ across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} + License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 9050cc6..d96eb46 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -382,6 +382,7 @@ across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} + License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries diff --git a/avahi.spec b/avahi.spec index 1d569a2..2ddb821 100644 --- a/avahi.spec +++ b/avahi.spec @@ -382,6 +382,7 @@ across LAN segments. %package -n libavahi-ui-gtk3-%{avahi_gtk3_soname} + License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries From 4d345cf34c81e657c89e5bc5f7256873b01274beaef74a20cfef014dd8b15913 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 4 Jul 2011 07:35:42 +0000 Subject: [PATCH 3/4] Accepting request 75082 from home:dimstar:branches:GNOME:Factory Fix build with gtk2/gtk3 OBS-URL: https://build.opensuse.org/request/show/75082 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=61 --- avahi-glib2.spec | 3 +++ avahi-gtk_box_new.patch | 52 +++++++++++++++++++++++++++++++++++++++++ avahi-mono.spec | 47 ++++++++++++++++++++----------------- avahi-qt4.spec | 47 ++++++++++++++++++++----------------- avahi.changes | 6 +++++ avahi.spec | 3 +++ 6 files changed, 114 insertions(+), 44 deletions(-) create mode 100644 avahi-gtk_box_new.patch diff --git a/avahi-glib2.spec b/avahi-glib2.spec index fb33b61..e63a053 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -69,6 +69,8 @@ Patch1: avahi-desktop.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-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new. +Patch11: avahi-gtk_box_new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: @@ -667,6 +669,7 @@ translation-update-upstream %patch1 -p1 %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. diff --git a/avahi-gtk_box_new.patch b/avahi-gtk_box_new.patch new file mode 100644 index 0000000..a8070b5 --- /dev/null +++ b/avahi-gtk_box_new.patch @@ -0,0 +1,52 @@ +Index: avahi-0.6.30/avahi-ui/avahi-ui.c +=================================================================== +--- avahi-0.6.30.orig/avahi-ui/avahi-ui.c ++++ avahi-0.6.30/avahi-ui/avahi-ui.c +@@ -991,7 +991,11 @@ static void domain_button_clicked(GtkBut + gtk_dialog_set_has_separator(GTK_DIALOG(p->domain_dialog), FALSE); + #endif + ++#if GTK_CHECK_VERSION(3,0,0) ++ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); ++#else + vbox = gtk_vbox_new(FALSE, 8); ++#endif + gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); + gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(p->domain_dialog))), vbox, TRUE, TRUE, 0); + +@@ -1002,7 +1006,11 @@ static void domain_button_clicked(GtkBut + g_signal_connect(p->domain_entry, "changed", G_CALLBACK(domain_entry_changed_callback), d); + gtk_box_pack_start(GTK_BOX(vbox), p->domain_entry, FALSE, FALSE, 0); + ++#if GTK_CHECK_VERSION(3,0,0) ++ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); ++#else + vbox2 = gtk_vbox_new(FALSE, 8); ++#endif + gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0); + + scrolled_window = gtk_scrolled_window_new(NULL, NULL); +@@ -1113,7 +1121,11 @@ static void aui_service_dialog_init(AuiS + + gtk_container_set_border_width(GTK_CONTAINER(d), 5); + ++#if GTK_CHECK_VERSION(3,0,0) ++ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); ++#else + vbox = gtk_vbox_new(FALSE, 8); ++#endif + gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); + gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(d))), vbox, TRUE, TRUE, 0); + +@@ -1123,7 +1135,11 @@ static void aui_service_dialog_init(AuiS + gtk_box_pack_start(GTK_BOX(vbox), p->domain_label, FALSE, FALSE, 0); + + ++#if GTK_CHECK_VERSION(3,0,0) ++ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); ++#else + vbox2 = gtk_vbox_new(FALSE, 8); ++#endif + gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0); + + scrolled_window = gtk_scrolled_window_new(NULL, NULL); diff --git a/avahi-mono.spec b/avahi-mono.spec index c6d3048..db0b91a 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -69,6 +69,8 @@ Patch1: avahi-desktop.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-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new. +Patch11: avahi-gtk_box_new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: @@ -211,7 +213,7 @@ Obsoletes: avahi-compat-mDNSResponder < %{version} %description -n libdns_sd Apple mDNSResponder compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -221,7 +223,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libhowl0 License: LGPLv2.1+ @@ -234,7 +236,7 @@ Obsoletes: avahi-compat-howl < %{version} %description -n libhowl0 Howl compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -244,7 +246,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n python-avahi License: LGPLv2.1+ @@ -300,7 +302,7 @@ Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} %description -n libavahi-devel -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -310,7 +312,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel License: LGPLv2.1+ @@ -323,7 +325,7 @@ Obsoletes: mDNSResponder-devel < 107.5 %description compat-mDNSResponder-devel Apple mDNSResponder compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -333,7 +335,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package compat-howl-devel License: LGPLv2.1+ @@ -344,7 +346,7 @@ Group: Development/Libraries/C and C++ %description compat-howl-devel Howl compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -354,7 +356,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_glib2 @@ -408,7 +410,7 @@ Obsoletes: avahi-glib < %{version} %description -n libavahi-glib1 GLib support for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -418,7 +420,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 License: LGPLv2.1+ @@ -502,7 +504,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-glib.so %description -n libavahi-glib-devel GLib support for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -512,7 +514,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel License: LGPLv2.1+ @@ -548,7 +550,7 @@ Obsoletes: avahi-qt3 < %{version} %description -n libavahi-qt3-1 Qt3 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -558,7 +560,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel @@ -572,7 +574,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt3.so %description -n libavahi-qt3-devel Qt3 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -582,7 +584,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_qt4 @@ -598,7 +600,7 @@ Obsoletes: avahi-qt4 < %{version} %description -n libavahi-qt4-1 Qt4 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -608,7 +610,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel License: LGPLv2.1+ @@ -621,7 +623,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt4.so %description -n libavahi-qt4-devel Qt4 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -631,7 +633,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_core @@ -666,6 +668,7 @@ translation-update-upstream %patch1 -p1 %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. diff --git a/avahi-qt4.spec b/avahi-qt4.spec index d96eb46..fde90c8 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -69,6 +69,8 @@ Patch1: avahi-desktop.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-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new. +Patch11: avahi-gtk_box_new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: @@ -214,7 +216,7 @@ Obsoletes: avahi-compat-mDNSResponder < %{version} %description -n libdns_sd Apple mDNSResponder compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -224,7 +226,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libhowl0 License: LGPLv2.1+ @@ -237,7 +239,7 @@ Obsoletes: avahi-compat-howl < %{version} %description -n libhowl0 Howl compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -247,7 +249,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n python-avahi License: LGPLv2.1+ @@ -303,7 +305,7 @@ Provides: avahi-devel = %{version} Obsoletes: avahi-devel < %{version} %description -n libavahi-devel -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -313,7 +315,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package compat-mDNSResponder-devel License: LGPLv2.1+ @@ -326,7 +328,7 @@ Obsoletes: mDNSResponder-devel < 107.5 %description compat-mDNSResponder-devel Apple mDNSResponder compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -336,7 +338,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package compat-howl-devel License: LGPLv2.1+ @@ -347,7 +349,7 @@ Group: Development/Libraries/C and C++ %description compat-howl-devel Howl compatibility layer for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -357,7 +359,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_glib2 @@ -411,7 +413,7 @@ Obsoletes: avahi-glib < %{version} %description -n libavahi-glib1 GLib support for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -421,7 +423,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-gobject0 License: LGPLv2.1+ @@ -505,7 +507,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-glib.so %description -n libavahi-glib-devel GLib support for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -515,7 +517,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel License: LGPLv2.1+ @@ -551,7 +553,7 @@ Obsoletes: avahi-qt3 < %{version} %description -n libavahi-qt3-1 Qt3 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -561,7 +563,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-qt3-devel @@ -575,7 +577,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt3.so %description -n libavahi-qt3-devel Qt3 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -585,7 +587,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_qt4 @@ -601,7 +603,7 @@ Obsoletes: avahi-qt4 < %{version} %description -n libavahi-qt4-1 Qt4 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -611,7 +613,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel License: LGPLv2.1+ @@ -624,7 +626,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt4.so %description -n libavahi-qt4-devel Qt4 bindings for avahi. -Avahi is an Implementation the DNS Service Discovery and Multicast DNS +Avahi is an implementation the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. It uses D-BUS for communication between user applications and a system daemon. The daemon is used to coordinate application efforts in caching replies, necessary to @@ -634,7 +636,7 @@ The Avahi mDNS responder is now feature complete implementing all MUSTs and the majority of the SHOULDs of the mDNS/DNS-SD RFCs. It passes all tests in the Apple Bonjour conformance test suite. In addition it supports some nifty things that have never been seen elsewhere like -correct mDNS reflection accross LAN segments. +correct mDNS reflection across LAN segments. %endif %if %build_core @@ -669,6 +671,7 @@ translation-update-upstream %patch1 -p1 %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. diff --git a/avahi.changes b/avahi.changes index 39b094e..fa5123a 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 2 12:18:24 UTC 2011 - dimstar@opensuse.org + +- Add avahi-gtk_box_new.patch: Do not used deprecated + gtk_[hv]box_new function anymore. Fixes build of avahi-glib2. + ------------------------------------------------------------------- Wed May 18 20:37:41 CEST 2011 - dimstar@opensuse.org diff --git a/avahi.spec b/avahi.spec index 2ddb821..098a0f8 100644 --- a/avahi.spec +++ b/avahi.spec @@ -71,6 +71,8 @@ Patch1: avahi-desktop.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-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new. +Patch11: avahi-gtk_box_new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream # Even if we are not building python bindings, we need python to build service types database: @@ -669,6 +671,7 @@ translation-update-upstream %patch1 -p1 %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. From b1118f74d4ee9908598e233059fb493e3d5f57e800aac4416548d123a1162ace Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 4 Jul 2011 07:36:58 +0000 Subject: [PATCH 4/4] Accepting request 75231 from home:vuntz:branches:GNOME:Factory Add bug number reference OBS-URL: https://build.opensuse.org/request/show/75231 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=62 --- avahi-glib2.spec | 2 +- avahi-mono.spec | 2 +- avahi-qt4.spec | 2 +- avahi.changes | 5 +++-- avahi.spec | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index e63a053..4dc9850 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -69,7 +69,7 @@ Patch1: avahi-desktop.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-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new. +# PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342 Patch11: avahi-gtk_box_new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream diff --git a/avahi-mono.spec b/avahi-mono.spec index db0b91a..5ca46fb 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -69,7 +69,7 @@ Patch1: avahi-desktop.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-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new. +# PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342 Patch11: avahi-gtk_box_new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream diff --git a/avahi-qt4.spec b/avahi-qt4.spec index fde90c8..09f5c90 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -69,7 +69,7 @@ Patch1: avahi-desktop.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-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new. +# PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342 Patch11: avahi-gtk_box_new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream diff --git a/avahi.changes b/avahi.changes index fa5123a..06350c0 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Sat Jul 2 12:18:24 UTC 2011 - dimstar@opensuse.org -- Add avahi-gtk_box_new.patch: Do not used deprecated - gtk_[hv]box_new function anymore. Fixes build of avahi-glib2. +- Add avahi-gtk_box_new.patch: do not used deprecated + gtk_[hv]box_new function anymore; this fixes build of + avahi-glib2. ------------------------------------------------------------------- Wed May 18 20:37:41 CEST 2011 - dimstar@opensuse.org diff --git a/avahi.spec b/avahi.spec index 098a0f8..73ead43 100644 --- a/avahi.spec +++ b/avahi.spec @@ -71,7 +71,7 @@ Patch1: avahi-desktop.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-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new. +# PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342 Patch11: avahi-gtk_box_new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream