From fbe92c2a44868ea74ddf44074c3038a5a99175b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 9 Jan 2025 23:42:09 +0100 Subject: [PATCH 1/3] Fix installation when %_sbindir==%_bindir --- glibc.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/glibc.spec b/glibc.spec index c13f3bb..bbaf1e7 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1576,6 +1576,17 @@ rm -f %{glibc_sysroot}%{_libdir}/libnss-*.so.1 # Further, see https://github.com/projectatomic/rpm-ostree/pull/1173#issuecomment-355014583 rm -f %{glibc_sysroot}/{usr/,}sbin/sln +############################################################################## +# Remove separate sbin directory +############################################################################## + +# 'make install' insists on creating a separate /usr/sbin directory, +# Instead of fighting with this, just move things to the right location. +%if "%{_sbindir}" == "%{_bindir}" +mv "%{glibc_sysroot}/usr/sbin/"* "%{glibc_sysroot}/usr/bin/" +rmdir "%{glibc_sysroot}/usr/sbin" +%endif + ###################################################################### # Run ldconfig to create all the symbolic links we need ###################################################################### From 72bb4c5a671cc0edf6cc18524a700506764b0f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 12 Jan 2025 13:36:58 +0100 Subject: [PATCH 2/3] Rebuilt for the bin-sbin merge (2nd attempt) https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- glibc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glibc.spec b/glibc.spec index bbaf1e7..6aa9c85 100644 --- a/glibc.spec +++ b/glibc.spec @@ -152,7 +152,7 @@ Version: %{glibcversion} # - It allows using the Release number without the %%dist tag in the dependency # generator to make the generated requires interchangeable between Rawhide # and ELN (.elnYY < .fcXX). -%global baserelease 27 +%global baserelease 28 Release: %{baserelease}%{?dist} # Licenses: @@ -2378,6 +2378,9 @@ update_gconv_modules_cache () %endif %changelog +* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 2.40.9000-28 +- Rebuilt for the bin-sbin merge (2nd attempt) + * Thu Jan 09 2025 Florian Weimer - 2.40.9000-27 - Drop glibc-nolink-libc.patch, applied upstream. - Drop glibc-clone-reset-tid.patch, unnecessary due to upstream reverts. From d3e1d8e2fdb578a2708524bba7928410f95290a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 22:13:39 +0000 Subject: [PATCH 3/3] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- glibc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glibc.spec b/glibc.spec index 6aa9c85..50cb16c 100644 --- a/glibc.spec +++ b/glibc.spec @@ -152,7 +152,7 @@ Version: %{glibcversion} # - It allows using the Release number without the %%dist tag in the dependency # generator to make the generated requires interchangeable between Rawhide # and ELN (.elnYY < .fcXX). -%global baserelease 28 +%global baserelease 29 Release: %{baserelease}%{?dist} # Licenses: @@ -2378,6 +2378,9 @@ update_gconv_modules_cache () %endif %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.40.9000-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 2.40.9000-28 - Rebuilt for the bin-sbin merge (2nd attempt)