diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 3c904bf..4dc9850 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, 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 # Even if we are not building python bindings, we need python to build service types database: @@ -212,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 @@ -222,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+ @@ -235,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 @@ -245,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+ @@ -301,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 @@ -311,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+ @@ -324,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 @@ -334,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+ @@ -345,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 @@ -355,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 @@ -409,7 +411,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 @@ -419,7 +421,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+ @@ -503,7 +505,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 @@ -513,7 +515,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+ @@ -549,7 +551,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 @@ -559,7 +561,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 @@ -573,7 +575,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 @@ -583,7 +585,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 @@ -599,7 +601,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 @@ -609,7 +611,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+ @@ -622,7 +624,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 @@ -632,7 +634,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 @@ -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..5ca46fb 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, 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 # 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..09f5c90 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, 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 # 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..06350c0 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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; 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 cb0da68..73ead43 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, 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 # 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.