%undefine with_memusage
%endif
-%define core_version 2.22
+%define core_version 2.23
%define llh_version 7:2.6.32.1-1
Summary: GNU libc
License: LGPL v2.1+
Group: Libraries
Source0: http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: e51e02bf552a0a1fbbdc948fb2f5e83c
+# Source0-md5: 456995968f3acadbed39f5eba31678df
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: 465a940929350ceea2302ec4fbc90729
Source6: %{name}-localedb-gen
Source7: %{name}-LD-path.c
-Source8: nscd.upstart
Source9: nscd.tmpfiles
+# git diff glibc-2.23..release/2.23/master
+Patch0: glibc-git.patch
# against GNU TP (libc domain)
#Patch1: %{name}-pl.po-update.patch
Patch2: %{name}-pld.patch
Patch18: %{name}-locale_fixes.patch
Patch19: %{name}-ZA_collate.patch
Patch20: %{name}-thread_start.patch
-Patch22: %{name}-with-stroke.patch
+
Patch23: %{name}-pt_pax.patch
-Patch25: %{name}-cv_gnu89_inline.patch
+
Patch27: %{name}-locale-C.patch.xz
# Patch27-md5: 34ebe52a2afb923e33af0fb7c541f540
Patch28: %{name}-locale-C-pld.patch
%endif
%{!?with_cross:BuildRequires: dietlibc-static}
BuildRequires: gawk
-BuildRequires: gcc >= 6:4.6
+BuildRequires: gcc >= 6:4.7
%{?with_memusage:BuildRequires: gd-devel >= 2.0.1}
BuildRequires: gettext-tools >= 0.10.36
%{?with_selinux:BuildRequires: libselinux-devel >= 1.18}
Conflicts: kernel24-smp
Conflicts: ld.so < 1.9.9-10
Conflicts: man-pages < 4.00
-Conflicts: poldek < 0.18.8-5
+Conflicts: poldek < 0.30.1-9
Conflicts: rc-scripts < 0.3.1-13
Conflicts: rpm < 4.1
Conflicts: xorg-driver-video-nvidia-libs < 1:295.33
exit 1
%endif
+%patch0 -p1
+
%patch2 -p1
%patch3 -p0
%{!?with_bash_nls:%patch4 -p1}
%patch18 -p1
%patch19 -p1
%patch20 -p1
-%patch22 -p1
+
%patch23 -p0
-%patch25 -p1
%patch27 -p1
%patch28 -p1
%patch29 -p1
%{__make} \
AWK="gawk" \
- localedir=%{_prefix}/lib/locale \
+ complocaledir=%{_prefix}/lib/locale \
sLIBdir=%{_libdir}
cd ..
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,default,logrotate.d,init} \
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,default,logrotate.d} \
$RPM_BUILD_ROOT{%{_mandir},/var/log,/var/{lib,run}/nscd} \
$RPM_BUILD_ROOT{/var/cache/ldconfig,%{systemdtmpfilesdir}}
env LANGUAGE=C LC_ALL=C \
%{__make} install \
install_root=$RPM_BUILD_ROOT \
- localedir=%{_prefix}/lib/locale \
+ complocaledir=%{_prefix}/lib/locale \
infodir=%{_infodir} \
mandir=%{_mandir}
%if %{with localedb}
env LANGUAGE=C LC_ALL=C \
%{__make} localedata/install-locales \
- localedir=%{_prefix}/lib/locale \
+ complocaledir=%{_prefix}/lib/locale \
install_root=$RPM_BUILD_ROOT
%else
install -d $RPM_BUILD_ROOT%{_prefix}/lib/locale
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnss_*.so
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nscd
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/nscd.conf
cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/nscd
cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/nscd
cp -a nscd/nscd.conf $RPM_BUILD_ROOT%{_sysconfdir}
rm -rf documentation
install -d documentation
-for f in ChangeLog.old DESIGN-{barrier,condvar,rwlock,systemtap-probes}.txt TODO{,-kernel,-testing}; do
+for f in ChangeLog.old DESIGN-{condvar,rwlock,systemtap-probes}.txt TODO{,-kernel,-testing}; do
cp -af nptl/$f documentation/$f.nptl
done
cp -af crypt/README.ufc-crypt ChangeLog* documentation
# tlh - Klingon (bzflag)
#
# To be added when they become supported by glibc:
-# ach (vlc)
+# ach (vlc, libreport)
# ak (gtkspell3)
-# bal (newt,pessulus)
+# aln (vlc, libreport)
+# bal (libosinfo, libreport, newt, pessulus)
# cgg (vlc)
# co (vlc)
# frp (xfce, lxlauncher)
# gn (gn_BR in gnome, maybe gn_PY)
# haw (iso-codes, stellarium)
# hrx (stellarium)
-# ilo (kudzu)
+# ilo (kudzu, libosinfo, libreport)
# io (gtk+2, gnome, alacarte)
-# jv (gmpc, avant-window-navigator, kdesudo)
+# jv (gmpc, avant-window-navigator, kdesudo, mate-desktop)
# kmr (vlc)
# ku_IQ (mate-menus,mozo)
+# 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)
# son (gtkspell3)
# swg (sim)
# syr (iso-codes)
# tet (vlc)
+# tw (libosinfo)
# vec (mate-applet-indicator)
+# wba (libosinfo)
#
# 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
+# anp=anp_IN
# 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
# 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 az_IR be@latin be@tarask bem \
+for i in aa aa@saaho af 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 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 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 \
# 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
+ ms nb nl pl pt pt_BR ro ru rw sk sl sr sv tr uk vi zh_CN zh_TW; do
if [ ! -d $RPM_BUILD_ROOT%{_localedir}/$i ]; then
echo "%lang($lang) %{_localedir}/$i" >> glibc.lang
fi
%service -q crond restart
fi
+%triggerin -- apache-base
+if [ "$1" != 1 ]; then
+ %service -q httpd restart
+fi
+
%ifarch %{x8664}
# when upgrading from glibc < 6:2.19-3 copy locale-archive
# from /usr/lib64/locale to /usr/lib/locale
%{_libdir}/libc.so
%{_libdir}/libpthread.so
# static-only libs
+%ifarch %{x8664} x32
+%{_libdir}/libmvec_nonshared.a
+%endif
%{_libdir}/libc_nonshared.a
%{_libdir}/libg.a
%{_libdir}/libieee.a
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nscd
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nscd.*
%attr(754,root,root) /etc/rc.d/init.d/nscd
-%config(noreplace) %verify(not md5 mtime size) /etc/init/nscd.conf
%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