From adfe353daefda3de1b41c56ffc6a5f8d5bc37ed56010b1ef65f3d4f55eb2f529 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 17 Apr 2019 15:31:55 +0000 Subject: [PATCH] Accepting request 695154 from GNOME:Next - Drop -Qt4 variant: Qt4 is EOL. what is upstream (boo#1110668). OBS-URL: https://build.opensuse.org/request/show/695154 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=154 --- avahi-glib2.spec | 6 +- avahi-mono.spec | 7 +- avahi-qt4.changes | 58 --- avahi-qt4.spec | 1140 ----------------------------------------- avahi.changes | 7 +- avahi.spec | 6 +- avahi_spec-prepare.sh | 17 - 7 files changed, 15 insertions(+), 1226 deletions(-) delete mode 100644 avahi-qt4.changes delete mode 100644 avahi-qt4.spec diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 55e6ad3..65aff3e 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -43,7 +43,7 @@ Release: 0 Summary: D-Bus Service for Zeroconf and Bonjour License: LGPL-2.1-or-later Group: System/Daemons -Url: http://www.avahi.org/ +URL: http://www.avahi.org/ Source: http://avahi.org/download/%{_name}-%{version}.tar.gz # From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz Source1: avahi-daemon-check-dns.sh @@ -83,12 +83,12 @@ BuildRequires: gdbm-devel BuildRequires: intltool BuildRequires: libdaemon-devel BuildRequires: libexpat-devel -BuildRequires: python3-dbus-python # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool BuildRequires: pkgconfig # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python3-dbm +BuildRequires: python3-dbus-python BuildRequires: python3-devel BuildRequires: translation-update-upstream # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). @@ -702,7 +702,7 @@ sed -i "s:-DGTK_DISABLE_DEPRECATED=1::" avahi-ui/Makefile.am %build autoreconf -f -i intltoolize -f -export PYTHON=/usr/bin/python3 +export PYTHON=%{_bindir}/python3 %configure\ --libexecdir=%{_prefix}/lib\ --disable-static\ diff --git a/avahi-mono.spec b/avahi-mono.spec index 0703e51..5d5b459 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -43,7 +43,7 @@ Release: 0 Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour License: LGPL-2.1-or-later Group: Development/Languages/Mono -Url: http://www.avahi.org/ +URL: http://www.avahi.org/ Source: http://avahi.org/download/%{_name}-%{version}.tar.gz # From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz Source1: avahi-daemon-check-dns.sh @@ -83,12 +83,12 @@ BuildRequires: gdbm-devel BuildRequires: intltool BuildRequires: libdaemon-devel BuildRequires: libexpat-devel -BuildRequires: python3-dbus-python # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool BuildRequires: pkgconfig # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python3-dbm +BuildRequires: python3-dbus-python BuildRequires: python3-devel BuildRequires: translation-update-upstream # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). @@ -637,7 +637,6 @@ correct mDNS reflection across LAN segments. %if %{build_mono} %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -License: LGPL-2.1-or-later Group: Development/Languages/Mono Requires: gtk-sharp2 Requires: libavahi-client3 >= %{version} @@ -702,7 +701,7 @@ sed -i "s:-DGTK_DISABLE_DEPRECATED=1::" avahi-ui/Makefile.am %build autoreconf -f -i intltoolize -f -export PYTHON=/usr/bin/python3 +export PYTHON=%{_bindir}/python3 %configure\ --libexecdir=%{_prefix}/lib\ --disable-static\ diff --git a/avahi-qt4.changes b/avahi-qt4.changes deleted file mode 100644 index c0ab5a7..0000000 --- a/avahi-qt4.changes +++ /dev/null @@ -1,58 +0,0 @@ -------------------------------------------------------------------- -Thu Nov 23 13:37:26 UTC 2017 - rbrown@suse.com - -- Replace references to /var/adm/fillup-templates with new - %_fillupdir macro (boo#1069468) - -------------------------------------------------------------------- -Sat Sep 17 13:52:41 UTC 2011 - jengelh@medozas.de - -- Remove redundant tags/sections from specfile -- Use %_smp_mflags for parallel build -- Add libavahi-devel to baselibs - -------------------------------------------------------------------- -Fri Aug 12 18:57:25 UTC 2011 - andrea.turrini@gmail.com - -- Fixed typo in avahi-qt4.spec. - -------------------------------------------------------------------- -Mon Mar 15 17:10:10 CET 2010 - sbrabec@suse.cz - -- Added support for translation-update-upstream (FATE#301344). - -------------------------------------------------------------------- -Sun Aug 9 12:43:26 CEST 2009 - coolo@novell.com - -- use new python macros - -------------------------------------------------------------------- -Mon Sep 1 10:22:46 CEST 2008 - meissner@suse.de - -- Added GCC attribute alloc_size markup for allocator functions - -------------------------------------------------------------------- -Fri Jul 18 17:18:20 CEST 2008 - sbrabec@suse.cz - -- Updated to version 0.6.23: - * A lot of translation updates - * Beef up bnvc quite a bit, including passing a domain to browse - in - * Increase numer of open files resource limit to 300 so that we - can deal with more clients simultaneously. - * Rework 'poof' algorithm a bit to reduce traffic load on noisy - links. - * Build fixes - * Minor other updates - * Backwards compatible with Avahi 0.6.x with x < 23. - -------------------------------------------------------------------- -Sun May 11 11:49:29 CEST 2008 - coolo@suse.de - -- fix rename of xxbit packages - -------------------------------------------------------------------- -Wed Mar 5 16:14:36 CET 2008 - sbrabec@suse.cz - -- Create new spec file to avoid dependency of avahi core on Qt. - diff --git a/avahi-qt4.spec b/avahi-qt4.spec deleted file mode 100644 index ef58861..0000000 --- a/avahi-qt4.spec +++ /dev/null @@ -1,1140 +0,0 @@ -# -# spec file for package avahi-qt4 -# -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -# Do not edit this auto generated file! Edit avahi.spec. -%define _name avahi -# In automatic build systems you want to enable just one of following options. -# For build all at once, set all to 1. -# If you set build_core to 0, you cannot set more than one other option to 1. -%define build_core 0 -# NOTE: build_glib2 also controls build of gobject, gtk2, gtk3 and pygobject code. -%define build_glib2 0 -%define build_mono 0 -%define build_qt4 1 -%define avahi_client_sover 3 -%define avahi_common_sover 3 -%define avahi_core_sover 7 -%define avahi_ui_sover 0 -%define avahi_glib_sover 1 -%define avahi_gobject_sover 0 -%define avahi_gtk3_sover 0 -%define avahi_qt4_sover 1 -%if %{build_glib2} -%define debug_package_requires libavahi-ui%{avahi_ui_sover} = %{version}-%{release} -%endif -Name: avahi-qt4 -Version: 0.7 -Release: 0 -Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -License: LGPL-2.1-or-later -Group: System/GUI/KDE -Url: http://www.avahi.org/ -Source: http://avahi.org/download/%{_name}-%{version}.tar.gz -# From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz -Source1: avahi-daemon-check-dns.sh -Source3: avahi.firewall -# Copy of glib-2.0.m4 from glib2-devel to not depend on glib2-devel. -Source4: avahi-glib-gettext.m4 -Source5: avahi.sysconfig -Source6: avahi-autoipd.sysconfig -# From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz -Source7: avahi-daemon.if-up -Source8: %{_name}_spec-prepare.sh -Source9: avahi-autoipd.README.SUSE -Source10: avahi-autoipd.if-up -Source11: avahi-autoipd.if-down -Source100: attributes -Source101: update_spec.pl -Source102: baselibs.conf -# PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse -Patch0: avahi-gacdir.patch -# PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 Avahi#365 -- sbrabec@suse.cz -Patch1: avahi-desktop.patch -# PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal -Patch4: avahi-daemon-check-dns-suse.patch -# PATCH-FIX-UPSTREAM avahi-0.6.32-suppress-resolv-conf-warning.patch bsc#982317 mgorse@suse.com -- only warn on missing resolv.conf if it is being used. -Patch19: avahi-0.6.32-suppress-resolv-conf-warning.patch - # PATCH-FIX-UPSTREAM avahi-0.7-dbm.patch bsc#1076402 mgorse@suse.com -- use the agnostic dbm interface, needed for python 3. -Patch20: avahi-0.7-dbm.patch -# PATCH-FIX-UPSTREAM avahi-0.7-encode-strings-as-utf8.patch boo#1110668 mgorse@suse.com -- encode strings as UTF-8. -Patch21: avahi-0.7-encode-strings-as-utf8.patch -# PATCh-FIX-UPSTREAM avahi-0.7-python3-bookmarks.patch boo#1110668 mgorse@suse.com -- make bookmarks python 3 compatible. -Patch22: avahi-0.7-python3-bookmarks.patch -# PATCH-FIX-UPSTREAM CVE-2018-1000845.patch boo#1110281 mgorse@suse.com -- drop legacy unicast queries from address not on local link (CVE-2018-1000845). -Patch23: CVE-2018-1000845.patch -BuildRequires: fdupes -BuildRequires: gcc-c++ -BuildRequires: gdbm-devel -BuildRequires: intltool -BuildRequires: libdaemon-devel -BuildRequires: libexpat-devel -BuildRequires: python3-dbus-python -# libtool is needed to build all variants: bootstrap is unconditional in the build section -BuildRequires: libtool -BuildRequires: pkgconfig -# Even if we are not building python bindings, we need python to build service types database: -BuildRequires: python3-dbm -BuildRequires: python3-devel -BuildRequires: translation-update-upstream -# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). -%if !%{build_glib2} && !%{build_mono} && !%{build_qt4} -# Create split spec files only when building per partes: -#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) -%endif -%if 0%{?suse_version} >= 1330 -BuildRequires: strip-nondeterminism -%endif -%if %{build_core} -BuildRequires: dbus-1-devel -BuildRequires: doxygen -BuildRequires: graphviz -BuildRequires: python3-dbm -BuildRequires: zlib-devel -BuildRequires: pkgconfig(systemd) -# For python bindings and utilities: -#BuildRequires: dbus-1-python -#Requires: dbus-1 -Requires: nss-mdns -Requires(pre): pwdutils -Recommends: %{_name}-lang -# -# mDNSResponder was used for <= 10.2: -Provides: mDNSResponder = 107.5 -Obsoletes: mDNSResponder < 107.5 -# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. -# File conflict for service-types.db openSUSE <= 12.3 SLE <= 11SP2 -#Conflicts: avahi-utils <= 0.6.31-9.2 -%endif -%if %{build_glib2} -BuildRequires: gobject-introspection-devel -BuildRequires: gtk2-devel -BuildRequires: gtk3-devel -BuildRequires: libavahi-devel -BuildRequires: python-gtk-devel -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(pygobject-3.0) -%endif -%if %{build_qt4} -BuildRequires: libavahi-devel -BuildRequires: libqt4-devel -%endif -%if %{build_mono} -BuildRequires: gtk-sharp2 -BuildRequires: libavahi-glib-devel -BuildRequires: mono-devel -BuildRequires: monodoc-core -# Please copy this line to avahi-mono definition below for build all-in-once: -Requires: gtk-sharp2 -Requires: libavahi-client3 >= %{version} -Requires: libavahi-common3 >= %{version} -Requires: libavahi-glib1 >= %{version} -Requires: libavahi-ui0 >= %{version} -%endif - -%description -Qt4 bindings for avahi. - -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 -minimize the traffic imposed on networks. - -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. - -%package -n libavahi-client3 -Summary: D-Bus Service for Zeroconf and Bonjour -Group: System/Libraries - -%description -n libavahi-client3 -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now complete with features, implementing -all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. -It passes all tests in the Apple Bonjour conformance test suite. In -addition, it supports some nifty things, like correct mDNS reflection -across LAN segments. - -%package -n libavahi-common3 -Summary: D-Bus Service for Zeroconf and Bonjour -Group: System/Libraries - -%description -n libavahi-common3 -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now complete with features, implementing -all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. -It passes all tests in the Apple Bonjour conformance test suite. In -addition, it supports some nifty things, like correct mDNS reflection -across LAN segments. - -%package -n libavahi-core7 -Summary: D-Bus Service for Zeroconf and Bonjour -Group: System/Libraries - -%description -n libavahi-core7 -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now complete with features, implementing -all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. -It passes all tests in the Apple Bonjour conformance test suite. In -addition, it supports some nifty things, like correct mDNS reflection -across LAN segments. - -%package -n libdns_sd -Summary: mDNSResponder Compatibility Package for the Zeroconf/Bonjour D-Bus service -# mDNSResponder-lib used unversioned soname. -# Provide full compatibility with mDNSResponder (FIXME: should be fixed in the package): -# -# mDNSResponder-lib was used for <= 10.2: -Group: System/Libraries -Provides: mDNSResponder-lib = 107.5 -Obsoletes: mDNSResponder-lib < 107.5 -# Old name used for <= 10.3: -Provides: avahi-compat-mDNSResponder = %{version} -Obsoletes: avahi-compat-mDNSResponder < %{version} -%ifarch ia64 x86_64 ppc64 s390x -Provides: libdns_sd.so()(64bit) -%else -Provides: libdns_sd.so -%endif - -%description -n libdns_sd -Apple mDNSResponder compatibility layer for avahi. - -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 -minimize the traffic imposed on networks. - -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 across LAN segments. - -%package -n libhowl0 -Summary: Howl Compatibility Package for the Zeroconf/Bonjour D-Bus service -# Old name used for <= 10.3: -Group: System/Libraries -Provides: avahi-compat-howl = %{version} -Obsoletes: avahi-compat-howl < %{version} - -%description -n libhowl0 -Howl compatibility layer for avahi. - -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 -minimize the traffic imposed on networks. - -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 across LAN segments. - -%package -n python3-avahi -Summary: A set of Avahi utilities written in Python -Group: Development/Languages/Python -Requires: %{name} = %{version} -Requires: dbus-1-python -Requires: python3-Twisted -Requires: python3-dbm -# Old name used for <= 10.3: -Provides: avahi-python = %{version} -Obsoletes: avahi-python < %{version} -Obsoletes: python-avahi - -%description -n python3-avahi -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now feature complete, implementing all -MUSTs and the majority of the SHOULDs of the mDNS and 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 across LAN segments. - -%package autoipd -Summary: IPv4LL Service for Zeroconf and Bonjour -# Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. -# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. -# File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 -#Conflicts: avahi <= 0.6.31-9.2 -# coreutils contains /usr/bin/chown -Group: Productivity/Networking/Other -Requires(post): coreutils -# shadow contains useradd and groupadd -Requires(pre): shadow -Provides: avahi:%{_sbindir}/avahi-autoipd - -%description autoipd -avahi-autoipd is an implementation of Dynamic Configuration of IPv4 -Link-Local Addresses. - -avahi-autoipd doesn't depend on any other Avahi library, hence it makes -sense to install it even if Avahi itself is not installed. - -%package utils -Summary: Command Line Utilities for the Zeroconf/Bonjour D-Bus service -Group: Productivity/Networking/Other -Requires: %{_name} >= %{version} - -%description utils -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now complete with features, implementing -all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. -It passes all tests in the Apple Bonjour conformance test suite. In -addition, it supports some nifty things, like correct mDNS reflection -across LAN segments. - -%package -n libavahi-devel -Summary: Header files for the Zeroconf/Bonjour D-Bus service -Group: Development/Libraries/C and C++ -Requires: %{_name} = %{version} -Requires: dbus-1-devel -Requires: glibc-devel -Requires: libavahi-client3 = %{version} -Requires: libavahi-common3 = %{version} -Requires: libavahi-core7 = %{version} -# Last appeared in OpenSUSE 10.3: -Provides: avahi-devel = %{version} -Obsoletes: avahi-devel < %{version} - -%description -n libavahi-devel -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 -minimize the traffic imposed on networks. - -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 across LAN segments. - -%package compat-mDNSResponder-devel -Summary: mDNSResponder Compatibility Package for the Zeroconf/Bonjour D-Bus service -Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} -Requires: libdns_sd = %{version} -Provides: mDNSResponder-devel = 107.5 -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 -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 -minimize the traffic imposed on networks. - -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 across LAN segments. - -%package compat-howl-devel -Summary: Howl Compatibility Package for the Zeroconf/Bonjour D-Bus service -Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} -Requires: libhowl0 = %{version} - -%description compat-howl-devel -Howl compatibility layer for avahi. - -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 -minimize the traffic imposed on networks. - -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 across LAN segments. - -%package -n libavahi-ui0 -Summary: D-Bus Service for Zeroconf and Bonjour -Group: System/Libraries - -%description -n libavahi-ui0 -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now complete with features, implementing -all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. -It passes all tests in the Apple Bonjour conformance test suite. In -addition, it supports some nifty things, like correct mDNS reflection -across LAN segments. - -%package -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -Summary: D-Bus Service for Zeroconf and Bonjour -Group: System/Libraries - -%description -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now complete with features, implementing -all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. -It passes all tests in the Apple Bonjour conformance test suite. In -addition, it supports some nifty things, like correct mDNS reflection -across LAN segments. - -%package -n libavahi-glib1 -Summary: Glib Bindings for avahi, the D-Bus Service for Zeroconf and Bonjour -# Old name used for <= 10.3: -Group: System/Libraries -Provides: avahi-glib = %{version} -Obsoletes: avahi-glib < %{version} - -%description -n libavahi-glib1 -GLib support for avahi. - -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 -minimize the traffic imposed on networks. - -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 across LAN segments. - -%package -n libavahi-gobject0 -Summary: D-Bus Service for Zeroconf and Bonjour -Group: System/Libraries - -%description -n libavahi-gobject0 -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now complete with features, implementing -all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. -It passes all tests in the Apple Bonjour conformance test suite. In -addition, it supports some nifty things, like correct mDNS reflection -across LAN segments. - -%package -n typelib-1_0-Avahi-0_6 -Summary: Introspection bindings for the Zeroconf/Bonjour D-Bus service -Group: System/Libraries - -%description -n typelib-1_0-Avahi-0_6 -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now complete with features, implementing -all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. -It passes all tests in the Apple Bonjour conformance test suite. In -addition, it supports some nifty things, like correct mDNS reflection -across LAN segments. - -This package provides the GObject Introspection bindings for Avahi. - -%package -n avahi-utils-gtk -Summary: GTK+ Utilities for the Zeroconf/Bonjour D-Bus service -Group: Productivity/Networking/Other -Requires: %{_name} >= %{version} -# Due to a mistake in the spec file build staging, this package had -# name avahi-glib2-utils-gtk in 11.1 and SLE11 and avahi-utils-gtk in -# all other products. -Provides: avahi-glib2-utils-gtk = %{version} -Obsoletes: avahi-glib2-utils-gtk < %{version} - -%description -n avahi-utils-gtk -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now complete with features, implementing -all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. -It passes all tests in the Apple Bonjour conformance test suite. In -addition, it supports some nifty things, like correct mDNS reflection -across LAN segments. - -%package -n python3-avahi-gtk -Summary: A set of Avahi utilities written in Python Using python-gtk -Group: Development/Languages/Python -Requires: python3-avahi = %{version} -Requires: python3-gobject -Requires(post): coreutils -Requires(postun): coreutils -# Old name used for <= 10.3: -Provides: avahi-python = %{version} -Obsoletes: avahi-python < %{version} -Obsoletes: python-avahi-gtk -# Provide split-provides for update from <= 11.0: -Provides: python-avahi:%{_bindir}/avahi-bookmarks -Obsoletes: python-avahi < %{version} - -%description -n python3-avahi-gtk -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now feature complete, implementing all -MUSTs and the majority of the SHOULDs of the mDNS and 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 across LAN segments. - -%package -n libavahi-glib-devel -Summary: Header files for Avahi's Glib bindings -Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} -Requires: libavahi-glib1 = %{version} -Requires: libavahi-ui-gtk3-%{avahi_gtk3_sover} = %{version} -Requires: libavahi-ui0 = %{version} -Requires: typelib-1_0-Avahi-0_6 = %{version} -# Last appeared in OpenSUSE 10.3: -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 -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 -minimize the traffic imposed on networks. - -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 across LAN segments. - -%package -n libavahi-gobject-devel -Summary: Header files for Avahi's GObject bindings -Group: System/Daemons -Requires: glib2-devel -Requires: libavahi-devel = %{version} -Requires: libavahi-glib-devel -Requires: libavahi-gobject0 = %{version} - -%description -n libavahi-gobject-devel -Avahi is an implementation of 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 minimize the traffic imposed on networks. - -The Avahi mDNS responder is now complete with features, implementing -all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs. -It passes all tests in the Apple Bonjour conformance test suite. In -addition, it supports some nifty things, like correct mDNS reflection -across LAN segments. - -%package -n libavahi-qt4-1 -Summary: Qt4 Bindings for avahi, the D-Bus Service for Zeroconf and Bonjour -# Old name used for <= 10.3: -Group: System/GUI/KDE -Provides: avahi-qt4 = %{version} -Obsoletes: avahi-qt4 < %{version} - -%description -n libavahi-qt4-1 -Qt4 bindings for avahi. - -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 -minimize the traffic imposed on networks. - -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 across LAN segments. - -%package -n libavahi-qt4-devel -Summary: Header files for Avahi's Qt4 bindings -Group: Development/Libraries/C and C++ -Requires: libavahi-devel = %{version} -Requires: libavahi-qt4-1 = %{version} -Requires: libqt4-devel -# Last appeared in OpenSUSE 10.3: -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 -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 -minimize the traffic imposed on networks. - -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 across LAN segments. - -%if %{build_core} -%if %{build_mono} -%package -n avahi-mono -Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -Group: Development/Languages/Mono -Requires: gtk-sharp2 -Requires: libavahi-client3 >= %{version} -Requires: libavahi-common3 >= %{version} -Requires: libavahi-glib1 >= %{version} -Requires: libavahi-ui0 >= %{version} - -%description -n avahi-mono -This package provides Mono bindings for avahi. Avahi is an -implementation of the DNS Service Discovery and MulticastDNS -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 -minimize the traffic imposed on networks. The Avahi mDNS responder is -now feature complete, implementing all MUSTs and the majority of the -SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple -Bonjour conformance test suite. In addition, it supports some nifty -things, like correct mDNS reflection across LAN segments. - -%endif -%lang_package -%endif - -%prep -%setup -q -n %{_name}-%{version} -cp -a %{SOURCE1} %{SOURCE7} . -cp -a %{SOURCE5} sysconfig.avahi -sed "s:@docdir@:%{_docdir}:g" <%{SOURCE6} >sysconfig.avahi-autoipd -cp -a %{SOURCE9} avahi-autoipd/README.SUSE -sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE10} >avahi-autoipd/avahi-autoipd.if-up -sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE11} >avahi-autoipd/avahi-autoipd.if-down -translation-update-upstream -%patch0 -%patch1 -p1 -%patch4 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 - -%if !%{build_core} -# Replace all .la references from local .la files to installed versions -# with exception of libavahi-glib.la. -# It allows to build only the binding subpackage. -%if %{build_mono} -sed -i 's:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g' */Makefile.am -%else -sed -i 's:libavahi-glib\.la:@@SKIP LIBAVAHI GLIB@@:g -s:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g -s:@@SKIP LIBAVAHI GLIB@@:libavahi-glib.la:g -' */Makefile.am -%endif -%endif -if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then - cat %{SOURCE4} >>acinclude.m4 -fi -# FIXME: We do not have xmltoman, use original doc, just fix paths. -sed -i s:/home/lennart/tmp/avahi:: man/*.[0-9] -sed -i "s:-DGTK_DISABLE_DEPRECATED=1::" avahi-ui/Makefile.am - -%build -autoreconf -f -i -intltoolize -f -export PYTHON=/usr/bin/python3 -%configure\ - --libexecdir=%{_prefix}/lib\ - --disable-static\ - --with-distro=suse\ -%if %{build_core} - --enable-compat-libdns_sd\ - --enable-compat-howl\ -%else - --disable-compat-libdns_sd\ - --disable-compat-howl\ -%endif -%if %{build_glib2} - --enable-glib\ - --enable-gobject\ - --enable-gtk\ - --enable-gtk3\ - --enable-pygobject\ -%else - --disable-glib\ - --disable-gobject\ - --disable-pygobject\ -%if ! %{build_mono} - --disable-gtk\ -%endif - --disable-gtk3\ -%endif - --disable-qt3\ -%if %{build_qt4} - --enable-qt4\ -%else - --disable-qt4\ -%endif -%if %{build_mono} - --enable-mono\ - --enable-gtk\ -%else - --disable-mono\ -%endif - --with-avahi-priv-access-group=avahi\ - --with-autoipd-user=avahi-autoipd\ - --with-autoipd-group=avahi-autoipd -%if %{build_glib2} && !%{build_core} -for DIR in avahi-glib avahi-gobject avahi-ui avahi-discover-standalone avahi-python man ; do -cd $DIR -make %{?_smp_mflags} -cd .. -done -%endif -%if %{build_qt4} && !%{build_core} -cd avahi-qt -%endif -%if %{build_mono} && !%{build_core} -cd avahi-sharp -make %{?_smp_mflags} -cd ../avahi-ui-sharp -%endif -make %{?_smp_mflags} - -%install -%if %{build_glib2} && !%{build_core} -for DIR in avahi-glib avahi-gobject avahi-ui avahi-discover-standalone avahi-python man ; do -cd $DIR -%make_install -cd .. -done -cd - -%endif -%if %{build_qt4} && !%{build_core} -cd avahi-qt -%endif -%if %{build_mono} && !%{build_core} -cd avahi-sharp -%make_install -cd ../avahi-ui-sharp -%endif -%make_install -# do not install sysv init scripts -rm -rf %{buildroot}%{_sysconfdir}/init.d/ -%if !%{build_core} -cd .. -make %{?_smp_mflags} install-pkgconfigDATA DESTDIR=%{buildroot} -%endif -%if %{build_core} -# do not remove this unless you plan to fix _all_ the references to -# it. all (multiple) previous attempts have failed already -#rm "%{buildroot}/%{_libdir}/libavahi-common.la" -install -d %{buildroot}/%{_localstatedir}/run/avahi-daemon -ln -s avahi-compat-libdns_sd/dns_sd.h %{buildroot}/%{_includedir}/ -ln -s avahi-compat-howl.pc %{buildroot}/%{_libdir}/pkgconfig/howl.pc -install -d %{buildroot}/%{_prefix}/lib/avahi -install avahi-daemon-check-dns.sh %{buildroot}/%{_prefix}/lib/avahi/ -install -d %{buildroot}%{_sysconfdir}/sysconfig/network/if-{up,down}.d -# Note: We do not install the script to if-down.d. Only very obscure use -# cases may fail. (And Debian does the same.) -# (You would have an AUTOIP-only fallback network, then connect network -# to network with .local in DNS without disconnecting from the fallback, -# then disconnect from network with .local in DNS.) -install avahi-daemon.if-up %{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d/avahi-daemon -install avahi-autoipd/avahi-autoipd.if-up %{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d/avahi-autoipd -install avahi-autoipd/avahi-autoipd.if-down %{buildroot}%{_sysconfdir}/sysconfig/network/if-down.d/avahi-autoipd -install -d %{buildroot}/%{_localstatedir}/lib/avahi-autoipd -mkdir -p %{buildroot}/%{_sbindir} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services -ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcavahi-daemon -ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcavahi-dnsconfd -install -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi -install -d %{buildroot}/%{_datadir}/pixmaps -install -d %{buildroot}%{_fillupdir} -install -m 644 sysconfig.avahi* %{buildroot}%{_fillupdir}/ -%if ! %{build_glib2} -# Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python3-avahi-gtk: -install -d %{buildroot}/%{_datadir}/avahi/interfaces -install -m 644 avahi-discover-standalone/avahi-discover.ui %{buildroot}/%{_datadir}/avahi/interfaces -%endif -%find_lang %{name} %{?no_lang_C} -%else -# There is no simple way to not install core files. Remove them here. -# The rest is enabled/disabled in configure as needed. -rm %{buildroot}/%{_libdir}/pkgconfig/avahi-client.pc -rm %{buildroot}/%{_libdir}/pkgconfig/avahi-core.pc -%if %{build_glib2} -rm %{buildroot}/%{_bindir}/avahi-bookmarks -rm -r %{buildroot}/%{python3_sitelib}/avahi -rm %{buildroot}/%{_mandir}/man1/avahi-bookmarks.1* -rm %{buildroot}/%{_mandir}/man1/avahi-browse-domains.1* -rm %{buildroot}/%{_mandir}/man1/avahi-browse.1* -rm %{buildroot}/%{_mandir}/man1/avahi-publish-address.1* -rm %{buildroot}/%{_mandir}/man1/avahi-publish-service.1* -rm %{buildroot}/%{_mandir}/man1/avahi-publish.1* -rm %{buildroot}/%{_mandir}/man1/avahi-resolve-address.1* -rm %{buildroot}/%{_mandir}/man1/avahi-resolve-host-name.1* -rm %{buildroot}/%{_mandir}/man1/avahi-resolve.1* -rm %{buildroot}/%{_mandir}/man1/avahi-set-host-name.1* -rm %{buildroot}/%{_mandir}/man5/avahi-daemon.conf.5* -rm %{buildroot}/%{_mandir}/man5/avahi.hosts.5* -rm %{buildroot}/%{_mandir}/man5/avahi.service.5* -rm %{buildroot}/%{_mandir}/man8/avahi-autoipd.8* -rm %{buildroot}/%{_mandir}/man8/avahi-autoipd.action.8* -rm %{buildroot}/%{_mandir}/man8/avahi-daemon.8* -rm %{buildroot}/%{_mandir}/man8/avahi-dnsconfd.8* -rm %{buildroot}/%{_mandir}/man8/avahi-dnsconfd.action.8* -# Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python3-avahi-gtk: -rm %{buildroot}/%{_datadir}/avahi/interfaces/avahi-discover.ui -rmdir %{buildroot}/%{_datadir}/avahi/interfaces -rmdir %{buildroot}/%{_datadir}/avahi -%else -%if %{build_mono} -rm %{buildroot}/%{_libdir}/pkgconfig/avahi-ui.pc -%if 0%{?suse_version} >= 1330 -strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip -%endif -%endif -%endif -%endif -%if %{build_glib2} -%suse_update_desktop_file avahi-discover -%suse_update_desktop_file bvnc -%suse_update_desktop_file bssh -%endif -%fdupes %{buildroot}/%{_libdir} - -%pre -getent group avahi >/dev/null || %{_sbindir}/groupadd -r avahi -getent passwd avahi >/dev/null || %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi" -d /run/avahi-daemon -g avahi avahi -%service_add_pre avahi-dnsconfd.service avahi-daemon.service -# bnc#853845,bnc#851953: do not start by default under -# sysconfig as this breaks vlan,bridge,bonding setups -# in pre to revert old default setting from template. -if test -f %{_fillupdir}/sysconfig.avahi-autoipd -a \ - -f etc/sysconfig/avahi ; then - . %{_fillupdir}/sysconfig.avahi-autoipd - if test "X$AVAHI_AUTOIPD_ENABLE" = "Xyes" ; then - sed -i etc/sysconfig/avahi \ - -e 's/^\(AVAHI_AUTOIPD_ENABLE\)=.*/\1="no"/' - fi -fi - -%post -%{fillup_only -n avahi} -%{fillup_only -ns security checksig} -%service_add_post avahi-dnsconfd.service avahi-daemon.service - -%preun -%service_del_preun avahi-dnsconfd.service avahi-daemon.service - -%postun -%service_del_postun avahi-dnsconfd.service avahi-daemon.service - -%pre autoipd -getent group avahi-autoipd >/dev/null || %{_sbindir}/groupadd -r avahi-autoipd -getent passwd avahi-autoipd >/dev/null || \ - %{_sbindir}/useradd -r -s /bin/false -c "User for Avahi IPv4LL" \ - -d %{_localstatedir}/lib/avahi-autoipd -g avahi-autoipd \ - avahi-autoipd - -%post autoipd -%{fillup_only -ns avahi autoipd} -# Change ownership of /var/lib/avahi-autoipd after upgrade from openSUSE <= 12.3 and SLE <= 11. -chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd - -%post -n libavahi-client3 -p /sbin/ldconfig -%postun -n libavahi-client3 -p /sbin/ldconfig -%post -n libavahi-common3 -p /sbin/ldconfig -%postun -n libavahi-common3 -p /sbin/ldconfig -%post -n libavahi-core7 -p /sbin/ldconfig -%postun -n libavahi-core7 -p /sbin/ldconfig -%post -n libdns_sd -p /sbin/ldconfig -%postun -n libdns_sd -p /sbin/ldconfig -%post -n libhowl0 -p /sbin/ldconfig -%postun -n libhowl0 -p /sbin/ldconfig -%post -n libavahi-ui0 -p /sbin/ldconfig -%postun -n libavahi-ui0 -p /sbin/ldconfig -%post -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig -%postun -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -p /sbin/ldconfig -%post -n libavahi-gobject0 -p /sbin/ldconfig -%postun -n libavahi-gobject0 -p /sbin/ldconfig -%post -n libavahi-glib1 -p /sbin/ldconfig -%postun -n libavahi-glib1 -p /sbin/ldconfig - -%post -n python3-avahi-gtk -%desktop_database_post - -%postun -n python3-avahi-gtk -%desktop_database_post - -%post -n avahi-utils-gtk -%desktop_database_post - -%postun -n avahi-utils-gtk -%desktop_database_post - -%post -n libavahi-qt4-1 -p /sbin/ldconfig -%postun -n libavahi-qt4-1 -p /sbin/ldconfig - -%if %{build_core} -%files -%license LICENSE -%doc docs/* -%dir %{_libdir}/avahi/ -# Note: This file is intentionally packaged here. It is needed for python3-avahi and avahi-utils: -%{_libdir}/avahi/service-types.db -# avahi creates the directory itself, we do not package it -# since it might be on tmpfs -%attr(-,avahi,avahi) %ghost /run/avahi-daemon -%{_mandir}/man5/*.5%{ext_man} -%{_mandir}/man8/*.8%{ext_man} -%exclude %{_mandir}/man8/avahi-autoipd.8.* -%{_sbindir}/avahi-* -%exclude %{_sbindir}/avahi-autoipd -%{_sbindir}/rcavahi-daemon -%{_sbindir}/rcavahi-dnsconfd -%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/* -%dir %{_sysconfdir}/avahi -%config %{_sysconfdir}/avahi/avahi-daemon.conf -%{_sysconfdir}/avahi/avahi-dnsconfd.action -%dir %{_sysconfdir}/avahi/services -%{_sysconfdir}/avahi/services/*.service -%config(noreplace) %{_sysconfdir}/avahi/hosts -%{_sysconfdir}/dbus-1/system.d/*.conf -%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml -%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service -%dir %{_prefix}/lib/avahi -%{_prefix}/lib/avahi/avahi-daemon-check-dns.sh -%{_unitdir}/avahi-daemon.service -%{_unitdir}/avahi-daemon.socket -%{_unitdir}/avahi-dnsconfd.service -# Common file for avahi-utils-gtk and python3-avahi-gtk: -%dir %{_datadir}/avahi/ -%{_datadir}/avahi/interfaces -%{_sysconfdir}/sysconfig/network/*/avahi-daemon -%{_fillupdir}/sysconfig.avahi - -%files lang -f %{name}.lang - -%files -n libavahi-client3 -%{_libdir}/libavahi-client*.so.* - -%files -n libavahi-common3 -%{_libdir}/libavahi-common*.so.* - -%files -n libavahi-core7 -%{_libdir}/libavahi-core*.so.* - -%files -n libdns_sd -# libdns_sd.so must be in non-devel package to provide mDNSResponder-lib compatibility: -%{_libdir}/libdns_sd.so -%{_libdir}/libdns_sd.so.* - -%files -n libhowl0 -%{_libdir}/libhowl.so.* - -%files -n python3-avahi -%{_bindir}/avahi-bookmarks -%{_mandir}/man1/avahi-bookmarks.1%{ext_man} -%dir %{python3_sitelib}/avahi -%{python3_sitelib}/avahi/__init__.py* -%dir %{python3_sitelib}/avahi/__pycache__ -%{python3_sitelib}/avahi/__pycache__/__init__* -%{python3_sitelib}/avahi/ServiceTypeDatabase.py - -%files autoipd -%doc avahi-autoipd/README.SUSE -%{_mandir}/man8/avahi-autoipd.8%{ext_man} -%attr(-,avahi-autoipd,avahi-autoipd)%{_localstatedir}/lib/avahi-autoipd -%{_sbindir}/avahi-autoipd -%{_sysconfdir}/avahi/avahi-autoipd.action -%{_sysconfdir}/sysconfig/network/*/avahi-autoipd -%{_fillupdir}/sysconfig.avahi-autoipd - -%files utils -%{_bindir}/avahi-browse* -%{_bindir}/avahi-publish* -%{_bindir}/avahi-resolve* -%{_bindir}/avahi-set-host-name -%dir %{_datadir}/avahi/ -%{_datadir}/avahi/avahi-service.dtd -%{_mandir}/man1/avahi-browse*.1* -%{_mandir}/man1/avahi-publish*.1* -%{_mandir}/man1/avahi-resolve*.1* -%{_mandir}/man1/avahi-set-host-name.1* - -%files -n libavahi-devel -# FIXME: Maybe split to particular subpackages. -#%doc doc/api/html -#%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO -%{_includedir}/avahi-client -%{_includedir}/avahi-common -%{_includedir}/avahi-core -# avahi devel files -%{_libdir}/libavahi-client.*a -%{_libdir}/libavahi-client*.so -%{_libdir}/libavahi-core.*a -%{_libdir}/libavahi-core*.so -%{_libdir}/libavahi-common*.so -# do not remove unless you fix the resulting problems -# reference is in libavahi-client.la -%{_libdir}/libavahi-common*.*a -%{_libdir}/pkgconfig/avahi-client.pc -%{_libdir}/pkgconfig/avahi-core.pc - -%files compat-mDNSResponder-devel -%{_includedir}/avahi-compat-libdns_sd -%{_includedir}/dns_sd.h -%{_libdir}/libdns_sd.*a -%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc - -%files compat-howl-devel -%{_includedir}/avahi-compat-howl -%{_libdir}/libhowl.so -%{_libdir}/libhowl.*a -%{_libdir}/pkgconfig/avahi-compat-howl.pc -%{_libdir}/pkgconfig/howl.pc -%endif - -%if %{build_glib2} -%files -n libavahi-ui0 -%{_libdir}/libavahi-ui.so.* - -%files -n libavahi-ui-gtk3-%{avahi_gtk3_sover} -%{_libdir}/libavahi-ui-gtk3.so.%{avahi_gtk3_sover}* - -%files -n libavahi-glib1 -%{_libdir}/libavahi-glib*.so.* - -%files -n libavahi-gobject0 -%{_libdir}/libavahi-gobject*.so.* - -%files -n typelib-1_0-Avahi-0_6 -%{_libdir}/girepository-1.0/Avahi-0.6.typelib -%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib - -%files -n python3-avahi-gtk -%{_bindir}/avahi-discover -%{_datadir}/applications/avahi-discover.desktop -%{_mandir}/man1/avahi-discover.1* -%{python3_sitelib}/avahi_discover - -%files -n avahi-utils-gtk -%{_bindir}/bshell -%{_bindir}/bssh -%{_bindir}/bvnc -%{_bindir}/avahi-discover-standalone -%{_datadir}/applications/bssh.desktop -%{_datadir}/applications/bvnc.desktop -%{_mandir}/man1/bssh.1%{ext_man} -%{_mandir}/man1/bvnc.1%{ext_man} - -%files -n libavahi-glib-devel -%{_includedir}/avahi-glib -%{_includedir}/avahi-ui -%{_libdir}/libavahi-glib*.*a -%{_libdir}/libavahi-glib*.so -%{_libdir}/libavahi-ui*.*a -%{_libdir}/libavahi-ui*.*so -%{_libdir}/pkgconfig/avahi-glib.pc -%{_libdir}/pkgconfig/avahi-ui.pc -%{_libdir}/pkgconfig/avahi-ui-gtk3.pc - -%files -n libavahi-gobject-devel -%{_includedir}/avahi-gobject -%{_libdir}/libavahi-gobject*.*a -%{_libdir}/libavahi-gobject*.so -%{_libdir}/pkgconfig/avahi-gobject.pc -%{_datadir}/gir-1.0/*.gir -%endif - -%if %{build_qt4} -%files -n libavahi-qt4-devel -%{_includedir}/avahi-qt4 -%{_libdir}/libavahi-qt4*.*a -%{_libdir}/libavahi-qt4*.so -%{_libdir}/pkgconfig/avahi-qt4.pc - -%files -n libavahi-qt4-1 -%{_libdir}/libavahi-qt4*.so.* -%endif - -%if %{build_mono} -%if %{build_core} -%files -n avahi-mono -%else -%files -%endif -%defattr(-,root,root) -%{_libdir}/pkgconfig/avahi-sharp.pc -%{_libdir}/pkgconfig/avahi-ui-sharp.pc -%{_prefix}/lib/monodoc/sources/*.* -%{_prefix}/lib/mono/avahi-sharp -%{_prefix}/lib/mono/gac/avahi-sharp -%{_prefix}/lib/mono/avahi-ui-sharp -%{_prefix}/lib/mono/gac/avahi-ui-sharp -%endif - -%changelog diff --git a/avahi.changes b/avahi.changes index d18155d..d9c8e5b 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 17 12:36:40 UTC 2019 - Dominique Leuenberger + +- Drop -Qt4 variant: Qt4 is EOL. + ------------------------------------------------------------------- Sun Mar 17 09:47:52 UTC 2019 - Jan Engelhardt @@ -10,7 +15,7 @@ Sun Mar 17 09:47:52 UTC 2019 - Jan Engelhardt Fri Jan 4 00:40:38 UTC 2019 - mgorse@suse.com - Replace avahi-0.7-python3.patch with avahi-0.7-dbm.patch: use - what is upstream (boo#1110668). + what is upstream (boo#1110668). - Add avahi-0.7-encode-strings-as-utf8.patch: encode strings as UTF-8 (boo#1110668). - Add avahi-0.7-python3-bookmarks.patch: make bookmarks python 3 diff --git a/avahi.spec b/avahi.spec index 432adde..ef0c7fb 100644 --- a/avahi.spec +++ b/avahi.spec @@ -45,7 +45,7 @@ Release: 0 Summary: D-Bus Service for Zeroconf and Bonjour License: LGPL-2.1-or-later Group: System/Daemons -Url: http://www.avahi.org/ +URL: http://www.avahi.org/ Source: http://avahi.org/download/%{_name}-%{version}.tar.gz # From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz Source1: avahi-daemon-check-dns.sh @@ -85,12 +85,12 @@ BuildRequires: gdbm-devel BuildRequires: intltool BuildRequires: libdaemon-devel BuildRequires: libexpat-devel -BuildRequires: python3-dbus-python # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool BuildRequires: pkgconfig # Even if we are not building python bindings, we need python to build service types database: BuildRequires: python3-dbm +BuildRequires: python3-dbus-python BuildRequires: python3-devel BuildRequires: translation-update-upstream # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). @@ -704,7 +704,7 @@ sed -i "s:-DGTK_DISABLE_DEPRECATED=1::" avahi-ui/Makefile.am %build autoreconf -f -i intltoolize -f -export PYTHON=/usr/bin/python3 +export PYTHON=%{_bindir}/python3 %configure\ --libexecdir=%{_prefix}/lib\ --disable-static\ diff --git a/avahi_spec-prepare.sh b/avahi_spec-prepare.sh index 0cf260d..70815b6 100644 --- a/avahi_spec-prepare.sh +++ b/avahi_spec-prepare.sh @@ -3,7 +3,6 @@ # Autobuild doesn't support package names with macros. This script will update versions in package names. ORIG_SPEC=${2%-mono} -ORIG_SPEC=${ORIG_SPEC%-qt4} # Never update -mono file when it is already opened. It will break advanced build scripts: if test "$2" != "$ORIG_SPEC" ; then exit @@ -43,22 +42,6 @@ sed ' perl $1/update_spec.pl $1/$ORIG_SPEC-glib2.spec.new attributes > $1/$ORIG_SPEC-glib2.spec rm $1/$ORIG_SPEC-glib2.spec.new -# Edit file to fit -qt4 build needs: -sed ' - s/spec file for package avahi/spec file for package avahi-qt4/; - s/build_core\ 1/build_core 0/; - s/build_qt4\ 0/build_qt4 1/; - s/^.ame:.*/&-qt4/; - # No more needed. - #s/^..hangelog.*/& qt/; - /^# WARNING: After editing/,/^# to update spec files/d - /^%define[[:space:]]*_name/i \ -# Do not edit this auto generated file! Edit avahi.spec. -' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-qt4.spec.new -perl $1/update_spec.pl $1/$ORIG_SPEC-qt4.spec.new attributes > $1/$ORIG_SPEC-qt4.spec -rm $1/$ORIG_SPEC-qt4.spec.new - - # Not wanted for avahi: #cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-glib2.changes #cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-mono.changes