X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=277a8cb873699c2bcbe09c42a722d1db5779eba3;hb=8c8ce180e673a7542b432b5893034f483439fe71;hp=daf9f897f48d4aad074b4a669c0d80f271222a1d;hpb=954aec4b46ca0c09d57f55452aeaa5d0a19b4c68;p=packages%2Fglibc.git

diff --git a/glibc.spec b/glibc.spec
index daf9f89..277a8cb 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -8,7 +8,7 @@
 # - math/{test-fenv,test-tgmath,test-float,test-ifloat}, debug/backtrace-tst(SEGV)  fail on alpha
 #
 # Conditional build:
-# min_kernel	(default is 2.6.32)
+# min_kernel	(default is 3.4.0 except for x86/x86_64 where 2.6.32 suffices)
 %bcond_without	memusage	# don't build memusage utility
 %bcond_without	selinux		# without SELinux support (in nscd)
 %bcond_with	tests		# perform "make test"
@@ -17,17 +17,17 @@
 %bcond_without	nss_crypt	# disable crypt features based on Mozilla NSS library
 %bcond_with	bash_nls	# use bash NLS in shell scripts (ldd, sotruss); restores /bin/bash dep
 #
-%ifarch x32
-%{!?min_kernel:%global		min_kernel	3.4.0}
+%ifarch %{ix86} %{x8664}
+%{!?min_kernel:%global		min_kernel	2.6.32} 
 %else
-%{!?min_kernel:%global		min_kernel	2.6.32}
+%{!?min_kernel:%global		min_kernel	3.4.0}
 %endif
 
 %ifarch sparc64
 %undefine	with_memusage
 %endif
 
-%define		core_version	2.23
+%define		core_version	2.24
 %define		llh_version	7:2.6.32.1-1
 
 Summary:	GNU libc
@@ -46,18 +46,19 @@ Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5:	456995968f3acadbed39f5eba31678df
+# Source0-md5:	97dc5517f92016f3d70d83e3162ad318
 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:	82537aa7f6ee31dd782e7e085cc21018
 Source6:	%{name}-localedb-gen
 Source7:	%{name}-LD-path.c
 Source9:	nscd.tmpfiles
-# git diff glibc-2.23..release/2.23/master
+# use branch.sh to update glibc-git.patch
 Patch0:		glibc-git.patch
+# Patch0-md5:	224851258daed34503d26c3273211624
 # against GNU TP (libc domain)
 #Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
@@ -83,9 +84,9 @@ Patch20:	%{name}-thread_start.patch
 
 Patch23:	%{name}-pt_pax.patch
 
-Patch27:	%{name}-locale-C.patch.xz
-# Patch27-md5:	34ebe52a2afb923e33af0fb7c541f540
-Patch28:	%{name}-locale-C-pld.patch
+# http://pkgs.fedoraproject.org/cgit/rpms/glibc.git/plain/glibc-c-utf8-locale.patch
+Patch27:	%{name}-c-utf8-locale.patch
+
 Patch29:	%{name}-arm-alignment-fix.patch
 Patch30:	glibc-rh1124987.patch
 
@@ -498,6 +499,12 @@ Provides:	%{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 Provides:	%{name}-devel(ix86) = %{epoch}:%{version}-%{release}
 %endif
 Obsoletes:	libiconv-devel
+%ifarch %{x8664}
+# see http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2016-May/024902.html
+%if "%(rpm -q --qf '%{E}:%{V}' binutils)" >= "4:2.26"
+Conflicts: binutils < 4:2.26
+%endif
+%endif
 
 %description devel
 To develop programs which use the standard C libraries (which nearly
@@ -985,7 +992,7 @@ exit 1
 %patch23 -p0
 
 %patch27 -p1
-%patch28 -p1
+
 %patch29 -p1
 %patch30 -p1
 
@@ -1166,26 +1173,27 @@ done
 #   bal    (libosinfo, libreport, newt, pessulus)
 #   cgg    (vlc)
 #   co     (vlc)
-#   frp    (xfce, lxlauncher)
+#   frp    (xfce, lxlauncher, mate)
 #   gn     (gn_BR in gnome, maybe gn_PY)
 #   haw    (iso-codes, stellarium)
 #   hrx    (stellarium)
 #   ilo    (kudzu, libosinfo, libreport)
 #   io     (gtk+2, gnome, alacarte)
-#   jv     (gmpc, avant-window-navigator, kdesudo, mate-desktop)
+#   jv     (gmpc, avant-window-navigator, kdesudo, mate)
 #   kmr    (vlc)
-#   ku_IQ  (mate-menus,mozo)
+#   ku_IQ  (mate)
 #   kw@kkcor, kw@uccor (libosinfo - currently empty) - add as supported variants when non-empty?
 #   man    (ccsm; incorrectly named md)
 #   mus    (bluez-gnome)
-#   nah    (mate-system-monitor)
-#   nqo	   (mate-desktop)
-#   pms    (deluge)
-#   sco    (gnomad2, picard, stellarium)
+#   nah    (mate)
+#   nqo	   (mate)
+#   pms    (deluge, mate-tweak)
+#   sco    (gnomad2, picard, stellarium, mate)
 #   son    (gtkspell3)
 #   swg    (sim)
 #   syr    (iso-codes)
 #   tet    (vlc)
+#   tpi    (mate-tweak)
 #   tw     (libosinfo)
 #   vec    (mate-applet-indicator)
 #   wba    (libosinfo)
@@ -1226,6 +1234,7 @@ done
 # quz=quz_PE
 # ru=ru_RU
 # sd=sd_IN
+# shn=shn_MM
 # so=so_SO
 # sr=sr_RS [cyrillic]
 # sr@latin=sr_RS@latin
@@ -1251,7 +1260,7 @@ for i in aa aa@saaho af am an ang anp ar ar_TN as ast az az_IR be@latin be@taras
 	es_VE et eu fa ff fil fo fr_BE fr_CA fr_CH fur fy ga gd gez gu gv ha he \
 	hi hne hsb hy ia id ig ik is it_CH iu ka kg kk kl km kn kok ks ku kw ky la lb \
 	lg li lo lt lv mai mg mhr mi mk ml mn mni mr ms mt my nds ne nl_BE nn nr nso \
-	oc om or pa pap ps pt ps quz rm ro sa sat sc sd se si sid sl so sq sr sr@Latn szl tl \
+	oc om or pa pap ps pt ps quz rm ro sa sat sc sd se shn si sid sl so sq sr sr@Latn szl tl \
 	sr@ije sr@ijekavian sr@ijekavianlatin sr@latin ss st sw ta te tg th ti \
 	tig tk tl tlh tn ts tt tt@iqtelif ug uk ur uz uz@cyrillic ve vi wa wal wo xh yi yo \
 	zh_HK zu; do