- fixes from upstream

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index cf6f11970b25ef5d5cee01e13fce895be0353019..bd5794f90679795b03d4b832631d20bd79a9e710 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -27,7 +27,7 @@
 %undefine      with_memusage
 %endif
 
-%define                core_version    2.22
+%define                core_version    2.23
 %define                llh_version     7:2.6.32.1-1
 
 Summary:       GNU libc
@@ -41,22 +41,22 @@ Summary(tr.UTF-8):  GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       13
+Release:       1
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: e51e02bf552a0a1fbbdc948fb2f5e83c
+# Source0-md5: 456995968f3acadbed39f5eba31678df
 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
 # from man-pages.spec --with tars
 Source5:       %{name}-man-pages.tar.xz
-# Source5-md5: 3a4eabb7d28db7d35d8204fdb471a863
+# Source5-md5: 465a940929350ceea2302ec4fbc90729
 Source6:       %{name}-localedb-gen
 Source7:       %{name}-LD-path.c
 Source9:       nscd.tmpfiles
-# git diff glibc-2.22..release/2.22/master
+# git diff glibc-2.23..release/2.23/master
 Patch0:                glibc-git.patch
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
@@ -80,21 +80,14 @@ Patch17:    %{name}-morelocales.patch
 Patch18:       %{name}-locale_fixes.patch
 Patch19:       %{name}-ZA_collate.patch
 Patch20:       %{name}-thread_start.patch
-Patch22:       %{name}-with-stroke.patch
+
 Patch23:       %{name}-pt_pax.patch
-Patch25:       %{name}-cv_gnu89_inline.patch
+
 Patch27:       %{name}-locale-C.patch.xz
 # Patch27-md5: 34ebe52a2afb923e33af0fb7c541f540
 Patch28:       %{name}-locale-C-pld.patch
 Patch29:       %{name}-arm-alignment-fix.patch
 Patch30:       glibc-rh1124987.patch
-# Our glibc-localedb-src package is allowing state that is considered:
-# "It is a fundamental system misconfiguration issue not to have upgraded
-# the binary locale data from one release to another."
-# Same problem with glibc-localedb-all package - it and glibc are not
-# atomically upgraded causing post scripts to have problems.
-# See https://sourceware.org/ml/libc-alpha/2015-09/msg00656.html for discussion.
-Patch31:       glibc-graceful-locale.patch
 
 Patch38:       1055_all_glibc-resolv-dynamic.patch
 URL:           http://www.gnu.org/software/libc/
@@ -108,7 +101,7 @@ BuildRequires:      binutils >= 2:2.15.90.0.3
 %endif
 %{!?with_cross:BuildRequires:  dietlibc-static}
 BuildRequires: gawk
-BuildRequires: gcc >= 6:4.6
+BuildRequires: gcc >= 6:4.7
 %{?with_memusage:BuildRequires:        gd-devel >= 2.0.1}
 BuildRequires: gettext-tools >= 0.10.36
 %{?with_selinux:BuildRequires: libselinux-devel >= 1.18}
@@ -988,15 +981,13 @@ exit 1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%patch22 -p1
+
 %patch23 -p0
 
-%patch25 -p1
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
 
 %patch38 -p1
 
@@ -1044,7 +1035,7 @@ AWK="gawk" \
 
 %{__make} \
        AWK="gawk" \
-       localedir=%{_prefix}/lib/locale \
+       complocaledir=%{_prefix}/lib/locale \
        sLIBdir=%{_libdir}
 
 cd ..
@@ -1069,14 +1060,14 @@ cd builddir
 env LANGUAGE=C LC_ALL=C \
 %{__make} install \
        install_root=$RPM_BUILD_ROOT \
-       localedir=%{_prefix}/lib/locale \
+       complocaledir=%{_prefix}/lib/locale \
        infodir=%{_infodir} \
        mandir=%{_mandir}
 
 %if %{with localedb}
 env LANGUAGE=C LC_ALL=C \
 %{__make} localedata/install-locales \
-       localedir=%{_prefix}/lib/locale \
+       complocaledir=%{_prefix}/lib/locale \
        install_root=$RPM_BUILD_ROOT
 %else
 install -d $RPM_BUILD_ROOT%{_prefix}/lib/locale
@@ -1145,7 +1136,7 @@ cp -p %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/nscd.conf
 rm -rf documentation
 install -d documentation
 
-for f in ChangeLog.old DESIGN-{barrier,condvar,rwlock,systemtap-probes}.txt TODO{,-kernel,-testing}; do
+for f in ChangeLog.old DESIGN-{condvar,rwlock,systemtap-probes}.txt TODO{,-kernel,-testing}; do
        cp -af nptl/$f documentation/$f.nptl
 done
 cp -af crypt/README.ufc-crypt ChangeLog* documentation
@@ -1169,16 +1160,17 @@ done
 #   tlh - Klingon (bzflag)
 #
 # To be added when they become supported by glibc:
-#   ach    (vlc)
+#   ach    (vlc, libreport)
 #   ak     (gtkspell3)
-#   bal    (libosinfo,newt,pessulus)
+#   aln    (vlc, libreport)
+#   bal    (libosinfo, libreport, newt, pessulus)
 #   cgg    (vlc)
 #   co     (vlc)
 #   frp    (xfce, lxlauncher)
 #   gn     (gn_BR in gnome, maybe gn_PY)
 #   haw    (iso-codes, stellarium)
 #   hrx    (stellarium)
-#   ilo    (kudzu,libosinfo)
+#   ilo    (kudzu, libosinfo, libreport)
 #   io     (gtk+2, gnome, alacarte)
 #   jv     (gmpc, avant-window-navigator, kdesudo, mate-desktop)
 #   kmr    (vlc)