From cf979ff812591e7190025c9454ab73a9c31baa5b Mon Sep 17 00:00:00 2001
From: Arjun Shankar <arjun@redhat.com>
Date: Thu, 10 Feb 2022 12:00:48 +0100
Subject: [PATCH] locale: make install-locale-files instead of install-locales

glibc-fedora-localedef.patch was altering the install-locales target so
that it does not generate a locale-archive.

This commit drops the patch and uses the install-locale-files target
instead of install-locales.  install-locale-files does not generate
locale-archive, and does not group identical locale files via hardlinks.

hardlink is also passed a -c flag so that it actually compares file
contents and hardlinks identical ones.
---
 glibc-fedora-localedef.patch | 21 ---------------------
 glibc.spec                   | 15 +++++++++------
 2 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 glibc-fedora-localedef.patch

diff --git a/glibc-fedora-localedef.patch b/glibc-fedora-localedef.patch
deleted file mode 100644
index 515611a..0000000
--- a/glibc-fedora-localedef.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Short description: Fedora-specific glibc install locale changes.
-Author(s):  Fedora glibc team <glibc@lists.fedoraproject.org>
-Origin: PATCH
-Upstream status: not-needed
-
-The Fedora glibc build and install does not need the normal install
-behaviour which updates the locale archive. The Fedora install phase
-in the spec file of the rpm will handle this manually.
-
-diff --git a/localedata/Makefile b/localedata/Makefile
-index 0eea396ad86da956..54caabda33728207 100644
---- a/localedata/Makefile
-+++ b/localedata/Makefile
-@@ -413,6 +413,7 @@ define build-one-locale
- 	echo -n '...'; \
- 	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
- 	$(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \
-+		     --no-archive \
- 		     -i locales/$$input -f charmaps/$$charset \
- 		     $(addprefix --prefix=,$(install_root)) $$locale \
- 	&& echo ' done';
diff --git a/glibc.spec b/glibc.spec
index 415c658..c581cf7 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -152,7 +152,7 @@ end \
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -217,7 +217,6 @@ rpm.define("__debug_install_post bash " .. wrapper
 # - For new patches follow template.patch format.
 ##############################################################################
 Patch4: glibc-fedora-linux-tcsetattr.patch
-Patch6: glibc-fedora-localedef.patch
 Patch8: glibc-fedora-manual-dircategory.patch
 Patch9: glibc-rh827510.patch
 Patch13: glibc-fedora-localedata-rh61908.patch
@@ -1218,11 +1217,11 @@ done
 pushd build-%{target}
 %make_build install_root=%{glibc_sysroot} install
 %make_build install_root=%{glibc_sysroot} \
-	install-locales -C ../localedata objdir=`pwd`
+	install-locale-files -C ../localedata objdir=`pwd`
 popd
-# Locale creation may produce different groups of hardlinks in an
-# unpredictable manner.  Re-grouping makes those differences go away.
-hardlink %{glibc_sysroot}/usr/lib/locale
+# Locale creation via install-locale-files does not group identical files
+# via hardlinks, so we must group them ourselves.
+hardlink -c %{glibc_sysroot}/usr/lib/locale
 
 # install_different:
 #	Install all core libraries into DESTDIR/SUBDIR. Either the file is
@@ -2161,6 +2160,10 @@ update_gconv_modules_cache ()
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Thu Feb 10 2022 Arjun Shankar <arjun@redhat.com> - 2.35.9000-2
+- Drop glibc-fedora-localedef.patch and adjust locale installation
+  accordingly so that installed content remains unchanged.
+
 * Wed Feb 09 2022 Florian Weimer <fweimer@redhat.com> - 2.35.9000-1
 - Auto-sync with upstream branch master,
   commit 3d9f171bfb5325bd5f427e9fc386453358c6e840: