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