From 9521fcabffa9415f108f4ea49dbc348a666c5fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Janu=C5=A1?= Date: Tue, 22 Sep 2020 14:32:06 +0200 Subject: [PATCH] Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1803161 Enables recommandation t oinstall of 32 bit version if glibc-32bit is already installed --- nss_nis.spec | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/nss_nis.spec b/nss_nis.spec index 719c35b..be708f2 100644 --- a/nss_nis.spec +++ b/nss_nis.spec @@ -1,6 +1,6 @@ Name: nss_nis Version: 3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Name Service Switch (NSS) module using NIS License: LGPLv2+ Url: https://github.com/thkukuk/libnss_nis @@ -15,10 +15,26 @@ BuildRequires: libtirpc-devel BuildRequires: autoconf, automake, libtool BuildRequires: systemd -%ifarch x86_64 -Recommends: (nss_nis(x86-32) if glibc(x86-32)) + +# hacked Provides, normally comes from built files +%if %{__isa_bits} == 64 +Provides: libnss_nis.so.2()(64bit) +%else +Provides: libnss_nis.so.2 %endif + +# recommend 32bit lib on 64bit arch +%if %{__isa_bits} == 64 +Recommends: (libnss_nis.so.2 if glibc(x86-32)) +%endif + + +# I'd recommend an explicit conflict with different versions of the package +# to ensure that 64bit and 32bit packages are equal and compatible +Conflicts: %{name} < %{version}-%{release} + + %description The nss_nis Name Service Switch module uses the Network Information System (NIS) to obtain user, group, host name, and other data. @@ -59,6 +75,10 @@ make check %license COPYING %changelog +* Tue Sep 22 2020 Filip Januš - 3.1-7 +- improve recommandation of 32 bit-version +- resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1803161 + * Tue Jul 28 2020 Fedora Release Engineering - 3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild