%undefine with_memusage
%endif
-%define core_version 2.17
+%define core_version 2.19
%define llh_version 7:2.6.20.4-1
Summary: GNU libc
Summary(uk.UTF-8): GNU libc версії
Name: glibc
Version: %{core_version}
-Release: 3
+Release: 0.1
Epoch: 6
License: LGPL v2.1+
Group: Libraries
Source0: http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: 87bf675c8ee523ebda4803e8e1cec638
+# Source0-md5: e26b8cc666b162f999404b03970f14e4
Source2: nscd.init
Source3: nscd.sysconfig
Source4: nscd.logrotate
Patch14: %{name}-sparc-errno_fix.patch
Patch15: %{name}-new-charsets.patch
Patch16: %{name}-tzfile-noassert.patch
+# additions pending for upstream merge or taken from other distros
Patch17: %{name}-morelocales.patch
+# fixes mostly pending for upstream merge
Patch18: %{name}-locale_fixes.patch
Patch19: %{name}-ZA_collate.patch
Patch20: %{name}-thread_start.patch
Patch23: %{name}-pt_pax.patch
Patch25: %{name}-cv_gnu89_inline.patch
Patch26: %{name}-posix-sh.patch
-
+Patch27: %{name}-locale-C.patch.xz
+# Patch27-md5: 34ebe52a2afb923e33af0fb7c541f540
+Patch28: %{name}-locale-C-pld.patch
Patch29: %{name}-arm-alignment-fix.patch
-Patch30: %{name}-bug-12492.patch
+
Patch31: %{name}-origin.patch
Patch32: %{name}-Os-fail-workaround.patch
BuildRequires: gettext-devel >= 0.10.36
%{?with_selinux:BuildRequires: libselinux-devel >= 1.18}
BuildRequires: linux-libc-headers >= %{llh_version}
-BuildRequires: nss-devel >= 1:3.12.3
+BuildRequires: nss-devel >= 1:3.15.1-2
BuildRequires: perl-base
BuildRequires: rpm-build >= 4.3-0.20030610.28
BuildRequires: rpmbuild(macros) >= 1.567
BuildRequires: sed >= 4.0.5
BuildRequires: texinfo
Requires(post): ldconfig = %{epoch}:%{version}-%{release}
+Requires: filesystem
Requires: uname(release) >= %{min_kernel}
Provides: glibc(nptl)
Provides: glibc(tls)
%patch25 -p1
%patch26 -p1
-
+%patch27 -p1
+%patch28 -p1
%patch29 -p1
-%patch30 -p0
+
%patch31 -p1
%patch32 -p1
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{default,logrotate.d,rc.d/init.d,sysconfig,init} \
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,default,logrotate.d,init} \
$RPM_BUILD_ROOT{%{_mandir}/man{3,8},/var/log,/var/{lib,run}/nscd} \
- $RPM_BUILD_ROOT{/var/cache/ldconfig,/usr/lib/tmpfiles.d}
+ $RPM_BUILD_ROOT{/var/cache/ldconfig,%{systemdtmpfilesdir}}
cd builddir
env LANGUAGE=C LC_ALL=C \
install -p elf/sofini.os $RPM_BUILD_ROOT%{_libdir}/sofini.o
# Include %{_libdir}/gconv/gconv-modules.cache
-LD_PRELOAD=$(pwd)/elf/ld.so:$(pwd)/libc.so.6 ./iconv/iconvconfig --nostdlib --prefix=$RPM_BUILD_ROOT %{_libdir}/gconv -o $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
+$(pwd)/elf/ld.so --library-path $(pwd) ./iconv/iconvconfig --nostdlib --prefix=$RPM_BUILD_ROOT %{_libdir}/gconv -o $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
cd ..
%if %{without cross}
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo
-ln -sf libbsd-compat.a $RPM_BUILD_ROOT%{_libdir}/libbsd.a
-
# make symlinks across top-level directories absolute
for l in BrokenLocale anl cidn crypt dl m nsl resolv rt thread_db util; do
test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1
: > $RPM_BUILD_ROOT/var/lib/nscd/group
: > $RPM_BUILD_ROOT/var/lib/nscd/hosts
-install %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/nscd.conf
+install %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/nscd.conf
rm -rf documentation
install -d documentation
# Collect locale files and mark them with %%lang()
echo '%defattr(644,root,root,755)' > glibc.lang
-for i in $RPM_BUILD_ROOT%{_datadir}/locale/*; do
+for i in $RPM_BUILD_ROOT%{_localedir}/*; do
if [ -d $i ]; then
lang=$(basename $i)
dir="${i#$RPM_BUILD_ROOT}"
# en@shaw - English with Shavian alphabet (gnome)
# la - Latin
# tlh - Klingon (bzflag)
-# and variants:
-# sr@ije (use LANGUAGE=sr_ME@ije/sr_RS@ije) (gnome)
#
# To be added when they become supported by glibc:
# ach (vlc)
-# az_IR (gtk+2)
+# ak (gtkspell3)
# bal (newt,pessulus)
-# bem (alacarte)
# cgg (vlc)
# co (vlc)
-# fil (stellarium)
# frp (xfce, lxlauncher)
# gn (gn_BR in gnome, maybe gn_PY)
# haw (iso-codes, stellarium)
# io (gtk+2, gnome, alacarte)
# jv (gmpc, avant-window-navigator, kdesudo)
# kmr (vlc)
-# kok (iso-codes)
-# lb (geany,miro,deluge)
# man (ccsm; incorrectly named md)
-# mhr (pidgin)
# mus (bluez-gnome)
# pms (deluge)
# sco (gnomad2, picard, stellarium)
+# son (gtkspell3)
# swg (sim)
# syr (iso-codes)
# tet (vlc)
+# vec (mate-applet-indicator)
#
# To be removed (after fixing packages still using it):
# sr@Latn (use sr@latin instead)
# Short forms (omitted country code, used instead of long form) for ambiguous or unclear cases:
# aa=aa_ER
# ar=common? (AE, BH, DZ, EG, IQ, JO, KW, LB, LY, MA, OM, QA, SA, SD, SY, TN, YE)
+# az=az_AZ
# bn=bn_BD
# bo=bo_CN? (or common for CN, IN?)
# ca=ca_ES
# ckb=ckb_IQ
+# cv=cv_RU
# de=de_DE
# en=common? (en_AU, en_CA, en_GB, en_NZ, en_US are used for particular variants)
# eo=common
# es=es_ES
# eu=eu_ES
+# fa=fa_IR
# ff=ff_SN
# fr=fr_FR
# fy=fy_NL
# nds=nds_DE
# nl=nl_NL
# om=om_ET
+# or=or_IN
# pa=pa_IN
# pt=pt_PT
# ru=ru_RU
+# sd=sd_IN
# so=so_SO
# sr=sr_RS [cyrillic]
# sr@latin=sr_RS@latin
# be ca cs da de el en_GB es fi fr gl hr hu it ja ko nb nl pl pt_BR ru rw sk
# sv tr zh_CN zh_TW
#
-for i in aa aa@saaho af am an ang ar ar_TN as ast az be@latin be@tarask \
- bg bn bn_IN bo br bs byn ca@valencia ckb crh csb cy de_AT de_CH dv dz en \
+for i in aa aa@saaho af am an ang ar ar_TN as ast az az_IR be@latin be@tarask bem \
+ bg bn bn_IN bo br bs byn ca@valencia ckb crh csb cv cy de_AT de_CH dv dz en \
en@boldquot en@quot en@shaw en_AU en_CA en_NZ en_US 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 hsb hy ia id ig ik is it_CH iu ka kg kk kl km kn ks ku kw ky la \
- lg li lo lt lv mai mg mi mk ml mn mr ms mt my nds ne nl_BE nn nr nso \
- oc om or pa pap ps pt ps rm ro sa sc se si sid sl so sq sr sr@Latn tl \
+ 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 mr ms mt my nds ne nl_BE nn nr nso \
+ oc om or pa pap ps pt ps rm ro sa sc sd se si sid sl so sq sr sr@Latn tl \
sr@ije sr@ijekavian sr@ijekavianlatin sr@latin ss st sw ta te tg th ti \
- tig tk tl tlh tn ts tt ug uk ur uz uz@cyrillic ve vi wa wal wo xh yi yo \
+ 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
- if [ ! -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES ]; then
- install -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES
+ if [ ! -d $RPM_BUILD_ROOT%{_localedir}/$i/LC_MESSAGES ]; then
+ install -d $RPM_BUILD_ROOT%{_localedir}/$i/LC_MESSAGES
# use lang() tags with ll_CC@variant (stripping charset and @quot|@boldquot)
lang=$(echo $i | sed -e 's/@quot\>\|@boldquot\>//')
- echo "%lang($lang) %{_datadir}/locale/$i" >> glibc.lang
+ echo "%lang($lang) %{_localedir}/$i" >> glibc.lang
fi
done
# LC_TIME category, used for localized date formats (at least by coreutils)
for i in af be bg ca cs da de el en eo es et eu fi fr ga gl hr hu ia id it ja kk ko lg lt \
ms nb nl pl pt pt_BR ro ru rw sk sl sv tr uk vi zh_CN zh_TW; do
- if [ ! -d $RPM_BUILD_ROOT%{_datadir}/locale/$i ]; then
- echo "%lang($lang) %{_datadir}/locale/$i" >> glibc.lang
+ if [ ! -d $RPM_BUILD_ROOT%{_localedir}/$i ]; then
+ echo "%lang($lang) %{_localedir}/$i" >> glibc.lang
fi
- install -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_TIME
+ install -d $RPM_BUILD_ROOT%{_localedir}/$i/LC_TIME
done
# localedb-gen infrastructure
# shutup check-files
%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.*
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-# we don't support kernel without ptys support
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/pt_chown
# rpcinfo dropped from glibc, provided by rpcbind now
%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man8/rpcinfo.8
+# stub for man page from man-pages package to make rpm consistency check happy
+# don't package them here
+install -d $RPM_BUILD_ROOT%{_mandir}{/,/ru,/es,/fr,/ja}/man2
+:>$RPM_BUILD_ROOT%{_mandir}/man2/syslog.2
+:>$RPM_BUILD_ROOT%{_mandir}/ru/man2/syslog.2
+:>$RPM_BUILD_ROOT%{_mandir}/es/man2/syslog.2
+:>$RPM_BUILD_ROOT%{_mandir}/fr/man2/syslog.2
+:>$RPM_BUILD_ROOT%{_mandir}/ja/man2/syslog.2
+
+# remove links to non existant translations
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/pl/man3/{alphasort,cfgetispeed,cfgetospeed,cfmakeraw,cfsetispeed,cfsetospeed,closelog,dn_comp,dn_expand,fscanf}.3
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/it/man7/latin2.7
+
%clean
rm -rf $RPM_BUILD_ROOT
%dir %{_libexecdir}/getconf
%attr(755,root,root) %{_libexecdir}/getconf/*
-%dir %{_datadir}/locale
-%{_datadir}/locale/locale.alias
+%dir %{_localedir}
+%{_localedir}/locale.alias
%{_mandir}/man1/getconf.1*
%{_mandir}/man1/getent.1*
%{_libdir}/libc.so
%{_libdir}/libpthread.so
# static-only libs
-%{_libdir}/libbsd-compat.a
-%{_libdir}/libbsd.a
%{_libdir}/libc_nonshared.a
%{_libdir}/libg.a
%{_libdir}/libieee.a
%attr(755,root,root) %{_sbindir}/nscd*
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/nscd
%attr(640,root,root) %ghost /var/log/nscd
-/usr/lib/tmpfiles.d/nscd.conf
+%{systemdtmpfilesdir}/nscd.conf
%dir /var/run/nscd
%dir /var/lib/nscd
%attr(600,root,root) %ghost /var/lib/nscd/passwd
projects / packages / glibc.git / blobdiff