rpms/avahi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

cleanup/fix conditionals (#1751484)

Browse Source 
flip defaults (to off) for deprecated items: Qt3, Qt4, Python(2)
This commit is contained in:
Rex Dieter 2021-02-16 10:06:28 -06:00
parent 74c72f25ef
commit 865aa4c0e4
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
avahi.spec
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,26 +17,24 @@
%{?!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 %endif
%if 0%{?rhel} > 7
%define WITH_QT3 0
%endif
%endif %endif
# http://bugzilla.redhat.com/1008395 - no hardened build # http://bugzilla.redhat.com/1008395 - no hardened build
@ -47,7 +45,7 @@
Name: avahi Name: avahi
Version: 0.8 Version: 0.8
Release: 8%{?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 +81,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 +99,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)
@ -825,6 +823,9 @@ exit 0
%changelog %changelog
* Tue Feb 16 2021 Rex Dieter <rdieter@fedoraproject.org> - 0.8-9
- cleanup/fix conditionals (#1751484)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8-8 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild