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#c71132b246d347c85f4bcff739e19b45ba6cf819
This commit is contained in:
DistroBaker 2021-02-16 18:00:34 +00:00
parent 5e632cddc5
commit d07af80300

View File

@ -8,8 +8,8 @@
%{?!WITH_COMPAT_DNSSD: %global WITH_COMPAT_DNSSD 1} %{?!WITH_COMPAT_DNSSD: %global WITH_COMPAT_DNSSD 1}
%{?!WITH_COMPAT_HOWL: %global WITH_COMPAT_HOWL 1} %{?!WITH_COMPAT_HOWL: %global WITH_COMPAT_HOWL 1}
%{?!WITH_QT3: %global WITH_QT3 1} %{?!WITH_QT3: %global WITH_QT3 0}
%{?!WITH_QT4: %global WITH_QT4 1} %{?!WITH_QT4: %global WITH_QT4 0}
%if %{without bootstrap} %if %{without bootstrap}
%{?!WITH_QT5: %global WITH_QT5 1} %{?!WITH_QT5: %global WITH_QT5 1}
@ -17,27 +17,28 @@
%{?!WITH_QT5: %global WITH_QT5 0} %{?!WITH_QT5: %global WITH_QT5 0}
%endif %endif
%{?!WITH_PYTHON: %global WITH_PYTHON 1} # https://bugzilla.redhat.com/show_bug.cgi?id=1751484
%{?!WITH_PYTHON: %global WITH_PYTHON 0}
%ifnarch %{mono_arches} %ifnarch %{mono_arches}
%define WITH_MONO 0 %define WITH_MONO 0
%endif %endif
# https://bugzilla.redhat.com/show_bug.cgi?id=1751484 %if 0%{?fedora}
%if 0%{?fedora} > 30 || 0%{?rhel} > 8 %global WITH_QT3 1
%global WITH_PYTHON 0 %global WITH_QT4 1
%endif %endif
%if 0%{?rhel} %if 0%{?rhel}
%define WITH_MONO 0 %global WITH_MONO 0
%if 0%{?rhel} >= 6 %global WITH_QT5 0
%define WITH_QT4 0 %if 0%{?rhel} < 8
%define WITH_QT5 0 %global WITH_PYTHON 1
%endif
%if 0%{?rhel} > 7
%define WITH_QT3 0
%endif
%endif %endif
%endif
# https://bugzilla.redhat.com/show_bug.cgi?id=1907727
%global _lto_cflags %{nil}
# http://bugzilla.redhat.com/1008395 - no hardened build # http://bugzilla.redhat.com/1008395 - no hardened build
%global _hardened_build 1 %global _hardened_build 1
@ -47,7 +48,7 @@
Name: avahi Name: avahi
Version: 0.8 Version: 0.8
Release: 7%{?dist} Release: 9%{?dist}
Summary: Local network service discovery Summary: Local network service discovery
License: LGPLv2+ License: LGPLv2+
URL: http://avahi.org URL: http://avahi.org
@ -83,6 +84,9 @@ BuildRequires: glib2-devel
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: expat-devel BuildRequires: expat-devel
%if %{WITH_PYTHON} %if %{WITH_PYTHON}
%if %{without bootstrap}
BuildRequires: pygtk2
%endif
%if 0%{?fedora} > 27 %if 0%{?fedora} > 27
%global python2_dbus python2-dbus %global python2_dbus python2-dbus
%global python2_libxml2 python2-libxml2 %global python2_libxml2 python2-libxml2
@ -98,9 +102,6 @@ BuildRequires: python3-devel
%else %else
Obsoletes: python2-avahi < %{version}-%{release} Obsoletes: python2-avahi < %{version}-%{release}
Obsoletes: python3-avahi < %{version}-%{release} Obsoletes: python3-avahi < %{version}-%{release}
%if %{without bootstrap}
BuildRequires: pygtk2
%endif
%endif %endif
BuildRequires: gdbm-devel BuildRequires: gdbm-devel
BuildRequires: pkgconfig(pygobject-3.0) BuildRequires: pkgconfig(pygobject-3.0)
@ -314,6 +315,7 @@ Requires: %{name}-sharp%{?_isa} = %{version}-%{release}
Requires: mono-core >= 1.1.13 Requires: mono-core >= 1.1.13
Requires: gtk-sharp2 Requires: gtk-sharp2
BuildRequires: gtk-sharp2-devel BuildRequires: gtk-sharp2-devel
BuildRequires: make
%description ui-sharp %description ui-sharp
The avahi-sharp package contains the files needed to run The avahi-sharp package contains the files needed to run
@ -824,6 +826,13 @@ exit 0
%changelog %changelog
* Tue Feb 16 2021 Rex Dieter <rdieter@fedoraproject.org> - 0.8-9
- cleanup/fix conditionals (#1751484)
- disable lto, workaround FTBFS (#1907727)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Nov 17 2020 Rex Dieter <rdieter@fedoraproject.org> - 0.8-7 * Tue Nov 17 2020 Rex Dieter <rdieter@fedoraproject.org> - 0.8-7
- fix undefined symbols in libavahi-qt3 (#1897925) - fix undefined symbols in libavahi-qt3 (#1897925)