X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=e774e425124fd8a9f49c3bc115a78ee92ae716b5;hb=f188df6c2c8ccf78d4f0eb4af196e008556bf357;hp=5ff8c96bcac77facdcc8856a32c14227c8ba3def;hpb=1a311156b47578d920bb61948732c80e09a40a19;p=packages%2Fglibc.git

diff --git a/glibc.spec b/glibc.spec
index 5ff8c96..e774e42 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -45,7 +45,7 @@ Summary(tr.UTF-8):	GNU libc
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	%{core_version}
-Release:	5
+Release:	6
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
@@ -62,7 +62,7 @@ Source7:	%{name}-LD-path.c
 Source9:	nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
 Patch0:		glibc-git.patch
-# Patch0-md5:	e7fee8dad613ea901a1c8621c788bd8b
+# Patch0-md5:	ade74d0facf281aea8c3e7420699f738
 # against GNU TP (libc domain)
 #Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
@@ -146,7 +146,7 @@ Conflicts:	rc-scripts < 0.3.1-13
 Conflicts:	rpm < 4.1
 Conflicts:	util-linux < 2.35.1-2
 Conflicts:	xorg-driver-video-nvidia-libs < 1:295.33
-ExclusiveArch:	i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64 armv5tel
+ExclusiveArch:	i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64 armv5tel aarch64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # avoid -s here (ld.so must not be stripped to allow any program debugging)
@@ -1170,14 +1170,15 @@ done
 #   guc    (gtk-vnc)
 #   haw    (iso-codes, stellarium)
 #   hrx    (stellarium)
-#   ie     (xfce)
+#   ie     (xfce, cinnamon)
 #   ilo    (kudzu, libosinfo, libreport)
 #   io     (alacarte, gtk+2, gnome, iso-codes)
 #   jam    (iso-codes)
-#   jv     (avant-window-navigator, gmpc, kdesudo, mate)
+#   jv     (avant-window-navigator, gmpc, kdesudo, mate, cinnamon)
 #   ki     (iso-codes)
 #   kok@latin  (inkscape)
 #   kmr    (vlc)
+#   ksw    (cinnamon)
 #   ku_IQ  (mate)
 #   kv     (iso-codes)
 #   kw@kkcor, kw@uccor (libosinfo - currently empty) - add as supported variants when non-empty?
@@ -1187,12 +1188,14 @@ done
 #   mus    (bluez-gnome)
 #   na     (iso-codes)
 #   nah    (iso-codes, mate)
+#   nap    (cinnamon)
 #   nqo	   (mate)
 #   nv     (iso-codes)
 #   pi     (iso-codes)
 #   pms    (deluge, mate-tweak)
+#   rue    (cinnamon)
 #   sat@deva[nagari]  (inkscape)
-#   sco    (gnomad2, mate, picard, stellarium)
+#   sco    (gnomad2, mate, picard, stellarium, cinnamon)
 #   son    (gtkspell3, iso-codes)
 #   su     (terminator)
 #   swg    (sim)
@@ -1271,7 +1274,7 @@ done
 for i in aa aa@saaho af ak am an ang anp ar ar_TN as ast az az_IR \
 	be@latin be@tarask bem bg bho bn bn_IN bo br brx bs byn \
 	ca@valencia ce chr ckb cmn crh csb cv cy de_AT de_CH doi dv dz \
-	en en@boldquot en@quot en@shaw en_AU en_CA en_NZ en_US eo \
+	en en@boldquot en@quot en@shaw en_AU en_CA en_IE en_NZ en_US en_ZA eo \
 	es_AR es_CL es_CO es_CR es_DO es_EC es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_SV es_UY 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 ht hsb hy ia id ig ik is it_CH iu \
@@ -1788,7 +1791,11 @@ fi
 %ifarch ppc64 s390x
 %attr(755,root,root) /%{_lib}/ld64.so.1
 %endif
-%ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} x32 ppc64 s390x %{arm}
+%ifarch aarch64
+%attr(755,root,root) /lib/ld-linux-aarch64.so.1
+%attr(755,root,root) /%{_lib}/ld-linux-aarch64.so.1
+%endif
+%ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} x32 ppc64 s390x %{arm} aarch64
 %attr(755,root,root) /%{_lib}/ld.so.1
 %endif
 %attr(755,root,root) /sbin/ldconfig
@@ -1891,7 +1898,7 @@ fi
 %{_libdir}/libnldbl_nonshared.a
 %endif
 %{_libdir}/librpcsvc.a
-%ifarch %{ix86} %{x8664} x32 ppc ppc64 s390 s390x sparc sparcv9 sparc64
+%ifarch %{ix86} %{x8664} x32 ppc ppc64 s390 s390x sparc sparcv9 sparc64 aarch64
 # ABI-dependent headers
 %{_includedir}/gnu/stubs-*.h
 %endif