X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=bf828cad0558860240c1e41ffae4f49056e10ee7;hb=f9a3b9be3b21b9edc8d8c52461a0d11626fa062d;hp=b1dbfae931cbac195da4159d1aff6f84df87e4bc;hpb=6a885e563aa5d9bf8276637b2ab20cc06362b3ec;p=packages%2Fglibc.git diff --git a/glibc.spec b/glibc.spec index b1dbfae..bf828ca 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,27 +1,27 @@ # TODO: +# - restore --with-pkgversion when tcl upstream fixes the #3599098 (broken platform::identify). +# - --enable-systemtap # - look at locale fixes/updates in bugzilla # - no more chicken-egg problem (postshell is no more dynamically linked with libc), remove SONAME symlinks? see files section. -# - package libdir/audit/sotruss-lib.so (subpackage?) # [OLD] # - localedb-gen man pages(?) -# - math/{test-fenv,test-tgmath,test-float,test-ifloat}, -# debug/backtrace-tst(SEGV) fail on alpha +# - math/{test-fenv,test-tgmath,test-float,test-ifloat}, debug/backtrace-tst(SEGV) fail on alpha # # Conditional build: -# min_kernel (default is 2.6.12) +# min_kernel (default is 2.6.16) %bcond_without memusage # don't build memusage utility %bcond_without selinux # without SELinux support (in nscd) %bcond_with tests # perform "make test" %bcond_without localedb # don't build localedb-all (is time consuming) %bcond_with cross # build using crossgcc (without libgcc_eh) # -%{!?min_kernel:%global min_kernel 2.6.12} +%{!?min_kernel:%global min_kernel 2.6.16} %ifarch sparc64 %undefine with_memusage %endif -%define ports_version 2.13 +%define core_version 2.18 %define llh_version 7:2.6.20.4-1 Summary: GNU libc @@ -34,15 +34,13 @@ Summary(ru.UTF-8): GNU libc версии Summary(tr.UTF-8): GNU libc Summary(uk.UTF-8): GNU libc версії Name: glibc -Version: 2.14 -Release: 3 +Version: %{core_version} +Release: 1 Epoch: 6 License: LGPL v2.1+ Group: Libraries Source0: http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz -# Source0-md5: 8f5f6b09f98d17c630819b4845e31e65 -Source1: http://ftp.gnu.org/gnu/glibc/%{name}-ports-%{ports_version}.tar.bz2 -# Source1-md5: 483f37cfdd619e81d8ca9e9d713944b5 +# Source0-md5: 88fbbceafee809e82efd52efa1e3c58f Source2: nscd.init Source3: nscd.sysconfig Source4: nscd.logrotate @@ -51,16 +49,22 @@ 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 +Source8: nscd.upstart +Source9: nscd.tmpfiles +# against GNU TP (libc domain) +#Patch1: %{name}-pl.po-update.patch Patch2: %{name}-pld.patch Patch3: %{name}-crypt-blowfish.patch +Patch4: %{name}-sotruss-sh.patch Patch5: %{name}-sparc-softfp-gcc.patch Patch6: %{name}-paths.patch -Patch7: %{name}-no_opt_override.patch +Patch7: 1070_all_glibc-fadvise64_64.patch Patch8: %{name}-missing-nls.patch Patch9: %{name}-java-libc-wait.patch Patch10: %{name}-info.patch -Patch11: %{name}-no_debuggable_objects.patch +Patch11: %{name}-autoconf.patch +Patch12: %{name}-format.patch + Patch14: %{name}-sparc-errno_fix.patch Patch15: %{name}-new-charsets.patch Patch16: %{name}-tzfile-noassert.patch @@ -73,17 +77,13 @@ Patch22: %{name}-with-stroke.patch Patch23: %{name}-pt_pax.patch Patch25: %{name}-cv_gnu89_inline.patch Patch26: %{name}-posix-sh.patch -Patch27: %{name}-i686.patch + Patch29: %{name}-arm-alignment-fix.patch -Patch30: %{name}-bug-12492.patch + Patch31: %{name}-origin.patch Patch32: %{name}-Os-fail-workaround.patch -Patch33: 0020_all_glibc-tweak-rfc1918-lookup.patch -Patch35: 0055_all_glibc-2.12-static-shared-getpagesize.patch -Patch37: 0061_all_glibc-2.13-static-memset.patch + Patch38: 1055_all_glibc-resolv-dynamic.patch -Patch39: %{name}-git.patch -Patch40: %{name}-bad-fix.patch URL: http://www.gnu.org/software/libc/ %{?with_selinux:BuildRequires: audit-libs-devel} BuildRequires: autoconf @@ -100,13 +100,14 @@ BuildRequires: gcc >= 6:4.3 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) @@ -129,13 +130,15 @@ Conflicts: man-pages < 1.43 Conflicts: poldek < 0.18.8-5 Conflicts: rc-scripts < 0.3.1-13 Conflicts: rpm < 4.1 +Conflicts: xorg-driver-video-nvidia-libs < 1:295.33 ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64 armv5tel 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.* -# avoid -D_FORTIFY_SOURCE=X -%define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+ +# disable -D_FORTIFY_SOURCE=X and -fstack-protector +%define _fortify_cflags %{nil} +%define _ssp_cflags %{nil} %define specflags_sparcv9 -mcpu=ultrasparc -mvis -fcall-used-g6 %define specflags_sparc64 -mcpu=ultrasparc -mvis -fcall-used-g6 @@ -297,6 +300,9 @@ Summary(pl.UTF-8): Biblioteka glibc z funkcją crypt(3) Group: Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Provides: %{name}-libcrypt(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%ifarch %{ix86} +Provides: %{name}-libcrypt(ix86) = %{epoch}:%{version}-%{release} +%endif Provides: crypt(blowfish) %description libcrypt @@ -361,10 +367,17 @@ Summary(tr.UTF-8): Geliştirme için gerekli diğer kitaplıklar Summary(uk.UTF-8): Додаткові бібліотеки, потрібні для компіляції Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-libcrypt(%{_target_cpu}) = %{epoch}:%{version}-%{release} Requires: %{name}-devel-utils = %{epoch}:%{version}-%{release} +Requires: %{name}-libcrypt(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%if "%{_lib}" == "lib64" +Requires: %{name}-headers(64bit) = %{epoch}:%{version}-%{release} +%else Requires: %{name}-headers = %{epoch}:%{version}-%{release} +%endif Provides: %{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%ifarch %{ix86} +Provides: %{name}-devel(ix86) = %{epoch}:%{version}-%{release} +%endif Obsoletes: libiconv-devel %description devel @@ -424,6 +437,12 @@ Summary: Header files for development using standard C libraries Summary(pl.UTF-8): Pliki nagłówkowe do tworzenia programów przy użyciu standardowych bibliotek C Group: Development/Building Provides: %{name}-headers(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%ifarch %{ix86} +Provides: %{name}-headers(ix86) = %{epoch}:%{version}-%{release} +%endif +%if "%{_lib}" == "lib64" +Provides: %{name}-headers(64bit) = %{epoch}:%{version}-%{release} +%endif %ifarch %{x8664} # If both -m32 and -m64 is to be supported on x86_64, x86_64 package # have to be installed, not ix86 one. @@ -472,6 +491,9 @@ Summary: Utilities needed for development using standard C libraries Summary(pl.UTF-8): Narzędzia do tworzenia programów przy użyciu standardowych bibliotek C Group: Development/Libraries Provides: %{name}-devel-utils(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%ifarch %{ix86} +Provides: %{name}-devel-utils(ix86) = %{epoch}:%{version}-%{release} +%endif %ifarch %{x8664} # If both -m32 and -m64 is to be supported on AMD64, x86_64 package # have to be installed, not ix86 one. @@ -518,6 +540,9 @@ Summary: Documentation needed for development using standard C libraries Summary(pl.UTF-8): Dokumentacja do tworzenia programów przy użyciu standardowych bibliotek C Group: Documentation Provides: %{name}-devel-doc(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%ifarch %{ix86} +Provides: %{name}-devel-doc(ix86) = %{epoch}:%{version}-%{release} +%endif %ifarch %{x8664} # If both -m32 and -m64 is to be supported on x86_64, x86_64 package # have to be installed, not ix86 one. @@ -574,7 +599,7 @@ Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires: %{name} = %{epoch}:%{version}-%{release} %{?with_selinux:Requires: libselinux >= 1.18} -Requires: rc-scripts >= 0.2.0 +Requires: rc-scripts >= 0.4.3.0 Provides: group(nscd) Provides: user(nscd) @@ -698,6 +723,9 @@ Summary(uk.UTF-8): Статичні бібліотеки glibc Group: Development/Libraries Requires: %{name}-devel = %{epoch}:%{version}-%{release} Provides: %{name}-static(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%ifarch %{ix86} +Provides: %{name}-static(ix86) = %{epoch}:%{version}-%{release} +%endif Obsoletes: libiconv-static %description static @@ -889,27 +917,28 @@ datos NIS+. Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS+. %package memusage -Summary: A toy -Summary(es.UTF-8): Un juguete -Summary(pl.UTF-8): Zabawka -Group: Applications +Summary: Memory usage profiler +Summary(pl.UTF-8): Narzędzie do profilowania zużycia pamięci +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} %description memusage -A toy. - -%description memusage -l es.UTF-8 -Un juguete. +Memory usage profiler. %description memusage -l pl.UTF-8 -Zabawka. +Narzędzie do profilowania zużycia pamięci. %prep -%setup -q -a1 -mv %{name}-ports-%{ports_version} ports -#%patch1 -p1 +%setup -q + +%if "%{min_kernel}" < "2.6.16" +echo "Minimal supported kernel is 2.6.16" >&2 +exit 1 +%endif + %patch2 -p1 %patch3 -p0 +%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 @@ -917,6 +946,8 @@ mv %{name}-ports-%{ports_version} ports %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 + %patch14 -p0 %patch15 -p1 %patch16 -p1 @@ -930,19 +961,13 @@ mv %{name}-ports-%{ports_version} ports %patch25 -p1 %patch26 -p1 -%patch27 -p1 + %patch29 -p1 -%patch30 -p0 + %patch31 -p1 %patch32 -p1 -%patch33 -p1 - -%patch35 -p1 -%patch37 -p1 %patch38 -p1 -%patch39 -p1 -%patch40 -p1 -R # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -980,16 +1005,18 @@ PATH=$(pwd)/alt-tools:$PATH; export PATH AWK="gawk" \ ../%configure \ + --with-bugurl=http://bugs.pld-linux.org/ \ --with-binutils=$(pwd)/alt-tools \ --enable-kernel="%{min_kernel}" \ - --enable-omitfp \ --with-headers=%{_includedir} \ --with%{!?with_selinux:out}-selinux \ --with-tls \ + --enable-obsolete-rpc \ --enable-add-ons=$AddOns \ %if "%{pld_release}" != "ti" --enable-nss-crypt \ %endif + --enable-experimental-malloc \ --enable-stackguard-randomization \ --enable-hidden-plt \ --enable-bind-now \ @@ -1004,7 +1031,7 @@ cd .. %if %{with tests} cd builddir env LANGUAGE=C LC_ALL=C \ -%{__make} tests 2>&1 | awk ' +%{__make} -j1 tests 2>&1 | awk ' BEGIN { file = "" } { if (($0 ~ /\*\*\* \[.*\.out\] Error/) && ($0 !~ /annexc/) && (file == "")) { @@ -1026,7 +1053,9 @@ diet ${CC#*ccache } %{SOURCE7} %{rpmcflags} -Os -static -o glibc-postinst %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/{default,logrotate.d,rc.d/init.d,sysconfig},%{_mandir}/man{3,8},/var/log,/var/{lib,run}/nscd,/var/cache/ldconfig} +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,%{systemdtmpfilesdir}} cd builddir env LANGUAGE=C LC_ALL=C \ @@ -1050,7 +1079,7 @@ 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 -LD_PRELOAD=$(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} @@ -1077,6 +1106,7 @@ done rm -f $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} @@ -1103,6 +1133,8 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/*/man8/tzselect.8* : > $RPM_BUILD_ROOT/var/lib/nscd/group : > $RPM_BUILD_ROOT/var/lib/nscd/hosts +install %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/nscd.conf + rm -rf documentation install -d documentation @@ -1113,7 +1145,7 @@ cp -af crypt/README.ufc-crypt ChangeLog* 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}" @@ -1132,22 +1164,23 @@ done # 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) # bal (newt,pessulus) # bem (alacarte) -# ckb [or ku_IQ/ku_IR] (vlc,miro) +# cgg (vlc) # co (vlc) # fil (stellarium) -# frp (xfce) +# frp (xfce, lxlauncher) # gn (gn_BR in gnome, maybe gn_PY) # haw (iso-codes, stellarium) # hrx (stellarium) # ilo (kudzu) # io (gtk+2, gnome, alacarte) # jv (gmpc, avant-window-navigator, kdesudo) -# kg (gtk+3, gnome) +# kmr (vlc) # kok (iso-codes) -# lb (geany,miro) +# lb (geany,miro,deluge) # man (ccsm; incorrectly named md) # mhr (pidgin) # mus (bluez-gnome) @@ -1159,44 +1192,78 @@ done # # To be removed (after fixing packages still using it): # sr@Latn (use sr@latin instead) +# sr@ije (use sr@ijekavian instead) # -# To be clarified: -# sr@ije or sr@ijekavian? (currently sr@ije is supported) -# sr@ijelatin or sr@ijekavianlatin? (currently not supported) -# sr@ijekavian and sr@ijekavianlatin exist in: akonadi-googledata, amarok, k3b, konversation, ktorrent, wesnoth -# -# bn is used for bn_BD or bn_IN? Assume bn_IN as nothing for bn_BD appeared -# till now. +# 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) +# bn=bn_BD +# bo=bo_CN? (or common for CN, IN?) +# ca=ca_ES +# ckb=ckb_IQ +# 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 +# gez=gez_ET (?) +# it=it_IT +# li=li_NL +# nds=nds_DE +# nl=nl_NL +# om=om_ET +# or=or_IN +# pa=pa_IN +# pt=pt_PT +# ru=ru_RU +# so=so_SO +# sr=sr_RS [cyrillic] +# sr@latin=sr_RS@latin +# sr@ijekavian=sr_BA@ijekavian +# sr@ijekavianlatin=sr_BA@ijekavianlatin +# sv=sv_SE +# sw=sw_TZ (or common for KE, TZ, UG?) +# ta=ta_IN +# te=te_IN +# ti=ti_ER (?) +# tr=tr_TR +# ur=ur_PK (?) +# zh: no short code used (use zh_CN, zh_HK, zh_SG[not included yet], zh_TW) # # Omitted here - already existing (with libc.mo): # 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@alternative be@latin \ - bg bn bn_IN br bs byn ca@valencia 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 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 \ 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 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 la \ + 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 \ - 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 + 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 \ + zh_HK zu; do + 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 es et eu fi fr ga gl hu id it ja kk ko lg lt \ +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 @@ -1205,15 +1272,23 @@ chmod +x $RPM_BUILD_ROOT%{_bindir}/localedb-gen install localedata/SUPPORTED $RPM_BUILD_ROOT%{_datadir}/i18n # shutup check-files -rm -f $RPM_BUILD_ROOT%{_mandir}/README.* -rm -f $RPM_BUILD_ROOT%{_mandir}/diff.* +%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.* rm -f $RPM_BUILD_ROOT%{_infodir}/dir -# we don't support kernel without ptys support -rm -f $RPM_BUILD_ROOT%{_libdir}/pt_chown -# rpcbind -rm -f $RPM_BUILD_ROOT%{_mandir}/*/man8/rpcinfo.8 -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/rpcinfo.8 -rm -f $RPM_BUILD_ROOT%{_sbindir}/rpcinfo +# 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 @@ -1284,12 +1359,12 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) -%doc README NEWS FAQ BUGS +%doc README NEWS BUGS CONFORMANCE %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 +%attr(755,root,root) /%{_lib}/ld-%{core_version}.so # wildly arch-dependent ld.so SONAME symlink %ifarch %{ix86} sparc sparcv9 sparc64 alpha sh %attr(755,root,root) /%{_lib}/ld-linux.so.2 @@ -1306,54 +1381,54 @@ fi %ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} ppc64 s390x %{arm} %attr(755,root,root) /%{_lib}/ld.so.1 %endif -%attr(755,root,root) /%{_lib}/libBrokenLocale-%{version}.so +%attr(755,root,root) /%{_lib}/libBrokenLocale-%{core_version}.so %ifarch alpha %attr(755,root,root) /%{_lib}/libBrokenLocale.so.1.1 %else %attr(755,root,root) /%{_lib}/libBrokenLocale.so.1 %endif %attr(755,root,root) /%{_lib}/libSegFault.so -%attr(755,root,root) /%{_lib}/libanl-%{version}.so +%attr(755,root,root) /%{_lib}/libanl-%{core_version}.so %attr(755,root,root) /%{_lib}/libanl.so.1 -%attr(755,root,root) /%{_lib}/libc-%{version}.so +%attr(755,root,root) /%{_lib}/libc-%{core_version}.so %ifarch alpha ia64 %attr(755,root,root) /%{_lib}/libc.so.6.1 %else %attr(755,root,root) /%{_lib}/libc.so.6 %endif -%attr(755,root,root) /%{_lib}/libcidn-%{version}.so +%attr(755,root,root) /%{_lib}/libcidn-%{core_version}.so %attr(755,root,root) /%{_lib}/libcidn.so.1 -%attr(755,root,root) /%{_lib}/libdl-%{version}.so +%attr(755,root,root) /%{_lib}/libdl-%{core_version}.so %ifarch alpha %attr(755,root,root) /%{_lib}/libdl.so.2.1 %else %attr(755,root,root) /%{_lib}/libdl.so.2 %endif -%attr(755,root,root) /%{_lib}/libm-%{version}.so +%attr(755,root,root) /%{_lib}/libm-%{core_version}.so %ifarch alpha ia64 %attr(755,root,root) /%{_lib}/libm.so.6.1 %else %attr(755,root,root) /%{_lib}/libm.so.6 %endif -%attr(755,root,root) /%{_lib}/libnsl-%{version}.so +%attr(755,root,root) /%{_lib}/libnsl-%{core_version}.so %ifarch alpha %attr(755,root,root) /%{_lib}/libnsl.so.1.1 %else %attr(755,root,root) /%{_lib}/libnsl.so.1 %endif -%attr(755,root,root) /%{_lib}/libpthread-%{version}.so +%attr(755,root,root) /%{_lib}/libpthread-%{core_version}.so %attr(755,root,root) /%{_lib}/libpthread.so.0 -%attr(755,root,root) /%{_lib}/libresolv-%{version}.so +%attr(755,root,root) /%{_lib}/libresolv-%{core_version}.so %ifarch alpha %attr(755,root,root) /%{_lib}/libresolv.so.2.1 %else %attr(755,root,root) /%{_lib}/libresolv.so.2 %endif -%attr(755,root,root) /%{_lib}/librt-%{version}.so +%attr(755,root,root) /%{_lib}/librt-%{core_version}.so %attr(755,root,root) /%{_lib}/librt.so.1 %attr(755,root,root) /%{_lib}/libthread_db-1.0.so %attr(755,root,root) /%{_lib}/libthread_db.so.1 -%attr(755,root,root) /%{_lib}/libutil-%{version}.so +%attr(755,root,root) /%{_lib}/libutil-%{core_version}.so %ifarch alpha %attr(755,root,root) /%{_lib}/libutil.so.1.1 %else @@ -1361,14 +1436,21 @@ fi %endif %{?with_localedb:%dir %{_libdir}/locale} +#%files -n nss_db +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/makedb +%attr(755,root,root) /%{_lib}/libnss_db-%{core_version}.so +%attr(755,root,root) /%{_lib}/libnss_db.so.2 +%{_var}/db/Makefile + #%files -n nss_dns %defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libnss_dns-%{version}.so +%attr(755,root,root) /%{_lib}/libnss_dns-%{core_version}.so %attr(755,root,root) /%{_lib}/libnss_dns.so.2 #%files -n nss_files %defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libnss_files-%{version}.so +%attr(755,root,root) /%{_lib}/libnss_files-%{core_version}.so %attr(755,root,root) /%{_lib}/libnss_files.so.2 %defattr(644,root,root,755) @@ -1388,15 +1470,14 @@ fi %endif %attr(755,root,root) %{_bindir}/locale %attr(755,root,root) %{_bindir}/rpcgen -%attr(755,root,root) %{_bindir}/sotruss %attr(755,root,root) %{_sbindir}/zdump %attr(755,root,root) %{_sbindir}/zic %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* @@ -1406,7 +1487,17 @@ fi %{_mandir}/man5/locale.5* %{_mandir}/man5/nsswitch.conf.5* %{_mandir}/man5/tzfile.5* -%{_mandir}/man7/* +%{_mandir}/man7/ascii.7* +%{_mandir}/man7/charsets.7* +%{_mandir}/man7/iso-8859-*.7* +%{_mandir}/man7/iso_8859-*.7* +%{_mandir}/man7/iso_8859_*.7* +%{_mandir}/man7/koi8-r.7* +%{_mandir}/man7/latin*.7* +%{_mandir}/man7/locale.7* +%{_mandir}/man7/unicode.7* +%{_mandir}/man7/utf-8.7* +%{_mandir}/man7/utf8.7* %{_mandir}/man8/ld-linux.8* %{_mandir}/man8/ld-linux.so.8* %{_mandir}/man8/ld.so.8* @@ -1492,6 +1583,11 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/catchsegv %attr(755,root,root) %{_bindir}/ldd +%attr(755,root,root) %{_bindir}/pldd +%attr(755,root,root) %{_bindir}/sotruss +%dir %{_libdir}/audit +%attr(755,root,root) %{_libdir}/audit/sotruss-lib.so + %{_mandir}/man1/catchsegv.1* %{_mandir}/man1/ldd.1* %lang(es) %{_mandir}/es/man1/ldd.1* @@ -1507,7 +1603,7 @@ fi %files libcrypt %defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libcrypt-%{version}.so +%attr(755,root,root) /%{_lib}/libcrypt-%{core_version}.so %ifarch alpha %attr(755,root,root) %ghost /%{_lib}/libcrypt.so.1.1 %else @@ -1533,22 +1629,22 @@ fi %files -n nss_compat %defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libnss_compat-%{version}.so +%attr(755,root,root) /%{_lib}/libnss_compat-%{core_version}.so %attr(755,root,root) /%{_lib}/libnss_compat.so.2 %files -n nss_hesiod %defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/libnss_hesiod-%{version}.so +%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-%{version}.so +%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-%{version}.so +%attr(755,root,root) /%{_lib}/libnss_nisplus-%{core_version}.so %attr(755,root,root) /%{_lib}/libnss_nisplus.so.2 %if %{with memusage} @@ -1630,7 +1726,7 @@ fi %files devel-doc %defattr(644,root,root,755) -%doc documentation/* NOTES PROJECTS +%doc documentation/* PROJECTS %{_infodir}/libc.info* %{_mandir}/man1/sprof.1* @@ -1657,9 +1753,11 @@ fi %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 +%{systemdtmpfilesdir}/nscd.conf %dir /var/run/nscd %dir /var/lib/nscd %attr(600,root,root) %ghost /var/lib/nscd/passwd