X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=17eb5a1b49ccc812fc4a2d097f4ff2cc0fb3d89e;hb=369590455bbe0dd5858e3c48be3796da69dd4d88;hp=5dc4511111ee7748c82289e4aed100890cf0fde6;hpb=cb6a401908c64abf58bb65540ce579f0dd99c706;p=packages%2Fglibc.git diff --git a/glibc.spec b/glibc.spec index 5dc4511..17eb5a1 100644 --- a/glibc.spec +++ b/glibc.spec @@ -31,7 +31,7 @@ %undefine with_cet %endif -%define core_version 2.29 +%define core_version 2.32 %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: 7 +Release: 1 Epoch: 6 License: LGPL v2.1+ Group: Libraries Source0: http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz -# Source0-md5: e6c279d5b2f0736f740216f152acf974 +# Source0-md5: 720c7992861c57cf97d66a2f36d8d1fa 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: 1846996a893234311f8193725754f972 +# Patch0-md5: b23f89a8ac84091eee12ac8e764483e6 # 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 @@ -86,7 +84,6 @@ Patch18: %{name}-locale_fixes.patch Patch19: %{name}-ZA_collate.patch Patch23: %{name}-pt_pax.patch -Patch24: %{name}-resolv.patch # http://pkgs.fedoraproject.org/cgit/rpms/glibc.git/plain/glibc-c-utf8-locale.patch Patch27: %{name}-c-utf8-locale.patch @@ -100,16 +97,17 @@ 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 -BuildRequires: gcc >= 6:5.0 +BuildRequires: gcc >= 6:6.2 %endif %{?with_memusage:BuildRequires: gd-devel >= 2.0.1} 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 @@ -117,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} @@ -142,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) @@ -437,39 +437,6 @@ Módulo hesiod NSS de glibc. %description -n nss_hesiod -l pl.UTF-8 Moduł glibc NSS (Name Service Switch) dostępu do baz danych. -%package -n nss_nis -Summary: NIS(YP) NSS glibc module -Summary(es.UTF-8): Módulo NIS(YP) NSS de glibc -Summary(pl.UTF-8): Moduł NIS(YP) NSS glibc -Group: Base -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description -n nss_nis -glibc NSS (Name Service Switch) module for NIS(YP) databases access. - -%description -n nss_nis -l es.UTF-8 -Módulo NSS de glibc para acceder las bases de datos NIS(YP). - -%description -n nss_nis -l pl.UTF-8 -Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS(YP). - -%package -n nss_nisplus -Summary: NIS+ NSS module -Summary(es.UTF-8): Módulo NIS+ NSS -Summary(pl.UTF-8): Moduł NIS+ NSS -Group: Base -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description -n nss_nisplus -glibc NSS (Name Service Switch) module for NIS+ databases access. - -%description -n nss_nisplus -l es.UTF-8 -Módulo NSS (Name Service Switch) de glibc para acceder las bases de -datos NIS+. - -%description -n nss_nisplus -l pl.UTF-8 -Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS+. - %package memusage Summary: Memory usage profiler Summary(pl.UTF-8): Narzędzie do profilowania zużycia pamięci @@ -946,7 +913,7 @@ echo "Minimal supported kernel is 3.2.0" >&2 exit 1 %endif -%patch0 -p1 +#%patch0 -p1 %patch2 -p1 %patch3 -p0 @@ -954,13 +921,10 @@ exit 1 %patch6 -p1 -%patch8 -p1 -%patch9 -p1 - %patch10 -p1 %patch11 -p1 -%patch14 -p0 +%patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 @@ -968,7 +932,6 @@ exit 1 %patch19 -p1 %patch23 -p0 -%patch24 -p1 %patch27 -p1 @@ -1011,7 +974,6 @@ AWK="gawk" \ --enable-kernel="%{min_kernel}" \ --enable-nss-crypt%{!?with_nss_crypt:=no} \ --enable-obsolete-nsl \ - --enable-obsolete-rpc \ --enable-profile \ --enable-stack-protector=strong \ --enable-stackguard-randomization \ @@ -1023,6 +985,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 \ @@ -1070,7 +1041,6 @@ PICFILES="libc_pic.a libc.map resolv/libresolv_pic.a" install -p $PICFILES $RPM_BUILD_ROOT%{_libdir} -install -p elf/soinit.os $RPM_BUILD_ROOT%{_libdir}/soinit.o install -p elf/sofini.os $RPM_BUILD_ROOT%{_libdir}/sofini.o # Include %{_libdir}/gconv/gconv-modules.cache @@ -1089,7 +1059,7 @@ for l in BrokenLocale anl crypt dl \ %ifarch %{x8664} x32 mvec \ %endif - nsl resolv rt thread_db util; do + resolv rt thread_db util; do test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib${l}.so ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${l}.so.*) $RPM_BUILD_ROOT%{_libdir}/lib${l}.so @@ -1146,7 +1116,6 @@ done # NOTES: # Languages not supported by glibc locales, but usable via $LANGUAGE: # ang - Old English (gtk+, gnome) -# ca@valencia (gtk+, gnome; as ca_ES@valencia in FileZilla; locale exists in Debian) # en@shaw - English with Shavian alphabet (gnome) # la - Latin # tlh - Klingon (bzflag) @@ -1159,20 +1128,22 @@ done # bar (iso-codes) # cgg (vlc) # ch (iso-codes) -# co (FileZilla, vlc) +# co (FileZilla, libfilezilla, vlc) # es_419 (alpm - common "Spanish (Latin America)") # frp (iso-codes, lxlauncher, mate, xfce) # gn (iso-codes, gnome; gn_BR in gnome, maybe gn_PY) # guc (gtk-vnc) # haw (iso-codes, stellarium) # hrx (stellarium) +# 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? @@ -1182,12 +1153,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) @@ -1232,6 +1205,7 @@ done # li=li_NL # ln=ln_CD # lo=lo_LA +# mjw=mjw_IN # nds=nds_DE # nl=nl_NL # om=om_ET @@ -1265,12 +1239,12 @@ 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 \ ka kab kg kk kl km kn kok ks ks@devanagari ku kw ky la lb lg li ln 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 \ + mai mg mhr mi mjw 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 sd@devanagari se shn si sid sl so sq \ sr sr@Latn sr@ije sr@ijekavian sr@ijekavianlatin sr@latin ss st sw szl \ @@ -1488,7 +1462,6 @@ fi %attr(755,root,root) %{_bindir}/getent %attr(755,root,root) %{_bindir}/iconv %attr(755,root,root) %{_bindir}/locale -%attr(755,root,root) %{_bindir}/rpcgen %attr(755,root,root) %{_sbindir}/zdump %attr(755,root,root) %{_sbindir}/zic @@ -1502,7 +1475,6 @@ fi %{_mandir}/man1/getent.1* %{_mandir}/man1/iconv.1* %{_mandir}/man1/locale.1* -%{_mandir}/man1/rpcgen.1* %{_mandir}/man5/gai.conf.5* %{_mandir}/man5/locale.5* %{_mandir}/man5/nss.5* @@ -1609,7 +1581,6 @@ fi %lang(ja) %{_mandir}/ja/man1/getent.1* %lang(ja) %{_mandir}/ja/man1/iconv.1* %lang(ja) %{_mandir}/ja/man1/locale.1* -%lang(ja) %{_mandir}/ja/man1/rpcgen.1* %lang(ja) %{_mandir}/ja/man5/gai.conf.5* %lang(ja) %{_mandir}/ja/man5/locale.5* %lang(ja) %{_mandir}/ja/man5/nss.5* @@ -1676,7 +1647,6 @@ fi %lang(ru) %{_mandir}/ru/man1/getent.1* %lang(ru) %{_mandir}/ru/man1/iconv.1* %lang(ru) %{_mandir}/ru/man1/locale.1* -%lang(ru) %{_mandir}/ru/man1/rpcgen.1* %lang(ru) %{_mandir}/ru/man5/locale.5* %lang(ru) %{_mandir}/ru/man5/nsswitch.conf.5* %lang(ru) %{_mandir}/ru/man5/rpc.5* @@ -1782,7 +1752,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 @@ -1834,16 +1808,6 @@ fi %attr(755,root,root) /%{_lib}/libnss_hesiod-%{core_version}.so %attr(755,root,root) /%{_lib}/libnss_hesiod.so.2 -%files -n nss_nis -%defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libnss_nis-%{core_version}.so -%attr(755,root,root) /%{_lib}/libnss_nis.so.2 - -%files -n nss_nisplus -%defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libnss_nisplus-%{core_version}.so -%attr(755,root,root) /%{_lib}/libnss_nisplus.so.2 - %if %{with memusage} %files memusage %defattr(644,root,root,755) @@ -1866,7 +1830,6 @@ fi %ifarch %{x8664} x32 %attr(755,root,root) %{_libdir}/libmvec.so %endif -%attr(755,root,root) %{_libdir}/libnsl.so %attr(755,root,root) %{_libdir}/libpcprofile.so %attr(755,root,root) %{_libdir}/libresolv.so %attr(755,root,root) %{_libdir}/librt.so @@ -1879,16 +1842,12 @@ 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 @@ -1901,6 +1860,8 @@ fi %endif %{_includedir}/arpa %{_includedir}/bits +%dir %{_includedir}/finclude +%{_includedir}/finclude/math-vector-fortran.h %dir %{_includedir}/gnu %{_includedir}/gnu/lib*.h %{_includedir}/gnu/stubs.h @@ -1918,7 +1879,6 @@ fi %{_includedir}/nfs %{_includedir}/protocols %{_includedir}/rpc -%{_includedir}/rpcsvc %{_includedir}/scsi %{_includedir}/sys @@ -2028,7 +1988,6 @@ fi %{_libdir}/libm-%{core_version}.a %{_libdir}/libmvec.a %endif -%{_libdir}/libnsl.a %{_libdir}/libpthread.a %{_libdir}/libresolv.a %{_libdir}/librt.a @@ -2042,7 +2001,6 @@ fi %defattr(644,root,root,755) %{_libdir}/lib*_pic.a %{_libdir}/lib*.map -%{_libdir}/soinit.o %{_libdir}/sofini.o %files -n nscd