diff --git a/glibc-rh697421.patch b/glibc-rh697421.patch deleted file mode 100644 index 51b95de..0000000 --- a/glibc-rh697421.patch +++ /dev/null @@ -1,22 +0,0 @@ -Short description: Add UCS-2 aliases. -Author(s): Fedora glibc team -Origin: PATCH -Bug-RHEL: #697421 -Upstream status: https://sourceware.org/ml/libc-alpha/2012-12/msg00103.html - -This is a Fedora-specific change to include new aliases for UCS-2 -data for gconv used by a certain class of users. This should be -revisited at some point to determine if those users are just using -UTF-8 at this point. - -diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules -index 4acbba062f2b187d..66f08b286f31f942 100644 ---- a/iconvdata/gconv-modules -+++ b/iconvdata/gconv-modules -@@ -113,3 +113,6 @@ module INTERNAL UTF-32BE// UTF-32 1 - alias UTF7// UTF-7// - module UTF-7// INTERNAL UTF-7 1 - module INTERNAL UTF-7// UTF-7 1 -+ -+alias ISO-10646-UCS-2// UNICODE// -+alias ISO-10646-UCS-2// ISO-10646/UTF8/ diff --git a/glibc.spec b/glibc.spec index 45731a0..39b4a2f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -97,7 +97,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 18%{?dist} +Release: 19%{?dist} # In general, GPLv2+ is used by programs, LGPLv2+ is used for # libraries. @@ -169,7 +169,6 @@ Patch23: glibc-python3.patch Patch29: glibc-fedora-nsswitch.patch Patch30: glibc-deprecated-selinux-makedb.patch Patch31: glibc-deprecated-selinux-nscd.patch -Patch33: glibc-rh697421.patch Patch34: glibc-nosymlink-1.patch Patch35: glibc-nosymlink-2.patch Patch36: glibc-nosymlink-3.patch @@ -2185,6 +2184,10 @@ fi %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %changelog +* Thu Jun 17 2021 Florian Weimer - 2.33.9000-19 +- Drop glibc-rh697421.patch: The ISO-10646-UCS-2// alias for UTF-8 is incorrect + (#1972520) + * Wed Jun 16 2021 Florian Weimer - 2.33.9000-18 - Rebuild against rawhide gcc