diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 88a01a5..55e6ad3 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -40,7 +40,7 @@ Name: avahi-glib2 Version: 0.7 Release: 0 -Summary: D-BUS Service for Zeroconf and Bonjour +Summary: D-Bus Service for Zeroconf and Bonjour License: LGPL-2.1-or-later Group: System/Daemons Url: http://www.avahi.org/ @@ -110,9 +110,7 @@ BuildRequires: pkgconfig(systemd) #BuildRequires: dbus-1-python #Requires: dbus-1 Requires: nss-mdns -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: pwdutils -PreReq: sysvinit(network) +Requires(pre): pwdutils Recommends: %{_name}-lang # # mDNSResponder was used for <= 10.2: @@ -150,7 +148,7 @@ Requires: libavahi-ui0 >= %{version} %description Avahi is an implementation of the DNS Service Discovery and Multicast -DNS specifications for Zeroconf Computing. It uses D-BUS for +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. @@ -161,14 +159,13 @@ 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. -%if %{build_core} %package -n libavahi-client3 -Summary: D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -180,12 +177,12 @@ 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 +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 +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. @@ -197,12 +194,12 @@ 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 +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 +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. @@ -214,7 +211,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour +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): # @@ -235,7 +232,7 @@ Provides: libdns_sd.so 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 +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. @@ -247,7 +244,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +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} @@ -257,7 +254,7 @@ Obsoletes: avahi-compat-howl < %{version} 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 +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. @@ -275,8 +272,6 @@ Requires: %{name} = %{version} Requires: dbus-1-python Requires: python3-Twisted Requires: python3-dbm -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: coreutils # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -284,7 +279,7 @@ 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 +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. @@ -316,13 +311,13 @@ 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 D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -334,8 +329,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -Summary: Include Files and Libraries Mandatory for Development -# +Summary: Header files for the Zeroconf/Bonjour D-Bus service Group: Development/Libraries/C and C++ Requires: %{_name} = %{version} Requires: dbus-1-devel @@ -349,7 +343,7 @@ 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 +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. @@ -361,7 +355,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +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} @@ -372,7 +366,7 @@ Obsoletes: mDNSResponder-devel < 107.5 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 +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. @@ -384,7 +378,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +Summary: Howl Compatibility Package for the Zeroconf/Bonjour D-Bus service Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libhowl0 = %{version} @@ -393,7 +387,7 @@ Requires: libhowl0 = %{version} 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 +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. @@ -404,16 +398,13 @@ 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. -%endif - -%if %{build_glib2} %package -n libavahi-ui0 -Summary: D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -425,12 +416,12 @@ 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 +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 +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. @@ -442,7 +433,7 @@ 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 +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} @@ -452,7 +443,7 @@ Obsoletes: avahi-glib < %{version} 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 +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. @@ -464,12 +455,12 @@ 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 +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 +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. @@ -481,12 +472,12 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n typelib-1_0-Avahi-0_6 -Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings +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 +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. @@ -500,7 +491,7 @@ across LAN segments. This package provides the GObject Introspection bindings for Avahi. %package -n avahi-utils-gtk -Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour +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 @@ -511,7 +502,7 @@ 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 +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. @@ -527,8 +518,8 @@ Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python Requires: python3-avahi = %{version} Requires: python3-gobject -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: coreutils +Requires(post): coreutils +Requires(postun): coreutils # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -539,7 +530,7 @@ 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 +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. @@ -551,7 +542,7 @@ 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: Include Files and Libraries Mandatory for Development +Summary: Header files for Avahi's Glib bindings Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -565,7 +556,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-glib.so 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 +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. @@ -577,7 +568,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel -Summary: D-BUS Service for Zeroconf and Bonjour +Summary: Header files for Avahi's GObject bindings Group: System/Daemons Requires: glib2-devel Requires: libavahi-devel = %{version} @@ -586,7 +577,7 @@ 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 +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. @@ -597,11 +588,8 @@ 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 - -%if %{build_qt4} %package -n libavahi-qt4-1 -Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +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} @@ -611,7 +599,7 @@ Obsoletes: avahi-qt4 < %{version} 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 +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. @@ -623,7 +611,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel -Summary: Include Files and Libraries Mandatory for Development +Summary: Header files for Avahi's Qt4 bindings Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-qt4-1 = %{version} @@ -635,7 +623,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt4.so 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 +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. @@ -646,13 +634,10 @@ 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. -%endif - %if %{build_core} %if %{build_mono} %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Development/Languages/Mono Requires: gtk-sharp2 Requires: libavahi-client3 >= %{version} @@ -878,7 +863,6 @@ strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip %endif %fdupes %{buildroot}/%{_libdir} -%if %{build_core} %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 @@ -928,9 +912,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %postun -n libdns_sd -p /sbin/ldconfig %post -n libhowl0 -p /sbin/ldconfig %postun -n libhowl0 -p /sbin/ldconfig -%endif - -%if %{build_glib2} %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 @@ -939,6 +920,7 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %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 @@ -950,12 +932,9 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %postun -n avahi-utils-gtk %desktop_database_post -%endif -%if %{build_qt4} %post -n libavahi-qt4-1 -p /sbin/ldconfig %postun -n libavahi-qt4-1 -p /sbin/ldconfig -%endif %if %{build_core} %files diff --git a/avahi-mono.spec b/avahi-mono.spec index ee35e3d..0703e51 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -110,9 +110,7 @@ BuildRequires: pkgconfig(systemd) #BuildRequires: dbus-1-python #Requires: dbus-1 Requires: nss-mdns -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: pwdutils -PreReq: sysvinit(network) +Requires(pre): pwdutils Recommends: %{_name}-lang # # mDNSResponder was used for <= 10.2: @@ -160,14 +158,13 @@ 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. -%if %{build_core} %package -n libavahi-client3 -Summary: D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -179,12 +176,12 @@ 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 +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 +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. @@ -196,12 +193,12 @@ 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 +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 +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. @@ -213,7 +210,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour +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): # @@ -234,7 +231,7 @@ Provides: libdns_sd.so 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 +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. @@ -246,7 +243,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +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} @@ -256,7 +253,7 @@ Obsoletes: avahi-compat-howl < %{version} 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 +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. @@ -274,8 +271,6 @@ Requires: %{name} = %{version} Requires: dbus-1-python Requires: python3-Twisted Requires: python3-dbm -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: coreutils # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -283,7 +278,7 @@ 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 +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. @@ -315,13 +310,13 @@ 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 D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -333,8 +328,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -Summary: Include Files and Libraries Mandatory for Development -# +Summary: Header files for the Zeroconf/Bonjour D-Bus service Group: Development/Libraries/C and C++ Requires: %{_name} = %{version} Requires: dbus-1-devel @@ -348,7 +342,7 @@ 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 +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. @@ -360,7 +354,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +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} @@ -371,7 +365,7 @@ Obsoletes: mDNSResponder-devel < 107.5 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 +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. @@ -383,7 +377,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +Summary: Howl Compatibility Package for the Zeroconf/Bonjour D-Bus service Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libhowl0 = %{version} @@ -392,7 +386,7 @@ Requires: libhowl0 = %{version} 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 +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. @@ -403,16 +397,13 @@ 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. -%endif - -%if %{build_glib2} %package -n libavahi-ui0 -Summary: D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -424,12 +415,12 @@ 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 +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 +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. @@ -441,7 +432,7 @@ 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 +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} @@ -451,7 +442,7 @@ Obsoletes: avahi-glib < %{version} 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 +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. @@ -463,12 +454,12 @@ 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 +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 +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. @@ -480,12 +471,12 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n typelib-1_0-Avahi-0_6 -Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings +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 +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. @@ -499,7 +490,7 @@ across LAN segments. This package provides the GObject Introspection bindings for Avahi. %package -n avahi-utils-gtk -Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour +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 @@ -510,7 +501,7 @@ 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 +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. @@ -526,8 +517,8 @@ Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python Requires: python3-avahi = %{version} Requires: python3-gobject -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: coreutils +Requires(post): coreutils +Requires(postun): coreutils # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -538,7 +529,7 @@ 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 +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. @@ -550,7 +541,7 @@ 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: Include Files and Libraries Mandatory for Development +Summary: Header files for Avahi's Glib bindings Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -564,7 +555,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-glib.so 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 +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. @@ -576,7 +567,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel -Summary: D-BUS Service for Zeroconf and Bonjour +Summary: Header files for Avahi's GObject bindings Group: System/Daemons Requires: glib2-devel Requires: libavahi-devel = %{version} @@ -585,7 +576,7 @@ 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 +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. @@ -596,11 +587,8 @@ 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 - -%if %{build_qt4} %package -n libavahi-qt4-1 -Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +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} @@ -610,7 +598,7 @@ Obsoletes: avahi-qt4 < %{version} 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 +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. @@ -622,7 +610,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel -Summary: Include Files and Libraries Mandatory for Development +Summary: Header files for Avahi's Qt4 bindings Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-qt4-1 = %{version} @@ -634,7 +622,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt4.so 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 +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. @@ -645,13 +633,10 @@ 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. -%endif - %if %{build_core} %if %{build_mono} %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" License: LGPL-2.1-or-later Group: Development/Languages/Mono Requires: gtk-sharp2 @@ -878,7 +863,6 @@ strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip %endif %fdupes %{buildroot}/%{_libdir} -%if %{build_core} %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 @@ -928,9 +912,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %postun -n libdns_sd -p /sbin/ldconfig %post -n libhowl0 -p /sbin/ldconfig %postun -n libhowl0 -p /sbin/ldconfig -%endif - -%if %{build_glib2} %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 @@ -939,6 +920,7 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %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 @@ -950,12 +932,9 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %postun -n avahi-utils-gtk %desktop_database_post -%endif -%if %{build_qt4} %post -n libavahi-qt4-1 -p /sbin/ldconfig %postun -n libavahi-qt4-1 -p /sbin/ldconfig -%endif %if %{build_core} %files diff --git a/avahi-qt4.spec b/avahi-qt4.spec index afd1f73..ef58861 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -110,9 +110,7 @@ BuildRequires: pkgconfig(systemd) #BuildRequires: dbus-1-python #Requires: dbus-1 Requires: nss-mdns -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: pwdutils -PreReq: sysvinit(network) +Requires(pre): pwdutils Recommends: %{_name}-lang # # mDNSResponder was used for <= 10.2: @@ -163,14 +161,13 @@ 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. -%if %{build_core} %package -n libavahi-client3 -Summary: D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -182,12 +179,12 @@ 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 +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 +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. @@ -199,12 +196,12 @@ 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 +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 +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. @@ -216,7 +213,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour +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): # @@ -237,7 +234,7 @@ Provides: libdns_sd.so 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 +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. @@ -249,7 +246,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +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} @@ -259,7 +256,7 @@ Obsoletes: avahi-compat-howl < %{version} 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 +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. @@ -277,8 +274,6 @@ Requires: %{name} = %{version} Requires: dbus-1-python Requires: python3-Twisted Requires: python3-dbm -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: coreutils # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -286,7 +281,7 @@ 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 +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. @@ -318,13 +313,13 @@ 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 D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -336,8 +331,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -Summary: Include Files and Libraries Mandatory for Development -# +Summary: Header files for the Zeroconf/Bonjour D-Bus service Group: Development/Libraries/C and C++ Requires: %{_name} = %{version} Requires: dbus-1-devel @@ -351,7 +345,7 @@ 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 +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. @@ -363,7 +357,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +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} @@ -374,7 +368,7 @@ Obsoletes: mDNSResponder-devel < 107.5 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 +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. @@ -386,7 +380,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +Summary: Howl Compatibility Package for the Zeroconf/Bonjour D-Bus service Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libhowl0 = %{version} @@ -395,7 +389,7 @@ Requires: libhowl0 = %{version} 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 +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. @@ -406,16 +400,13 @@ 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. -%endif - -%if %{build_glib2} %package -n libavahi-ui0 -Summary: D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -427,12 +418,12 @@ 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 +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 +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. @@ -444,7 +435,7 @@ 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 +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} @@ -454,7 +445,7 @@ Obsoletes: avahi-glib < %{version} 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 +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. @@ -466,12 +457,12 @@ 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 +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 +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. @@ -483,12 +474,12 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n typelib-1_0-Avahi-0_6 -Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings +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 +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. @@ -502,7 +493,7 @@ across LAN segments. This package provides the GObject Introspection bindings for Avahi. %package -n avahi-utils-gtk -Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour +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 @@ -513,7 +504,7 @@ 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 +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. @@ -529,8 +520,8 @@ Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python Requires: python3-avahi = %{version} Requires: python3-gobject -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: coreutils +Requires(post): coreutils +Requires(postun): coreutils # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -541,7 +532,7 @@ 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 +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. @@ -553,7 +544,7 @@ 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: Include Files and Libraries Mandatory for Development +Summary: Header files for Avahi's Glib bindings Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -567,7 +558,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-glib.so 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 +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. @@ -579,7 +570,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel -Summary: D-BUS Service for Zeroconf and Bonjour +Summary: Header files for Avahi's GObject bindings Group: System/Daemons Requires: glib2-devel Requires: libavahi-devel = %{version} @@ -588,7 +579,7 @@ 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 +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. @@ -599,11 +590,8 @@ 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 - -%if %{build_qt4} %package -n libavahi-qt4-1 -Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +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} @@ -613,7 +601,7 @@ Obsoletes: avahi-qt4 < %{version} 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 +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. @@ -625,7 +613,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel -Summary: Include Files and Libraries Mandatory for Development +Summary: Header files for Avahi's Qt4 bindings Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-qt4-1 = %{version} @@ -637,7 +625,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt4.so 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 +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. @@ -648,13 +636,10 @@ 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. -%endif - %if %{build_core} %if %{build_mono} %package -n avahi-mono Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Development/Languages/Mono Requires: gtk-sharp2 Requires: libavahi-client3 >= %{version} @@ -880,7 +865,6 @@ strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip %endif %fdupes %{buildroot}/%{_libdir} -%if %{build_core} %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 @@ -930,9 +914,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %postun -n libdns_sd -p /sbin/ldconfig %post -n libhowl0 -p /sbin/ldconfig %postun -n libhowl0 -p /sbin/ldconfig -%endif - -%if %{build_glib2} %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 @@ -941,6 +922,7 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %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 @@ -952,12 +934,9 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %postun -n avahi-utils-gtk %desktop_database_post -%endif -%if %{build_qt4} %post -n libavahi-qt4-1 -p /sbin/ldconfig %postun -n libavahi-qt4-1 -p /sbin/ldconfig -%endif %if %{build_core} %files diff --git a/avahi.changes b/avahi.changes index 2294f9d..d18155d 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Mar 17 09:47:52 UTC 2019 - Jan Engelhardt + +- Remove %if..%endif guards that do not affect the build result. +- Write "D-BUS" per its own name, "D-Bus". +- Replace FIXME PreReq with proper requires as needed. +- Update boilerplate summaries, and remove em dash grammar. + ------------------------------------------------------------------- Fri Jan 4 00:40:38 UTC 2019 - mgorse@suse.com diff --git a/avahi.spec b/avahi.spec index d895baa..432adde 100644 --- a/avahi.spec +++ b/avahi.spec @@ -42,7 +42,7 @@ Name: avahi Version: 0.7 Release: 0 -Summary: D-BUS Service for Zeroconf and Bonjour +Summary: D-Bus Service for Zeroconf and Bonjour License: LGPL-2.1-or-later Group: System/Daemons Url: http://www.avahi.org/ @@ -112,9 +112,7 @@ BuildRequires: pkgconfig(systemd) #BuildRequires: dbus-1-python #Requires: dbus-1 Requires: nss-mdns -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: pwdutils -PreReq: sysvinit(network) +Requires(pre): pwdutils Recommends: %{_name}-lang # # mDNSResponder was used for <= 10.2: @@ -152,7 +150,7 @@ Requires: libavahi-ui0 >= %{version} %description Avahi is an implementation of the DNS Service Discovery and Multicast -DNS specifications for Zeroconf Computing. It uses D-BUS for +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. @@ -163,14 +161,13 @@ 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. -%if %{build_core} %package -n libavahi-client3 -Summary: D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -182,12 +179,12 @@ 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 +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 +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. @@ -199,12 +196,12 @@ 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 +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 +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. @@ -216,7 +213,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libdns_sd -Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour +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): # @@ -237,7 +234,7 @@ Provides: libdns_sd.so 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 +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. @@ -249,7 +246,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +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} @@ -259,7 +256,7 @@ Obsoletes: avahi-compat-howl < %{version} 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 +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. @@ -277,8 +274,6 @@ Requires: %{name} = %{version} Requires: dbus-1-python Requires: python3-Twisted Requires: python3-dbm -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: coreutils # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -286,7 +281,7 @@ 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 +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. @@ -318,13 +313,13 @@ 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 D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -336,8 +331,7 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n libavahi-devel -Summary: Include Files and Libraries Mandatory for Development -# +Summary: Header files for the Zeroconf/Bonjour D-Bus service Group: Development/Libraries/C and C++ Requires: %{_name} = %{version} Requires: dbus-1-devel @@ -351,7 +345,7 @@ 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 +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. @@ -363,7 +357,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +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} @@ -374,7 +368,7 @@ Obsoletes: mDNSResponder-devel < 107.5 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 +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. @@ -386,7 +380,7 @@ 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 D-BUS Service for Zeroconf/Bonjour +Summary: Howl Compatibility Package for the Zeroconf/Bonjour D-Bus service Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libhowl0 = %{version} @@ -395,7 +389,7 @@ Requires: libhowl0 = %{version} 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 +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. @@ -406,16 +400,13 @@ 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. -%endif - -%if %{build_glib2} %package -n libavahi-ui0 -Summary: D-BUS Service for Zeroconf and Bonjour +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 +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. @@ -427,12 +418,12 @@ 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 +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 +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. @@ -444,7 +435,7 @@ 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 +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} @@ -454,7 +445,7 @@ Obsoletes: avahi-glib < %{version} 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 +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. @@ -466,12 +457,12 @@ 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 +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 +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. @@ -483,12 +474,12 @@ addition, it supports some nifty things, like correct mDNS reflection across LAN segments. %package -n typelib-1_0-Avahi-0_6 -Summary: D-BUS Service for Zeroconf and Bonjour -- Introspection bindings +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 +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. @@ -502,7 +493,7 @@ across LAN segments. This package provides the GObject Introspection bindings for Avahi. %package -n avahi-utils-gtk -Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour +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 @@ -513,7 +504,7 @@ 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 +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. @@ -529,8 +520,8 @@ Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python Requires: python3-avahi = %{version} Requires: python3-gobject -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: coreutils +Requires(post): coreutils +Requires(postun): coreutils # Old name used for <= 10.3: Provides: avahi-python = %{version} Obsoletes: avahi-python < %{version} @@ -541,7 +532,7 @@ 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 +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. @@ -553,7 +544,7 @@ 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: Include Files and Libraries Mandatory for Development +Summary: Header files for Avahi's Glib bindings Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-glib1 = %{version} @@ -567,7 +558,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-glib.so 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 +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. @@ -579,7 +570,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-gobject-devel -Summary: D-BUS Service for Zeroconf and Bonjour +Summary: Header files for Avahi's GObject bindings Group: System/Daemons Requires: glib2-devel Requires: libavahi-devel = %{version} @@ -588,7 +579,7 @@ 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 +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. @@ -599,11 +590,8 @@ 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 - -%if %{build_qt4} %package -n libavahi-qt4-1 -Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour +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} @@ -613,7 +601,7 @@ Obsoletes: avahi-qt4 < %{version} 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 +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. @@ -625,7 +613,7 @@ supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments. %package -n libavahi-qt4-devel -Summary: Include Files and Libraries Mandatory for Development +Summary: Header files for Avahi's Qt4 bindings Group: Development/Libraries/C and C++ Requires: libavahi-devel = %{version} Requires: libavahi-qt4-1 = %{version} @@ -637,7 +625,7 @@ Provides: avahi-devel:%{_libdir}/libavahi-qt4.so 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 +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. @@ -648,13 +636,10 @@ 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. -%endif - %if %{build_core} %if %{build_mono} %package -n avahi-mono -Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" +Summary: Mono Bindings for avahi, the D-Bus Service for Zeroconf and Bonjour Group: Development/Languages/Mono Requires: gtk-sharp2 Requires: libavahi-client3 >= %{version} @@ -665,7 +650,7 @@ 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 +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 @@ -880,7 +865,6 @@ strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip %endif %fdupes %{buildroot}/%{_libdir} -%if %{build_core} %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 @@ -930,9 +914,6 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %postun -n libdns_sd -p /sbin/ldconfig %post -n libhowl0 -p /sbin/ldconfig %postun -n libhowl0 -p /sbin/ldconfig -%endif - -%if %{build_glib2} %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 @@ -941,6 +922,7 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %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 @@ -952,12 +934,9 @@ chown -R avahi-autoipd:avahi-autoipd %{_localstatedir}/lib/avahi-autoipd %postun -n avahi-utils-gtk %desktop_database_post -%endif -%if %{build_qt4} %post -n libavahi-qt4-1 -p /sbin/ldconfig %postun -n libavahi-qt4-1 -p /sbin/ldconfig -%endif %if %{build_core} %files