[packages/keyutils] - dropped glibc24 bcond

qboosh qboosh at pld-linux.org
Sat May 7 20:32:51 CEST 2022


commit da375e9d30d1a5871779e74d4ffb0d8cf84bf814
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat May 7 20:33:19 2022 +0200

    - dropped glibc24 bcond

 keyutils.spec | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/keyutils.spec b/keyutils.spec
index 0bc0ec2..2ae76b8 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -1,11 +1,3 @@
-#
-# Conditional build:
-%if "%{pld_release}" == "ac"
-%bcond_with	glibc24		# build for older glibc
-%else
-%bcond_without	glibc24		# build for older glibc
-%endif
-
 Summary:	Linux Key Management Utilities
 Summary(pl.UTF-8):	Narzędzia do linuksowego zarządzania kluczami
 Name:		keyutils
@@ -19,7 +11,7 @@ Patch0:		helpers.patch
 Patch1:		%{name}-pkgconfigdir.patch
 URL:		https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git
 BuildRequires:	rpmbuild(macros) >= 1.402
-%{?with_glibc24:BuildRequires:	glibc-devel >= 6:2.4}
+BuildRequires:	glibc-devel >= 6:2.4
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,7 +30,7 @@ Summary:	Key utilities library
 Summary(pl.UTF-8):	Biblioteka narzędzi do zarządzania kluczami
 License:	LGPL v2+
 Group:		Libraries
-%{?with_glibc24:Requires:	glibc >= 6:2.4}
+Requires:	glibc >= 6:2.4
 
 %description libs
 This package provides a wrapper library for the key management
@@ -85,9 +77,6 @@ Statyczna biblioteka do zarządzania linuksowymi kluczami.
 	CC="%{__cc}" \
 	LIBDIR=/%{_lib} \
 	USRLIBDIR=%{_libdir} \
-%if %{without glibc24}
-	NO_GLIBC_KEYERR=1 \
-%endif
 	CFLAGS="-Wall %{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}"
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/keyutils.git/commitdiff/da375e9d30d1a5871779e74d4ffb0d8cf84bf814



More information about the pld-cvs-commit mailing list