- update git patch

diff --git a/glibc-locale_fixes.patch b/glibc-locale_fixes.patch
index c29ca89c40e1f6828b5b188d8d97a5d9786e852e..00884a78406e6a1d749e221637984d508123f3b9 100644 (file)
--- a/glibc-locale_fixes.patch
+++ b/glibc-locale_fixes.patch
@@ -532,18 +532,18 @@
  END LC_PAPER
  
  LC_TELEPHONE
--tel_int_fmt    "+%c %a %l"
--int_prefix     "34"
--int_select     "00"
+-tel_int_fmt  "+%c %a %l"
+-int_prefix   "34"
+-int_select   "00"
 +copy "es_ES"
  END LC_TELEPHONE
  
  LC_MEASUREMENT
 @@ -165,7 +163,8 @@
- country_ab2 "ES"
- country_ab3 "ESP"
- country_num 724
--country_car    "E"
+ country_ab2  "ES"
+ country_ab3  "ESP"
+ country_num  724
+-country_car  "E"
 +country_car  "E"
 +country_isbn "84"
  % català
@@ -1995,7 +1995,7 @@
  country_num   533
 -country_car "AUA"
 +country_car   "AUA"
-+% Curaçao agency, https://www.isbn-international.org/agencies
++% Cura?ao agency, https://www.isbn-international.org/agencies
 +country_isbn  "99904"
  lang_name    "Nederlands"
  lang_ab "nl"

diff --git a/glibc.spec b/glibc.spec
index 310bb50a225b639010c3f782eb0985bad5e08a40..f7aa9b4079be61ebc8b44b4bfdfe0875f5034fde 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -58,7 +58,7 @@ Source7:      %{name}-LD-path.c
 Source9:       nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
 Patch0:                glibc-git.patch
-# Patch0-md5:  3860cde3c9be5de4e159bda0955149ba
+# Patch0-md5:  f33654af4f496289f6a6cc79a7fb5d6d
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch
@@ -85,7 +85,7 @@ Patch23:      %{name}-pt_pax.patch
 
 # http://pkgs.fedoraproject.org/cgit/rpms/glibc.git/plain/glibc-c-utf8-locale.patch
 Patch27:       %{name}-c-utf8-locale.patch
-Patch28:       localedata-missing-reorder-end.patch
+
 Patch29:       %{name}-arm-alignment-fix.patch
 Patch30:       glibc-rh1124987.patch
 URL:           http://www.gnu.org/software/libc/
@@ -976,7 +976,6 @@ exit 1
 
 %patch27 -p1
 
-%patch28 -p1
 %patch29 -p1
 %patch30 -p1
 

diff --git a/localedata-missing-reorder-end.patch b/localedata-missing-reorder-end.patch
deleted file mode 100644 (file)
index 94ceb6c..0000000
--- a/localedata-missing-reorder-end.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2018-February/025504.html
-
-$ localedb-gen --locales et_EE.UTF-8/UTF-8 -d .
-Generating et_EE.UTF-8 using charset UTF-8... failed to set locale!
-[error] LC_COLLATE: missing `reorder-end' keyword
-failed to set locale!
-[error] no output file produced because errors were issued
-
-source commit:
-https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=de9661d6beb74b177cef07fe44c90c4e48a983a2
-
-related bugreport:
-https://sourceware.org/bugzilla/show_bug.cgi?id=22517
---- glibc-2.27/localedata/locales/et_EE        2018-02-01 18:17:18.000000000 +0200
-+++ glibc-2.27/localedata/locales/et_EE        2018-02-16 13:00:00.000000000 +0200
-@@ -103,6 +103,8 @@
- <U00FC> <u-diaresis>;<BAS>;<MIN>;IGNORE % ü
- <U00DC> <u-diaresis>;<BAS>;<CAP>;IGNORE % Ü
- 
-+reorder-end
-+
- END LC_COLLATE
- 
- LC_CTYPE