[packages/glibc] - main package obsoletes glibc-ld - don't generate autodeps for ldconfig - rel 2

baggins baggins at pld-linux.org
Sun Feb 7 16:25:42 CET 2021


commit e408d64a61d0c765e8439629542eff201ea0cb99
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 7 16:25:10 2021 +0100

    - main package obsoletes glibc-ld
    - don't generate autodeps for ldconfig
    - rel 2

 glibc.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 73e7554..e143a4c 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -50,7 +50,7 @@ Summary(tr.UTF-8):	GNU libc
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	%{core_version}
-Release:	1
+Release:	2
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
@@ -135,6 +135,7 @@ Provides:	glibc(tls)
 Provides:	rtld(GNU_HASH)
 Obsoletes:	glibc-common
 Obsoletes:	glibc-debug
+Obsoletes:	glibc-ld < 6:2.33-2
 %ifarch %{x8664} sparc64 ppc64
 Provides:	glibc64
 Obsoletes:	glibc64
@@ -190,8 +191,9 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_hack_dontneed_PartialHardlinkSets	1
 %define		_noautochrpath		.*\\(ldconfig\\|sln\\)
 # private symbols
+# don't generate deps for ldconfig to avoid loop and force rpm to install it before glibc
 %define		_noautoprov		.*\(GLIBC_PRIVATE\)
-%define		_noautoreq		.*\(GLIBC_PRIVATE\)
+%define		_noautoreq		.*\(GLIBC_PRIVATE\) /sbin/ldconfig
 
 # to avoid multi-arch conflicts on getconf/* files
 %define		_libexecdir		%{_libdir}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/e408d64a61d0c765e8439629542eff201ea0cb99



More information about the pld-cvs-commit mailing list