From 865aa4c0e41120c146c6e39ce98ea7070f760edf Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 16 Feb 2021 10:06:28 -0600 Subject: [PATCH] cleanup/fix conditionals (#1751484) flip defaults (to off) for deprecated items: Qt3, Qt4, Python(2) --- avahi.spec | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/avahi.spec b/avahi.spec index 060955d..ee176ce 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,26 +17,24 @@ %{?!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 # http://bugzilla.redhat.com/1008395 - no hardened build @@ -47,7 +45,7 @@ Name: avahi Version: 0.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Local network service discovery License: LGPLv2+ URL: http://avahi.org @@ -83,6 +81,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 +99,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) @@ -825,6 +823,9 @@ exit 0 %changelog +* Tue Feb 16 2021 Rex Dieter - 0.8-9 +- cleanup/fix conditionals (#1751484) + * Tue Jan 26 2021 Fedora Release Engineering - 0.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild