X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=1721b56ab713ab5a2581b0d867722c21c0436db3;hb=3225188f39b7203a0db120d1237895256e89e8f3;hp=dad858df58f6fbe56acde0bb6c9ec132115fea73;hpb=083f707c70a1baa7d6212415a898247f9f7de0db;p=packages%2Fglibc.git diff --git a/glibc.spec b/glibc.spec index dad858d..1721b56 100644 --- a/glibc.spec +++ b/glibc.spec @@ -31,7 +31,7 @@ %undefine with_cet %endif -%define core_version 2.30 +%define core_version 2.31 %define llh_version 7:2.6.32.1-1 Summary: GNU libc @@ -45,12 +45,12 @@ Summary(tr.UTF-8): GNU libc Summary(uk.UTF-8): GNU libc версії Name: glibc Version: %{core_version} -Release: 3 +Release: 7 Epoch: 6 License: LGPL v2.1+ Group: Libraries Source0: http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz -# Source0-md5: 2b1dbdf27b28620752956c061d62f60c +# Source0-md5: 78a720f17412f3c3282be5a6f3363ec6 Source2: nscd.init Source3: nscd.sysconfig Source4: nscd.logrotate @@ -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: 30c72a537fc2b2b893832985d7c41f1f +# Patch0-md5: 144db12c89a8af1afbaa6517011511dc # against GNU TP (libc domain) #Patch1: %{name}-pl.po-update.patch Patch2: %{name}-pld.patch @@ -71,8 +71,6 @@ Patch4: %{name}-no-bash-nls.patch Patch6: %{name}-paths.patch -Patch8: %{name}-missing-nls.patch -Patch9: %{name}-nss_include_dirs.patch Patch10: %{name}-info.patch Patch11: %{name}-autoconf.patch @@ -99,7 +97,7 @@ BuildRequires: automake BuildRequires: binutils >= 2:2.29 BuildRequires: bison >= 2.7 %{!?with_cross:BuildRequires: dietlibc-static} -BuildRequires: gawk +BuildRequires: gawk >= 3.1.2 %if %{with cet} BuildRequires: gcc >= 6:8.0 %else @@ -109,6 +107,7 @@ BuildRequires: gcc >= 6:6.2 BuildRequires: gettext-tools >= 0.10.36 %{?with_selinux:BuildRequires: libselinux-devel >= 1.18} BuildRequires: linux-libc-headers >= %{llh_version} +BuildRequires: make >= 1:4.0 %{?with_nss_crypt:BuildRequires: nss-devel >= 1:3.15.1-2} BuildRequires: perl-base BuildRequires: python3 >= 1:3.4 @@ -116,7 +115,7 @@ BuildRequires: python3-modules >= 1:3.4 BuildRequires: rpm-build >= 4.3-0.20030610.28 BuildRequires: rpmbuild(macros) >= 1.567 BuildRequires: sed >= 4.0.5 -BuildRequires: texinfo +BuildRequires: texinfo >= 4.7 Requires: %{name}-ld = %{epoch}:%{version}-%{release} Requires: filesystem Requires: uname(release) >= %{min_kernel} @@ -141,11 +140,13 @@ Conflicts: kernel24 Conflicts: kernel24-smp Conflicts: ld.so < 1.9.9-10 Conflicts: man-pages < 4.00 +Conflicts: openssh-server < 2:8.2p1-1 Conflicts: poldek < 0.30.1-9 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) @@ -953,13 +954,10 @@ exit 1 %patch6 -p1 -%patch8 -p1 -%patch9 -p1 - %patch10 -p1 %patch11 -p1 -%patch14 -p0 +%patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 @@ -1021,6 +1019,15 @@ AWK="gawk" \ --with-selinux%{!?with_selinux:=no} \ --with-tls +# hack: libgd (used by memusagestat) requires librt, which is built after malloc/ subdir. +# First build all without libgd-dependent components (LIBGD=no)... +%{__make} \ + AWK="gawk" \ + complocaledir=%{_prefix}/lib/locale \ + sLIBdir=%{_libdir} \ + LIBGD=no + +# ...then, when librt is ready, rerun make to build memusagestat %{__make} \ AWK="gawk" \ complocaledir=%{_prefix}/lib/locale \ @@ -1163,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? @@ -1180,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) @@ -1264,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 \ @@ -1781,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 @@ -1878,16 +1892,13 @@ fi %{_libdir}/libc.so %{_libdir}/libpthread.so # static-only libs -%ifarch %{x8664} x32 -%{_libdir}/libmvec_nonshared.a -%endif %{_libdir}/libc_nonshared.a %{_libdir}/libg.a %ifarch alpha ppc sparc %{_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