diff --git a/glibc-2.3.90-langpackdir.diff b/glibc-2.3.90-langpackdir.diff deleted file mode 100644 index 5cb7dab..0000000 --- a/glibc-2.3.90-langpackdir.diff +++ /dev/null @@ -1,33 +0,0 @@ -Index: glibc-2.38/intl/loadmsgcat.c -=================================================================== ---- glibc-2.38.orig/intl/loadmsgcat.c -+++ glibc-2.38/intl/loadmsgcat.c -@@ -796,8 +796,26 @@ _nl_load_domain (struct loaded_l10nfile - if (domain_file->filename == NULL) - goto out; - -- /* Try to open the addressed file. */ -- fd = open (domain_file->filename, O_RDONLY | O_BINARY); -+ /* Replace /locale/ with /usr/share/locale-langpack/ */ -+ const char *langpackdir = "/usr/share/locale-langpack/"; -+ char *filename_langpack = malloc (strlen (domain_file->filename) -+ + strlen (langpackdir)); -+ if (filename_langpack != NULL) -+ { -+ char *p = strstr (domain_file->filename, "/locale/"); -+ if (p != NULL) -+ { -+ strcpy (__stpcpy (filename_langpack, langpackdir), p + 8); -+ fd = open (filename_langpack, O_RDONLY | O_BINARY); -+ } -+ -+ free (filename_langpack); -+ } -+ -+ if (fd == -1) -+ /* Try to open the addressed file. */ -+ fd = open (domain_file->filename, O_RDONLY | O_BINARY); -+ - if (fd == -1) - goto out; - diff --git a/glibc.changes b/glibc.changes index 450f45d..c8bdfb2 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 30 20:56:18 UTC 2024 - Stanislav Brabec + +- langpacks are no more used. Drop glibc-2.3.90-langpackdir.diff. + ------------------------------------------------------------------- Thu Sep 26 11:45:57 UTC 2024 - Andreas Schwab diff --git a/glibc.spec b/glibc.spec index 072ddef..619ac22 100644 --- a/glibc.spec +++ b/glibc.spec @@ -275,8 +275,6 @@ Patch10: glibc-version.diff Patch13: glibc-2.3.2.no_archive.diff # PATCH-FIX-OPENSUSE -- add blacklist for bindresvport Patch14: glibc-bindresvport-blacklist.diff -# PATCH-FIX-OPENSUSE prefer -lang rpm packages -Patch15: glibc-2.3.90-langpackdir.diff # PATCH-FEATURE-SLE Use nscd user for nscd Patch19: nscd-server-user.patch # PATCH-FEATURE-SLE read nsswich.conf from /usr