From f6b203afcc11af57ba63fd01b0fbfd62647d658a Mon Sep 17 00:00:00 2001 From: basebuilder_pel7x64builder0 Date: Thu, 29 Feb 2024 16:54:50 +0100 Subject: [PATCH] new updates Signed-off-by: basebuilder_pel7x64builder0 --- SPECS/boost169.spec | 43 ++++++------------------------------------- SPECS/net-snmp.spec | 2 +- 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/SPECS/boost169.spec b/SPECS/boost169.spec index e4d77a44..ae3046db 100644 --- a/SPECS/boost169.spec +++ b/SPECS/boost169.spec @@ -15,43 +15,12 @@ %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif -%if 0%{?rhel} >= 7 -%ifarch ppc64le - %bcond_with mpich -%else - %bcond_without mpich -%endif -%endif -%if 0%{?rhel} == 6 -%ifarch %{arm} ppc64 ppc64le - %bcond_with mpich -%else - %bcond_without mpich -%endif -%endif -%if 0%{?rhel} >= 5 - %bcond_without mpich2 -%endif - -%if 0%{?rhel} >= 7 -%ifarch s390 s390x ppc64le - # No OpenMPI support on these arches - %bcond_with openmpi -%else - %bcond_without openmpi -%endif -%endif - -%ifnarch %{ix86} x86_64 %{arm} ppc64 ppc64le - %bcond_with context -%else - %bcond_without context -%endif - -%bcond_with python2 -%bcond_with python3 - -%ifnarch %{ix86} x86_64 ppc64 +%bcond_without mpich +%bcond_without openmpi +%bcond_without context +%bcond_without python2 +%bcond_without python3 +%ifnarch %{ix86} x86_64 %bcond_with quadmath %else %bcond_without quadmath diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec index a59db4fc..fe86f04a 100644 --- a/SPECS/net-snmp.spec +++ b/SPECS/net-snmp.spec @@ -112,7 +112,7 @@ Requires(preun): initscripts Requires(preun): coreutils Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: %{name}-agent-libs = %{epoch}:%{version}-%{release} -Requires: mysql-libs +#Requires: mysql-libs # This is actually needed for the %%triggerun script but Requires(triggerun) # is not valid. We can use %%post because this particular %triggerun script # should fire just after this package is installed.