X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=043c67cca839d67a0827e1b4a04257c308e8c967;hb=6dd5516a35382b7f5bcdc606550241d8767e5909;hp=f3ff4b7a3ca104137ab6a86782f26855d79cf47d;hpb=41e0421213cd1ccaec76b42a6f1e955bc3c2e4ed;p=packages%2Fglibc.git diff --git a/glibc.spec b/glibc.spec index f3ff4b7..043c67c 100644 --- a/glibc.spec +++ b/glibc.spec @@ -32,17 +32,15 @@ Summary(ru.UTF-8): GNU libc версии Summary(tr.UTF-8): GNU libc Summary(uk.UTF-8): GNU libc версії Name: glibc -Version: 2.8 +Version: 2.11 Release: 1 Epoch: 6 License: LGPL v2.1+ Group: Libraries -# Source0: ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2 -# Source0-md5: 2dbe2a6589edc944e999fe09bd0f8567 -# Source1: ftp://sources.redhat.com/pub/glibc/releases/%{name}-libidn-%{version}.tar.bz2 -Source1: %{name}-libidn-%{version}.tar.bz2 -# Source1-md5: f548d753ea47e79c95d992379c5e7a2c +# Source0-md5: f37a8aebb18ea7d73e590c277f4ce1f3 +#Source0: ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.bz2 +#Source1: ftp://sources.redhat.com/pub/glibc/releases/%{name}-libidn-%{version}.tar.bz2 Source2: nscd.init Source3: nscd.sysconfig Source4: nscd.logrotate @@ -51,9 +49,9 @@ Source5: http://qboosh.pl/man/%{name}-man-pages.tar.bz2 # Source5-md5: f464eadf3cf06761f65639e44a179e6b Source6: %{name}-localedb-gen Source7: %{name}-LD-path.c +Patch1: %{name}-pl.po-update.patch Patch2: %{name}-pld.patch Patch3: %{name}-crypt-blowfish.patch -Patch4: %{name}-alpha-ev6-opcodes.patch Patch5: %{name}-sparc-softfp-gcc.patch Patch6: %{name}-paths.patch Patch7: %{name}-no_opt_override.patch @@ -61,21 +59,18 @@ Patch8: %{name}-missing-nls.patch Patch9: %{name}-java-libc-wait.patch Patch10: %{name}-info.patch Patch11: %{name}-no_debuggable_objects.patch -Patch12: %{name}-2.7-alpha_PTR_MANGLE_move-1.patch -Patch13: %{name}-osinfo.patch Patch14: %{name}-sparc-errno_fix.patch - -Patch17: %{name}-new-charsets.patch - -Patch20: %{name}-tzfile-noassert.patch -Patch21: %{name}-morelocales.patch -Patch22: %{name}-locale_fixes.patch -Patch23: %{name}-ZA_collate.patch -Patch24: %{name}-ppc.patch -Patch25: %{name}-cross-gcc_eh.patch -Patch26: %{name}-with-stroke.patch - -Patch31: %{name}-pt_pax.patch +Patch15: %{name}-new-charsets.patch +Patch16: %{name}-tzfile-noassert.patch +Patch17: %{name}-morelocales.patch +Patch18: %{name}-locale_fixes.patch +Patch19: %{name}-ZA_collate.patch +Patch20: %{name}-thread_start.patch +Patch21: %{name}-cross-gcc_eh.patch +Patch22: %{name}-with-stroke.patch +Patch23: %{name}-pt_pax.patch +Patch25: %{name}-cv_gnu89_inline.patch +Patch26: %{name}-posix-sh.patch URL: http://www.gnu.org/software/libc/ %{?with_selinux:BuildRequires: audit-libs-devel} BuildRequires: autoconf @@ -85,7 +80,8 @@ BuildRequires: binutils >= 2:2.17.50.0.7 %else BuildRequires: binutils >= 2:2.15.90.0.3 %endif -AutoReq: false +# FIXME: better binutils-ver patch needed +BuildRequires: binutils >= 2:2.20.0.0.0 %{!?with_cross:BuildRequires: dietlibc-static} BuildRequires: gawk BuildRequires: gcc >= 5:3.4 @@ -93,6 +89,7 @@ BuildRequires: gcc >= 5:3.4 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: perl-base BuildRequires: rpm-build >= 4.3-0.20030610.28 BuildRequires: rpm-perlprov @@ -100,8 +97,6 @@ BuildRequires: rpmbuild(macros) >= 1.413 BuildRequires: sed >= 4.0.5 BuildRequires: texinfo Requires(post): ldconfig = %{epoch}:%{version}-%{release} -Requires: %{name}-misc = %{epoch}:%{version}-%{release} -Requires: basesystem Requires: uname(release) >= %{min_kernel} Provides: glibc(nptl) Provides: glibc(tls) @@ -112,7 +107,10 @@ Obsoletes: glibc-debug Provides: glibc64 Obsoletes: glibc64 %endif +Suggests: localedb +Suggests: tzdata Conflicts: SysVinit < 2.86-11 +Conflicts: %{name}-misc < %{epoch}:%{version}-%{release} Conflicts: kernel < %{min_kernel} Conflicts: kernel24 Conflicts: kernel24-smp @@ -126,7 +124,11 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # avoid -s here (ld.so must not be stripped to allow any program debugging) %define filterout_ld (-Wl,)?-[sS] (-Wl,)?--strip.* -%define specflags_sparc64 -mcpu=ultrasparc -mvis -fcall-used-g6 +# avoid -D_FORTIFY_SOURCE=X +%define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+ + +%define specflags_sparcv9 -mcpu=ultrasparc -mvis -fcall-used-g6 +%define specflags_sparc64 -mcpu=ultrasparc -mvis -fcall-used-g6 # ld.so needs not to be stripped to work # gdb needs unstripped libpthread for some threading support @@ -140,8 +142,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # Xen-friendly glibc %define specflags_ia32 -mno-tls-direct-seg-refs -%define specflags_x86_64 -mno-tls-direct-seg-refs -%define specflags_amd64 -mno-tls-direct-seg-refs +%define specflags_x86_64 -mno-tls-direct-seg-refs -fasynchronous-unwind-tables +%define specflags_amd64 -mno-tls-direct-seg-refs -fasynchronous-unwind-tables %define specflags_ia32e -mno-tls-direct-seg-refs # we don't want perl dependency in glibc-devel @@ -151,6 +153,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # patched not to crash on partial hardlinks too) %define _hack_dontneed_PartialHardlinkSets 1 %define _noautochrpath .*\\(ldconfig\\|sln\\) +# private symbols +%define _noautoprov .*\(GLIBC_PRIVATE\) +%define _noautoreq .*\(GLIBC_PRIVATE\) %description Contains the standard libraries that are used by multiple programs on @@ -265,7 +270,6 @@ Can be used on: Linux kernel >= %{min_kernel}. Summary: Utilities and data used by glibc Summary(pl.UTF-8): Narzędzia i dane używane przez glibc Group: Applications/System -AutoReq: false Requires: %{name} = %{epoch}:%{version}-%{release} %description misc @@ -274,6 +278,19 @@ Utilities and data used by glibc. %description misc -l pl.UTF-8 Narzędzia i dane używane przez glibc. +%package libcrypt +Summary: glibc library for crypt(3) +Summary(pl.UTF-8): Biblioteka glibc z funkcją crypt(3) +Group: Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: crypt(blowfish) + +%description libcrypt +glibc library for crypt(3). + +%description libcrypt -l pl.UTF-8 +Biblioteka glibc z funkcją crypt(3). + %package -n ldconfig Summary: Create shared library cache and maintains symlinks Summary(de.UTF-8): Erstellt ein shared library cache und verwaltet symlinks @@ -284,6 +301,8 @@ Group: Applications/System # This is needed because previous package (glibc) had autoreq false and had # provided this manually. Probably poldek bug that have to have it here. Provides: /sbin/ldconfig +# we want FHS being installed before ldconfig, altho they are both unrelated to each-other. +Requires: FHS %description -n ldconfig ldconfig scans a running system and sets up the symbolic links that @@ -393,22 +412,22 @@ Provides: %{name}-headers(%{_target_cpu}) = %{epoch}:%{version}-%{release} %ifarch %{x8664} # If both -m32 and -m64 is to be supported on x86_64, x86_64 package # have to be installed, not ix86 one. -Obsoletes: %{name}-headers(i386) -Obsoletes: %{name}-headers(i486) -Obsoletes: %{name}-headers(i586) -Obsoletes: %{name}-headers(i686) -Obsoletes: %{name}-headers(athlon) -Obsoletes: %{name}-headers(pentium3) -Obsoletes: %{name}-headers(pentium4) +Obsoletes: glibc-headers(athlon) +Obsoletes: glibc-headers(i386) +Obsoletes: glibc-headers(i486) +Obsoletes: glibc-headers(i586) +Obsoletes: glibc-headers(i686) +Obsoletes: glibc-headers(pentium3) +Obsoletes: glibc-headers(pentium4) %endif %ifarch ppc64 -Obsoletes: %{name}-headers(ppc) +Obsoletes: glibc-headers(ppc) %endif %ifarch s390x -Obsoletes: %{name}-headers(s390) +Obsoletes: glibc-headers(s390) %endif %ifarch sparc64 -Obsoletes: %{name}-headers(sparc) +Obsoletes: glibc-headers(sparc) %endif Requires: linux-libc-headers >= %{llh_version} @@ -441,22 +460,22 @@ Provides: %{name}-devel-utils(%{_target_cpu}) = %{epoch}:%{version}-%{release} %ifarch %{x8664} # If both -m32 and -m64 is to be supported on AMD64, x86_64 package # have to be installed, not ix86 one. -Obsoletes: %{name}-devel-utils(i386) -Obsoletes: %{name}-devel-utils(i486) -Obsoletes: %{name}-devel-utils(i586) -Obsoletes: %{name}-devel-utils(i686) -Obsoletes: %{name}-devel-utils(athlon) -Obsoletes: %{name}-devel-utils(pentium3) -Obsoletes: %{name}-devel-utils(pentium4) +Obsoletes: glibc-devel-utils(athlon) +Obsoletes: glibc-devel-utils(i386) +Obsoletes: glibc-devel-utils(i486) +Obsoletes: glibc-devel-utils(i586) +Obsoletes: glibc-devel-utils(i686) +Obsoletes: glibc-devel-utils(pentium3) +Obsoletes: glibc-devel-utils(pentium4) %endif %ifarch ppc64 -Obsoletes: %{name}-devel-utils(ppc) +Obsoletes: glibc-devel-utils(ppc) %endif %ifarch s390x -Obsoletes: %{name}-devel-utils(s390) +Obsoletes: glibc-devel-utils(s390) %endif %ifarch sparc64 -Obsoletes: %{name}-devel-utils(sparc) +Obsoletes: glibc-devel-utils(sparc) %endif %description devel-utils @@ -487,22 +506,22 @@ Provides: %{name}-devel-doc(%{_target_cpu}) = %{epoch}:%{version}-%{release} %ifarch %{x8664} # If both -m32 and -m64 is to be supported on x86_64, x86_64 package # have to be installed, not ix86 one. -Obsoletes: %{name}-devel-doc(i386) -Obsoletes: %{name}-devel-doc(i486) -Obsoletes: %{name}-devel-doc(i586) -Obsoletes: %{name}-devel-doc(i686) -Obsoletes: %{name}-devel-doc(athlon) -Obsoletes: %{name}-devel-doc(pentium3) -Obsoletes: %{name}-devel-doc(pentium4) +Obsoletes: glibc-devel-doc(athlon) +Obsoletes: glibc-devel-doc(i386) +Obsoletes: glibc-devel-doc(i486) +Obsoletes: glibc-devel-doc(i586) +Obsoletes: glibc-devel-doc(i686) +Obsoletes: glibc-devel-doc(pentium3) +Obsoletes: glibc-devel-doc(pentium4) %endif %ifarch ppc64 -Obsoletes: %{name}-devel-doc(ppc) +Obsoletes: glibc-devel-doc(ppc) %endif %ifarch s390x -Obsoletes: %{name}-devel-doc(s390) +Obsoletes: glibc-devel-doc(s390) %endif %ifarch sparc64 -Obsoletes: %{name}-devel-doc(sparc) +Obsoletes: glibc-devel-doc(sparc) %endif %description devel-doc @@ -578,6 +597,7 @@ Group: Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: gzip Requires: sed +Provides: localedb %description -n localedb-src This add-on package contains the data needed to build the locale data @@ -600,6 +620,7 @@ Summary(pl.UTF-8): Baza danych locale dla wszystkich lokalizacji obsługiwanych Group: Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: iconv = %{epoch}:%{version}-%{release} +Provides: localedb %description localedb-all This package contains locale database for all locales supported by @@ -630,6 +651,7 @@ Summary(es.UTF-8): Convierte entre varias codificaciones de los ficheros dados Summary(pl.UTF-8): Moduły do konwersji plików tekstowych z jednego kodowania do innego Group: Libraries Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: iconv(%{_target_base_arch}) %description -n iconv Convert encoding of given files from one encoding to another. You need @@ -868,11 +890,12 @@ Un juguete. Zabawka. %prep -%setup -q -a1 -ln -s glibc-libidn-%{version} libidn +%setup -q +# -a1 +#ln -s glibc-libidn-%{version} libidn +#%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 @@ -880,33 +903,27 @@ ln -s glibc-libidn-%{version} libidn %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 -%patch13 -p0 %patch14 -p0 +%patch15 -p1 +%patch16 -p1 %patch17 -p1 +%patch18 -p1 +%patch19 -p1 %patch20 -p1 -%patch21 -p1 -# FIXME -#%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%{?with_cross:%patch25 -p1} +%{?with_cross:%patch21 -p1} +%patch22 -p1 +%patch23 -p0 +%patch25 -p1 %patch26 -p1 -%patch31 -p0 -# these would be copied to localedb-src -rm -f localedata/locales/*{.orig,~} +# cleanup backups after patching +find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f chmod +x scripts/cpp # i786 (aka pentium4) hack -cd nptl/sysdeps/i386 && ln -s i686 i786 && cd - -cd nptl/sysdeps/unix/sysv/linux/i386 && ln -s i686 i786 && cd - - -# A lot of programs still misuse memcpy when they have to use -# memmove. The memcpy implementation below is not tolerant at -# all. -rm -f sysdeps/alpha/alphaev6/memcpy.S +ln -s i686 nptl/sysdeps/i386/i786 +ln -s i686 nptl/sysdeps/unix/sysv/linux/i386/i786 %build # glibc has its own way to remove PLT relocations. / H. J. Lu. @@ -930,20 +947,22 @@ AWK="gawk" \ --with%{!?with_selinux:out}-selinux \ --with-tls \ --enable-add-ons=nptl,libidn \ +%if "%{pld_release}" != "ti" + --enable-nss-crypt \ +%endif --enable-stackguard-randomization \ --enable-hidden-plt \ --enable-bind-now \ --enable-profile %{__make} \ - AWK="gawk" \ - sLIBdir=%{_libdir} + AWK="gawk" \ + sLIBdir=%{_libdir} cd .. %if %{with tests} -for d in builddir; do -cd $d +cd builddir env LANGUAGE=C LC_ALL=C \ %{__make} tests 2>&1 | awk ' BEGIN { file = "" } @@ -967,7 +986,7 @@ diet ${CC#*ccache } %{SOURCE7} %{rpmcflags} -Os -static -o glibc-postinst %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d,sysconfig},%{_mandir}/man{3,8},/var/log,/var/{lib,run}/nscd} +install -d $RPM_BUILD_ROOT{/etc/{default,logrotate.d,rc.d/init.d,sysconfig},%{_mandir}/man{3,8},/var/log,/var/{lib,run}/nscd} cd builddir env LANGUAGE=C LC_ALL=C \ @@ -986,13 +1005,16 @@ PICFILES="libc_pic.a libc.map math/libm_pic.a libm.map resolv/libresolv_pic.a" -install $PICFILES $RPM_BUILD_ROOT%{_libdir} -install elf/soinit.os $RPM_BUILD_ROOT%{_libdir}/soinit.o -install elf/sofini.os $RPM_BUILD_ROOT%{_libdir}/sofini.o +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 +./iconv/iconvconfig --nostdlib --prefix=$RPM_BUILD_ROOT %{_libdir}/gconv -o $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache cd .. %if %{without cross} -install glibc-postinst $RPM_BUILD_ROOT/sbin +install -p glibc-postinst $RPM_BUILD_ROOT/sbin %endif %{?with_memusage:mv -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so $RPM_BUILD_ROOT%{_libdir}} @@ -1005,7 +1027,7 @@ 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 +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 rm -f $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 @@ -1014,12 +1036,13 @@ done # linking nss modules directly is not supported rm -f $RPM_BUILD_ROOT%{_libdir}/libnss_*.so -install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nscd -install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/nscd -install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/nscd -install nscd/nscd.conf $RPM_BUILD_ROOT%{_sysconfdir} +install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nscd +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} +cp -a posix/gai.conf $RPM_BUILD_ROOT%{_sysconfdir} +cp -a nis/nss $RPM_BUILD_ROOT/etc/default/nss sed -e 's#\([ \t]\)db\([ \t]\)#\1#g' nss/nsswitch.conf > $RPM_BUILD_ROOT%{_sysconfdir}/nsswitch.conf -install posix/gai.conf $RPM_BUILD_ROOT%{_sysconfdir} bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.cache @@ -1027,6 +1050,12 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d echo 'include ld.so.conf.d/*.conf' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf rm -f $RPM_BUILD_ROOT%{_mandir}/hu/man7/man.7 +# doesn't fit with out tzdata concept and configure.in is stupid assuming bash +# is first posix compatible shell making this script depend on bash. +rm -f $RPM_BUILD_ROOT%{_bindir}/tzselect +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tzselect.8* +rm -f $RPM_BUILD_ROOT%{_mandir}/*/man8/tzselect.8* + :> $RPM_BUILD_ROOT/var/log/nscd :> $RPM_BUILD_ROOT/var/lib/nscd/passwd :> $RPM_BUILD_ROOT/var/lib/nscd/group @@ -1036,14 +1065,13 @@ rm -rf documentation install -d documentation for f in ANNOUNCE ChangeLog DESIGN-{barrier,condvar,rwlock,sem}.txt TODO{,-kernel,-testing}; do - cp -f nptl/$f documentation/$f.nptl + cp -af nptl/$f documentation/$f.nptl done -cp -f crypt/README.ufc-crypt ChangeLog* documentation +cp -af crypt/README.ufc-crypt ChangeLog* documentation # Collect locale files and mark them with %%lang() -rm -f glibc.lang echo '%defattr(644,root,root,755)' > glibc.lang -for i in $RPM_BUILD_ROOT%{_datadir}/locale/* ; do +for i in $RPM_BUILD_ROOT%{_datadir}/locale/*; do if [ -d $i ]; then lang=$(basename $i) dir="${i#$RPM_BUILD_ROOT}" @@ -1054,20 +1082,27 @@ 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) # 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: # az_IR (gtk+) -# ca_ES@valencia (FileZilla; locale exists in Debian) # co (vlc) -# dv, haw, kok, ps, syr (iso-codes) +# dv (iso-codes) # gn (gn_BR in gnome, maybe gn_PY) +# la (deluge, gnome, others; patch needed, won't be officially supported) # my (gaim) -# sco (gnomad2) +# bal (newt) +# haw (iso-codes) # ilo (kudzu) +# kok (iso-codes) # man (ccsm; incorrectly named md) +# mus (bluez-gnome) +# sco (gnomad2) +# syr (iso-codes) +# ven (kalarm) # # bn is used for bn_BD or bn_IN? Assume bn_IN as nothing for bn_BD appeared # till now. @@ -1077,25 +1112,26 @@ done # sv tr zh_CN zh_TW # for i in aa aa@saaho af am an ang ar ar_TN as ast az be@alternative be@latin \ - bg bn bn_IN br bs byn csb cy de_AT dz en en@boldquot en@quot en_AU en_CA \ - 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 fil fo fr_BE fr_CA fur fy \ - ga gd gez gu gv he hi hsb hy ia id ik is it_CH iu ka kk kl km kn ku kw \ - ky lg li lo lt lv mai mg mi mk ml mn mr ms mt nds ne nl_BE nn nr nso oc \ - om or pa pap pt rm ro sa sc se si sid sl so sq sr sr@Latn sr@ije \ - 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 zh_HK zu ; do + bg bn bn_IN br bs byn ca@valencia crh csb cy de_AT de_CH dz en \ + en@boldquot en@quot 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 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 kk kl km kn ks ku kw ky lg li \ + lo lt lv mai mg mi mk ml mn mr ms mt nds ne nl_BE nn nr nso oc om or \ + pa pap ps pt rm ro sa sc se si sid sl so sq sr sr@Latn sr@ije 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 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 # use lang() tags with ll_CC@variant (stripping charset and @quot|@boldquot) - lang=`echo $i | sed -e 's/@quot\>\|@boldquot\>//'` + lang=$(echo $i | sed -e 's/@quot\>\|@boldquot\>//') echo "%lang($lang) %{_datadir}/locale/$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 es et eu fi fr ga gl hu it ja ko ms nb nl pl \ - pt pt_BR ru rw sk sl sv tr uk vi zh_CN zh_TW ; do +for i in af be bg ca cs da de el es et eu fi fr ga gl hu id it ja ko lt ms nb nl pl \ + pt pt_BR 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 fi @@ -1121,9 +1157,6 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/rpcinfo %clean rm -rf $RPM_BUILD_ROOT -# don't run iconvconfig in %%postun -n iconv because iconvconfig doesn't exist -# when %%postun is run - %if %{without cross} %post -p /sbin/postshell /sbin/glibc-postinst /%{_lib}/%{_host_cpu} /%{_lib}/tls @@ -1136,11 +1169,12 @@ rm -rf $RPM_BUILD_ROOT -/bin/sed -i -e '1iinclude ld.so.conf.d/*.conf' /etc/ld.so.conf %endif +%post libcrypt -p /sbin/ldconfig +%postun libcrypt -p /sbin/ldconfig + %post memusage -p /sbin/ldconfig %postun memusage -p /sbin/ldconfig -%post -n iconv -p %{_sbindir}/iconvconfig - %post devel -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} @@ -1149,15 +1183,17 @@ rm -rf $RPM_BUILD_ROOT %pre -n nscd %groupadd -P nscd -g 144 -r nscd -%useradd -P nscd -u 144 -r -d /tmp -s /bin/false -c "nscd" -g nscd nscd +%useradd -P nscd -u 144 -r -d /tmp -s /bin/false -c "Name Service Cache Daemon" -g nscd nscd %post -n nscd +if [ ! -f /var/log/nscd ]; then + umask 027 + touch /var/log/nscd + chown root:root /var/log/nscd + chmod 640 /var/log/nscd +fi /sbin/chkconfig --add nscd -touch /var/log/nscd -chmod 000 /var/log/nscd -chown root:root /var/log/nscd -chmod 640 /var/log/nscd -%service nscd restart "nscd daemon" +%service nscd restart "Name Service Cache Daemon" %preun -n nscd if [ "$1" = "0" ]; then @@ -1171,16 +1207,16 @@ if [ "$1" = "0" ]; then %groupremove nscd fi -%files +%files -f %{name}.lang %defattr(644,root,root,755) %doc README NEWS FAQ BUGS -%if !%{with cross} +%if %{without cross} %attr(755,root,root) /sbin/glibc-postinst %endif # TODO: package ldconfig symlinks as %ghost %attr(755,root,root) /%{_lib}/ld-%{version}.so # wildly arch-dependent ld.so SONAME symlink -%ifarch %{ix86} sparc sparcv9 sparc64 alpha sh +%ifarch %{ix86} sparc sparcv9 sparc64 alpha sh %attr(755,root,root) /%{_lib}/ld-linux.so.2 %endif %ifarch ia64 @@ -1212,12 +1248,6 @@ fi %endif %attr(755,root,root) /%{_lib}/libcidn-%{version}.so %attr(755,root,root) /%{_lib}/libcidn.so.1 -%attr(755,root,root) /%{_lib}/libcrypt-%{version}.so -%ifarch alpha -%attr(755,root,root) /%{_lib}/libcrypt.so.1.1 -%else -%attr(755,root,root) /%{_lib}/libcrypt.so.1 -%endif %attr(755,root,root) /%{_lib}/libdl-%{version}.so %ifarch alpha %attr(755,root,root) /%{_lib}/libdl.so.2.1 @@ -1266,41 +1296,23 @@ fi %attr(755,root,root) /%{_lib}/libnss_files-%{version}.so %attr(755,root,root) /%{_lib}/libnss_files.so.2 -%files -n ldconfig -%defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf -%dir %{_sysconfdir}/ld.so.conf.d -%ghost %{_sysconfdir}/ld.so.cache -%attr(755,root,root) /sbin/ldconfig -%{_mandir}/man8/ldconfig.8* -%lang(es) %{_mandir}/es/man8/ldconfig.8* -%lang(fr) %{_mandir}/fr/man8/ldconfig.8* -%lang(hu) %{_mandir}/hu/man8/ldconfig.8* -%lang(ja) %{_mandir}/ja/man8/ldconfig.8* -%lang(pl) %{_mandir}/pl/man8/ldconfig.8* -%lang(pt) %{_mandir}/pt/man8/ldconfig.8* -%lang(ru) %{_mandir}/ru/man8/ldconfig.8* - -%files misc -f %{name}.lang %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nsswitch.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gai.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/default/nss %config %{_sysconfdir}/rpc %attr(755,root,root) /sbin/sln -%attr(755,root,root) %{_bindir}/catchsegv %attr(755,root,root) %{_bindir}/getconf %attr(755,root,root) %{_bindir}/getent %attr(755,root,root) %{_bindir}/iconv -%attr(755,root,root) %{_bindir}/ldd %ifarch %{ix86} m68k sparc sparcv9 %attr(755,root,root) %{_bindir}/lddlibc4 %endif %attr(755,root,root) %{_bindir}/locale %attr(755,root,root) %{_bindir}/rpcgen -%attr(755,root,root) %{_bindir}/tzselect %attr(755,root,root) %{_sbindir}/zdump %attr(755,root,root) %{_sbindir}/zic @@ -1311,11 +1323,9 @@ fi %dir %{_datadir}/locale %{_datadir}/locale/locale.alias -%{_mandir}/man1/catchsegv.1* %{_mandir}/man1/getconf.1* %{_mandir}/man1/getent.1* %{_mandir}/man1/iconv.1* -%{_mandir}/man1/ldd.1* %{_mandir}/man1/locale.1* %{_mandir}/man1/rpcgen.1* %{_mandir}/man5/locale.5* @@ -1326,13 +1336,11 @@ fi %{_mandir}/man8/ld-linux.so.8* %{_mandir}/man8/ld.so.8* %{_mandir}/man8/sln.8* -%{_mandir}/man8/tzselect.8* %{_mandir}/man8/zdump.8* %{_mandir}/man8/zic.8* %lang(cs) %{_mandir}/cs/man7/* %lang(de) %{_mandir}/de/man5/tzfile.5* %lang(de) %{_mandir}/de/man7/* -%lang(es) %{_mandir}/es/man1/ldd.1* %lang(es) %{_mandir}/es/man5/locale.5* %lang(es) %{_mandir}/es/man5/nsswitch.conf.5* %lang(es) %{_mandir}/es/man5/tzfile.5* @@ -1340,11 +1348,8 @@ fi %lang(es) %{_mandir}/es/man8/ld-linux.8* %lang(es) %{_mandir}/es/man8/ld-linux.so.8* %lang(es) %{_mandir}/es/man8/ld.so.8* -%lang(es) %{_mandir}/es/man8/tzselect.8* %lang(es) %{_mandir}/es/man8/zdump.8* %lang(es) %{_mandir}/es/man8/zic.8* -%lang(fi) %{_mandir}/fi/man1/ldd.1* -%lang(fr) %{_mandir}/fr/man1/ldd.1* %lang(fr) %{_mandir}/fr/man5/locale.5* %lang(fr) %{_mandir}/fr/man5/nsswitch.conf.5* %lang(fr) %{_mandir}/fr/man5/tzfile.5* @@ -1352,10 +1357,8 @@ fi %lang(fr) %{_mandir}/fr/man8/ld-linux.8* %lang(fr) %{_mandir}/fr/man8/ld-linux.so.8* %lang(fr) %{_mandir}/fr/man8/ld.so.8* -%lang(fr) %{_mandir}/fr/man8/tzselect.8* %lang(fr) %{_mandir}/fr/man8/zdump.8* %lang(fr) %{_mandir}/fr/man8/zic.8* -%lang(hu) %{_mandir}/hu/man1/ldd.1* %lang(hu) %{_mandir}/hu/man7/* %lang(hu) %{_mandir}/hu/man8/ld-linux.8* %lang(hu) %{_mandir}/hu/man8/ld-linux.so.8* @@ -1363,9 +1366,7 @@ fi %lang(hu) %{_mandir}/hu/man8/zdump.8* %lang(it) %{_mandir}/it/man5/locale.5* %lang(it) %{_mandir}/it/man7/* -%lang(it) %{_mandir}/it/man8/tzselect.8* %lang(it) %{_mandir}/it/man8/zdump.8* -%lang(ja) %{_mandir}/ja/man1/ldd.1* %lang(ja) %{_mandir}/ja/man1/rpcgen.1* %lang(ja) %{_mandir}/ja/man5/locale.5* %lang(ja) %{_mandir}/ja/man5/nsswitch.conf.5* @@ -1375,16 +1376,12 @@ fi %lang(ja) %{_mandir}/ja/man8/ld-linux.so.8* %lang(ja) %{_mandir}/ja/man8/ld.so.8* %lang(ja) %{_mandir}/ja/man8/sln.8* -%lang(ja) %{_mandir}/ja/man8/tzselect.8* %lang(ja) %{_mandir}/ja/man8/zdump.8* %lang(ja) %{_mandir}/ja/man8/zic.8* -%lang(ko) %{_mandir}/ko/man1/ldd.1* %lang(ko) %{_mandir}/ko/man5/nsswitch.conf.5* %lang(ko) %{_mandir}/ko/man5/tzfile.5* %lang(ko) %{_mandir}/ko/man7/* -%lang(ko) %{_mandir}/ko/man8/tzselect.8* %lang(ko) %{_mandir}/ko/man8/zdump.8* -%lang(pl) %{_mandir}/pl/man1/ldd.1* %lang(pl) %{_mandir}/pl/man5/locale.5* %lang(pl) %{_mandir}/pl/man7/* %lang(pl) %{_mandir}/pl/man8/ld-linux.8* @@ -1394,12 +1391,10 @@ fi %lang(pt) %{_mandir}/pt/man5/nsswitch.conf.5* %lang(pt) %{_mandir}/pt/man5/tzfile.5* %lang(pt) %{_mandir}/pt/man7/* -%lang(pt) %{_mandir}/pt/man8/tzselect.8* %lang(pt) %{_mandir}/pt/man8/zdump.8* %lang(pt) %{_mandir}/pt/man8/zic.8* %lang(ru) %{_mandir}/ru/man1/getent.1* %lang(ru) %{_mandir}/ru/man1/iconv.1* -%lang(ru) %{_mandir}/ru/man1/ldd.1* %lang(ru) %{_mandir}/ru/man1/locale.1* %lang(ru) %{_mandir}/ru/man1/rpcgen.1* %lang(ru) %{_mandir}/ru/man5/locale.5* @@ -1408,20 +1403,57 @@ fi %lang(ru) %{_mandir}/ru/man7/* %lang(ru) %{_mandir}/ru/man8/ld-linux.so.8* %lang(ru) %{_mandir}/ru/man8/ld.so.8* -%lang(ru) %{_mandir}/ru/man8/tzselect.8* %lang(ru) %{_mandir}/ru/man8/zdump.8* %lang(ru) %{_mandir}/ru/man8/zic.8* %lang(tr) %{_mandir}/tr/man1/iconv.1* -%lang(tr) %{_mandir}/tr/man1/ldd.1* %lang(zh_CN) %{_mandir}/zh_CN/man1/iconv.1* -%lang(zh_CN) %{_mandir}/zh_CN/man1/ldd.1* %lang(zh_CN) %{_mandir}/zh_CN/man5/locale.5* %lang(zh_CN) %{_mandir}/zh_CN/man5/tzfile.5* %lang(zh_CN) %{_mandir}/zh_CN/man7/* -%lang(zh_CN) %{_mandir}/zh_CN/man8/tzselect.8* %lang(zh_CN) %{_mandir}/zh_CN/man8/zdump.8* %lang(zh_CN) %{_mandir}/zh_CN/man8/zic.8* +%files misc +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/catchsegv +%attr(755,root,root) %{_bindir}/ldd +%{_mandir}/man1/catchsegv.1* +%{_mandir}/man1/ldd.1* +%lang(es) %{_mandir}/es/man1/ldd.1* +%lang(fi) %{_mandir}/fi/man1/ldd.1* +%lang(fr) %{_mandir}/fr/man1/ldd.1* +%lang(hu) %{_mandir}/hu/man1/ldd.1* +%lang(ja) %{_mandir}/ja/man1/ldd.1* +%lang(ko) %{_mandir}/ko/man1/ldd.1* +%lang(pl) %{_mandir}/pl/man1/ldd.1* +%lang(ru) %{_mandir}/ru/man1/ldd.1* +%lang(tr) %{_mandir}/tr/man1/ldd.1* +%lang(zh_CN) %{_mandir}/zh_CN/man1/ldd.1* + +%files libcrypt +%defattr(644,root,root,755) +%attr(755,root,root) /%{_lib}/libcrypt-%{version}.so +%ifarch alpha +%ghost %attr(755,root,root) /%{_lib}/libcrypt.so.1.1 +%else +%ghost %attr(755,root,root) /%{_lib}/libcrypt.so.1 +%endif + +%files -n ldconfig +%defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf +%dir %{_sysconfdir}/ld.so.conf.d +%ghost %{_sysconfdir}/ld.so.cache +%attr(755,root,root) /sbin/ldconfig +%{_mandir}/man8/ldconfig.8* +%lang(es) %{_mandir}/es/man8/ldconfig.8* +%lang(fr) %{_mandir}/fr/man8/ldconfig.8* +%lang(hu) %{_mandir}/hu/man8/ldconfig.8* +%lang(ja) %{_mandir}/ja/man8/ldconfig.8* +%lang(pl) %{_mandir}/pl/man8/ldconfig.8* +%lang(pt) %{_mandir}/pt/man8/ldconfig.8* +%lang(ru) %{_mandir}/ru/man8/ldconfig.8* + %files -n nss_compat %defattr(644,root,root,755) %attr(755,root,root) /%{_lib}/libnss_compat-%{version}.so @@ -1463,8 +1495,8 @@ fi %attr(755,root,root) %{_libdir}/librt.so %attr(755,root,root) %{_libdir}/libthread_db.so %attr(755,root,root) %{_libdir}/libutil.so -%attr(755,root,root) %{_libdir}/crt[1in].o -%attr(755,root,root) %{_libdir}/[MSg]crt1.o +%{_libdir}/crt[1in].o +%{_libdir}/[MSg]crt1.o # ld scripts %{_libdir}/libc.so %{_libdir}/libpthread.so @@ -1590,6 +1622,7 @@ fi %attr(755,root,root) %{_sbindir}/iconvconfig %dir %{_libdir}/gconv %{_libdir}/gconv/gconv-modules +%verify(not md5 mtime size) %{_libdir}/gconv/gconv-modules.cache %attr(755,root,root) %{_libdir}/gconv/*.so %files static