Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/avahi.git#4ae18a01681276bb49b5e85cc0475411161ad448

avahi.spec

@@ -47,7 +47,7 @@
 
 Name:             avahi
 Version:          0.8
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -98,7 +98,6 @@ BuildRequires:    python3-devel
 %else
 Obsoletes: python2-avahi < %{version}-%{release}
 Obsoletes: python3-avahi < %{version}-%{release}
-Obsoletes: avahi-ui-tools < %{version}-%{release}
 %if %{without bootstrap}
 BuildRequires:    pygtk2
 %endif
@@ -161,10 +160,10 @@ Requires:         %{name}-glib%{?_isa} = %{version}-%{release}
 Requires:         %{name}-ui-gtk3%{?_isa} = %{version}-%{release}
 Requires:         tigervnc
 Requires:         openssh-clients
+%if %{WITH_PYTHON}
+Requires:         gdbm
 Requires:         pygtk2
 Requires:         pygtk2-libglade
-Requires:         gdbm
-%if %{WITH_PYTHON}
 Requires:         python2-avahi = %{version}-%{release}
 Requires:         %{python2_dbus}
 Requires:         python2-gobject-base
@@ -644,22 +643,37 @@ exit 0
 %{_unitdir}/avahi-dnsconfd.service
 
 %files tools
-%{_bindir}/*
-%{_mandir}/man1/*
-%if %{WITH_PYTHON}
-%exclude %{_bindir}/b*
-%exclude %{_bindir}/avahi-discover*
-%exclude %{_bindir}/avahi-bookmarks
-%exclude %{_mandir}/man1/b*
-%exclude %{_mandir}/man1/avahi-discover*
-%exclude %{_mandir}/man1/avahi-bookmarks*
+%{_bindir}/avahi-browse
+%{_bindir}/avahi-browse-domains
+%{_bindir}/avahi-publish
+%{_bindir}/avahi-publish-address
+%{_bindir}/avahi-publish-service
+%{_bindir}/avahi-resolve
+%{_bindir}/avahi-resolve-address
+%{_bindir}/avahi-resolve-host-name
+%{_bindir}/avahi-set-host-name
+
+%{_mandir}/man1/avahi-browse.1*
+%{_mandir}/man1/avahi-browse-domains.1*
+%{_mandir}/man1/avahi-publish.1*
+%{_mandir}/man1/avahi-publish-address.1*
+%{_mandir}/man1/avahi-publish-service.1*
+%{_mandir}/man1/avahi-resolve.1*
+%{_mandir}/man1/avahi-resolve-address.1*
+%{_mandir}/man1/avahi-resolve-host-name.1*
+%{_mandir}/man1/avahi-set-host-name.1*
 
 %files ui-tools
-%{_bindir}/b*
-%{_bindir}/avahi-discover
+%{_bindir}/bshell
+%{_bindir}/bssh
+%{_bindir}/bvnc
+%{_bindir}/avahi-discover-standalone
+%{_mandir}/man1/bshell.1*
+%{_mandir}/man1/bssh.1*
+%{_mandir}/man1/bvnc.1*
+%if %{WITH_PYTHON}
 # avahi-bookmarks is not really a UI tool, but I won't create a seperate package for it...
 %{_bindir}/avahi-bookmarks
-%{_mandir}/man1/b*
 %{_mandir}/man1/avahi-discover*
 %{_mandir}/man1/avahi-bookmarks*
 %{_datadir}/applications/b*.desktop
@@ -806,6 +820,9 @@ exit 0
 
 
 %changelog
+* Thu Oct 15 2020 Rex Dieter <rdieter@fedoraproject.org> - 0.8-6
+- resurrect ui-tools, not just for python (#1885513)
+
 * Mon Sep 21 2020 Michal Sekletar <msekleta@redhat.com> - 0.8-5
 - Disable bootstrap