X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=2d3ae66cd9f7bb996aab4b0aafa5214303ffdc19;hb=0cd3962fd86d1260df609b88a3c659dbaea5d859;hp=b75c0d0252380b806923563c7701443e424a7305;hpb=5ca0be9e9b1dd96cf974c0a004eb7621a6f5dc3d;p=packages%2Fglibc.git diff --git a/glibc.spec b/glibc.spec index b75c0d0..2d3ae66 100644 --- a/glibc.spec +++ b/glibc.spec @@ -8,21 +8,27 @@ # - math/{test-fenv,test-tgmath,test-float,test-ifloat}, debug/backtrace-tst(SEGV) fail on alpha # # Conditional build: -# min_kernel (default is 2.6.16) +# min_kernel (default is 2.6.32) %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) +%bcond_with cross # make a cross build, skip native programs +%bcond_without nss_crypt # disable crypt features based on Mozilla NSS library +%bcond_with bash_nls # use bash NLS in shell scripts (ldd, sotruss); restores /bin/bash dep # -%{!?min_kernel:%global min_kernel 2.6.16} +%ifarch x32 +%{!?min_kernel:%global min_kernel 3.4.0} +%else +%{!?min_kernel:%global min_kernel 2.6.32} +%endif %ifarch sparc64 %undefine with_memusage %endif -%define core_version 2.17 -%define llh_version 7:2.6.20.4-1 +%define core_version 2.22 +%define llh_version 7:2.6.32.1-1 Summary: GNU libc Summary(de.UTF-8): GNU libc @@ -35,53 +41,54 @@ Summary(tr.UTF-8): GNU libc Summary(uk.UTF-8): GNU libc версії Name: glibc Version: %{core_version} -Release: 5 +Release: 2 Epoch: 6 License: LGPL v2.1+ Group: Libraries Source0: http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz -# Source0-md5: 87bf675c8ee523ebda4803e8e1cec638 +# Source0-md5: e51e02bf552a0a1fbbdc948fb2f5e83c Source2: nscd.init Source3: nscd.sysconfig Source4: nscd.logrotate -#Source5: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2 -Source5: http://qboosh.pl/man/%{name}-man-pages.tar.bz2 -# Source5-md5: f464eadf3cf06761f65639e44a179e6b +# from man-pages.spec --with tars +Source5: %{name}-man-pages.tar.xz +# Source5-md5: 3a4eabb7d28db7d35d8204fdb471a863 Source6: %{name}-localedb-gen Source7: %{name}-LD-path.c Source8: nscd.upstart Source9: nscd.tmpfiles +# git diff glibc-2.22..release/2.22/master +Patch0: glibc-git.patch # 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 +Patch4: %{name}-no-bash-nls.patch Patch5: %{name}-sparc-softfp-gcc.patch Patch6: %{name}-paths.patch Patch7: 1070_all_glibc-fadvise64_64.patch Patch8: %{name}-missing-nls.patch -Patch9: %{name}-java-libc-wait.patch +Patch9: %{name}-nss_include_dirs.patch Patch10: %{name}-info.patch Patch11: %{name}-autoconf.patch -Patch12: %{name}-format.patch -Patch13: %{name}-git.patch + 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 -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 - +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 +Patch30: glibc-rh1124987.patch Patch38: 1055_all_glibc-resolv-dynamic.patch URL: http://www.gnu.org/software/libc/ @@ -95,19 +102,24 @@ BuildRequires: binutils >= 2:2.15.90.0.3 %endif %{!?with_cross:BuildRequires: dietlibc-static} BuildRequires: gawk -BuildRequires: gcc >= 6:4.3 +BuildRequires: gcc >= 6:4.6 %{?with_memusage:BuildRequires: gd-devel >= 2.0.1} -BuildRequires: gettext-devel >= 0.10.36 +BuildRequires: gettext-tools >= 0.10.36 %{?with_selinux:BuildRequires: libselinux-devel >= 1.18} BuildRequires: linux-libc-headers >= %{llh_version} -BuildRequires: nss-devel >= 1:3.12.3 +%{?with_nss_crypt: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: %{name}(%{_target_cpu}) = %{epoch}:%{version}-%{release} +%ifarch %{ix86} +Provides: %{name}(ix86) = %{epoch}:%{version}-%{release} +%endif Provides: glibc(nptl) Provides: glibc(tls) Provides: rtld(GNU_HASH) @@ -125,12 +137,12 @@ Conflicts: kernel < %{min_kernel} Conflicts: kernel24 Conflicts: kernel24-smp Conflicts: ld.so < 1.9.9-10 -Conflicts: man-pages < 1.43 +Conflicts: man-pages < 4.00 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 +ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 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) @@ -152,9 +164,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %{expand:%%define __cc %{__cc} -m32} %endif -# Architectures supported in glibc-ports -%define ports_arch alpha %{arm} - # Xen-friendly glibc %define specflags_ia32 -mno-tls-direct-seg-refs %define specflags_x86_64 -mno-tls-direct-seg-refs -fasynchronous-unwind-tables @@ -286,6 +295,11 @@ Summary: Utilities and data used by glibc Summary(pl.UTF-8): Narzędzia i dane używane przez glibc Group: Applications/System Requires: %{name} = %{epoch}:%{version}-%{release} +%ifarch %{ix86} +Conflicts: %{name}(x32) +Conflicts: %{name}(x86_64) +%endif +Conflicts: man-pages < 4.00 %description misc Utilities and data used by glibc. @@ -317,6 +331,7 @@ Summary(fr.UTF-8): Crée un cache de bibliothčque partagée et gčre *.so Summary(pl.UTF-8): Tworzenie cache'u bibliotek dynamicznych i ich dowiązań symbolicznych Summary(tr.UTF-8): Ortak kitaplýk önbelleđi yaratýr ve bađlantýlarý kurar Group: Applications/System +Requires: uname(release) >= %{min_kernel} # 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 @@ -354,6 +369,116 @@ düzgün bir ţekilde yüklenmesi için gereken simgesel bađlantýlarý kurar. Ayrýca ortak kitaplýklarý kullanan programlarýn yüklenmesini hýzlandýran /etc/ld.so.cache dosyasýný yaratýr. +%package -n nss_compat +Summary: Old style NYS NSS glibc module +Summary(es.UTF-8): El antiguo módulo NYS NSS de glibc +Summary(pl.UTF-8): Stary moduł NYS NSS glibc +Group: Base +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description -n nss_compat +Old style NYS NSS glibc module. + +%description -n nss_compat -l es.UTF-8 +El antiguo módulo NYS NSS de glibc + +%description -n nss_compat -l pl.UTF-8 +Stary moduł NYS NSS glibc. + +%package -n nss_dns +Summary: BIND NSS glibc module +Summary(es.UTF-8): Módulo BIND NSS de glibc +Summary(pl.UTF-8): Moduł BIND NSS glibc +Group: Base +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description -n nss_dns +BIND NSS glibc module. + +%description -n nss_dns -l es.UTF-8 +Módulo BIND NSS de glibc. + +%description -n nss_dns -l pl.UTF-8 +Moduł BIND NSS glibc. + +%package -n nss_files +Summary: Traditional files databases NSS glibc module +Summary(es.UTF-8): Módulo de tradicionales bases de datos en ficheros para glibc +Summary(pl.UTF-8): Moduł tradycyjnych plikowych baz danych NSS glibc +Group: Base +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description -n nss_files +Traditional files databases NSS glibc module. + +%description -n nss_files -l es.UTF-8 +Módulo de tradicionales bases de datos en ficheros para glibc. + +%description -n nss_files -l pl.UTF-8 +Moduł tradycyjnych plikowych baz danych NSS glibc. + +%package -n nss_hesiod +Summary: hesiod NSS glibc module +Summary(es.UTF-8): Módulo hesiod NSS de glibc +Summary(pl.UTF-8): Moduł hesiod NSS glibc +Group: Base +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description -n nss_hesiod +glibc NSS (Name Service Switch) module for databases access. + +%description -n nss_hesiod -l es.UTF-8 +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 +Group: Development/Tools +Requires: %{name} = %{epoch}:%{version}-%{release} +Conflicts: man-pages < 4.00 + +%description memusage +Memory usage profiler. + +%description memusage -l pl.UTF-8 +Narzędzie do profilowania zużycia pamięci. + %package devel Summary: Additional libraries required to compile Summary(de.UTF-8): Weitere Libraries zum Kompilieren @@ -367,12 +492,8 @@ Summary(uk.UTF-8): Додаткові бібліотеки, потрібні д Group: Development/Libraries Requires: %{name} = %{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 +Requires: %{name}-libcrypt(%{_target_cpu}) = %{epoch}:%{version}-%{release} Provides: %{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release} %ifarch %{ix86} Provides: %{name}-devel(ix86) = %{epoch}:%{version}-%{release} @@ -439,10 +560,7 @@ 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} +%ifarch %{x8664} x32 # If both -m32 and -m64 is to be supported on x86_64, x86_64 package # have to be installed, not ix86 one. Obsoletes: glibc-headers(athlon) @@ -450,9 +568,13 @@ Obsoletes: glibc-headers(i386) Obsoletes: glibc-headers(i486) Obsoletes: glibc-headers(i586) Obsoletes: glibc-headers(i686) +Obsoletes: glibc-headers(ix86) Obsoletes: glibc-headers(pentium3) Obsoletes: glibc-headers(pentium4) %endif +%ifarch x32 +Obsoletes: glibc-headers(x86_64) +%endif %ifarch ppc64 Obsoletes: glibc-headers(ppc) %endif @@ -493,7 +615,7 @@ Provides: %{name}-devel-utils(%{_target_cpu}) = %{epoch}:%{version}-%{release} %ifarch %{ix86} Provides: %{name}-devel-utils(ix86) = %{epoch}:%{version}-%{release} %endif -%ifarch %{x8664} +%ifarch %{x8664} x32 # If both -m32 and -m64 is to be supported on AMD64, x86_64 package # have to be installed, not ix86 one. Obsoletes: glibc-devel-utils(athlon) @@ -501,9 +623,13 @@ Obsoletes: glibc-devel-utils(i386) Obsoletes: glibc-devel-utils(i486) Obsoletes: glibc-devel-utils(i586) Obsoletes: glibc-devel-utils(i686) +Obsoletes: glibc-devel-utils(ix86) Obsoletes: glibc-devel-utils(pentium3) Obsoletes: glibc-devel-utils(pentium4) %endif +%ifarch x32 +Obsoletes: glibc-devel-utils(x86_64) +%endif %ifarch ppc64 Obsoletes: glibc-devel-utils(ppc) %endif @@ -513,6 +639,7 @@ Obsoletes: glibc-devel-utils(s390) %ifarch sparc64 Obsoletes: glibc-devel-utils(sparc) %endif +Conflicts: man-pages < 4.00 %description devel-utils The glibc-devel-utils package contains utilities necessary for @@ -550,9 +677,13 @@ Obsoletes: glibc-devel-doc(i386) Obsoletes: glibc-devel-doc(i486) Obsoletes: glibc-devel-doc(i586) Obsoletes: glibc-devel-doc(i686) +Obsoletes: glibc-devel-doc(ix86) Obsoletes: glibc-devel-doc(pentium3) Obsoletes: glibc-devel-doc(pentium4) %endif +%ifarch x32 +Obsoletes: glibc-devel-doc(x86_64) +%endif %ifarch ppc64 Obsoletes: glibc-devel-doc(ppc) %endif @@ -562,6 +693,7 @@ Obsoletes: glibc-devel-doc(s390) %ifarch sparc64 Obsoletes: glibc-devel-doc(sparc) %endif +Conflicts: man-pages < 4.00 %description devel-doc The glibc-devel-doc package contains info and manual pages necessary @@ -579,140 +711,6 @@ przez prawie wszystkie programy). Ten pakiet należy zainstalować jeśli zamierzamy tworzyć programy korzystające ze standardowych bibliotek C. -%package -n nscd -Summary: Name Service Caching Daemon -Summary(es.UTF-8): Demonio de caché del servicio de nombres -Summary(ja.UTF-8): ネームサービスキャッシングデーモン (nacd) -Summary(pl.UTF-8): Demon zapamiętujący odpowiedzi serwisów nazw -Summary(ru.UTF-8): Кэширующий демон сервисов имен -Summary(uk.UTF-8): Кешуючий демон севісів імен -License: GPL v2 -Group: Networking/Daemons -Requires(post): fileutils -Requires(post,preun): /sbin/chkconfig -Requires(postun): /usr/sbin/groupdel -Requires(postun): /usr/sbin/userdel -Requires(pre): /bin/id -Requires(pre): /usr/bin/getgid -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.4.3.0 -Provides: group(nscd) -Provides: user(nscd) - -%description -n nscd -nscd caches name service lookups; it can dramatically improve -performance with NIS+, and may help with DNS as well. - -%description -n nscd -l es.UTF-8 -nscd guarda las peticiones del servicio de nombres en una caché; eso -puede aumentar drásticamente las prestaciones de NIS+, y también puede -ayudar con DNS. - -%description -n nscd -l ja.UTF-8 -Nscd はネームサービス参照をキャッシュし、NIS+ のパフォーマンスを -ドラマティックに改善することができ、DNS を同様に補助します。 - -%description -n nscd -l pl.UTF-8 -nscd zapamiętuje zapytania i odpowiedzi NIS oraz DNS. Pozwala -drastycznie poprawić szybkość działania NIS+. - -%description -n nscd -l ru.UTF-8 -nscd кэширует результаты запросов к сервисам имен; это может резко -увеличить производительность работы с NIS+ и, также, может помочь с -DNS. - -%description -n nscd -l uk.UTF-8 -nscd кешує результати запросів до сервісів імен; це може сильно -збільшити швидкість роботи з NIS+ і, також, може допомогти з DNS. - -%package -n localedb-src -Summary: locale database source code -Summary(es.UTF-8): Código fuente de la base de datos de los locales -Summary(pl.UTF-8): Kod źródłowy bazy locale -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 -files to use the internationalization features of the GNU libc. - -%description -n localedb-src -l es.UTF-8 -Este paquete adicional contiene los datos necesarios para construir -los ficheros de locale, imprescindibles para usar las cualidades de -internacionalización de GNU libc. - -%description -n localedb-src -l pl.UTF-8 -Pakiet ten zawiera dane niezbędne do zbudowania binarnych plików -lokalizacyjnych, by móc wykorzystać możliwości oferowane przez GNU -libc. - -%package localedb-all -Summary: locale database for all locales supported by glibc -Summary(es.UTF-8): Base de datos de todos los locales soportados por glibc -Summary(pl.UTF-8): Baza danych locale dla wszystkich lokalizacji obsługiwanych przez glibc -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 -glibc. In glibc 2.3.x it's one large file (about 39MB) - if you want -something smaller with support for chosen locales only, consider -installing localedb-src and regenerating database using localedb-gen -script (when database is generated, localedb-src can be uninstalled). - -%description localedb-all -l es.UTF-8 -Este paquete contiene una base de datos de todos los locales -soportados por glibc. En glibc 2.3.x ése es un fichero grande (aprox. -39 MB) -- si prefiere algo más pequeño, sólo con soporte de unos -locales elegidos, considérese instalar localedb-src y regenerar la -base de datos usando el escript localedb-gen (una vez que la base de -datos esté creada, localedb-src se podrá desinstalar). - -%description localedb-all -l pl.UTF-8 -Ten pakiet zawiera bazę danych locale dla wszystkich lokalizacji -obsługiwanych przez glibc. W glibc 2.3.x jest to jeden duży plik -(około 39MB); aby mieć coś mniejszego, z obsługą tylko wybranych -lokalizacji, należy zainstalować pakiet localedb-src i przegenerować -bazę danych przy użyciu skryptu localedb-gen (po wygenerowaniu bazy -pakiet localedb-src można odinstalować). - -%package -n iconv -Summary: Convert encoding of given files from one encoding to another -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 -this package if you want to convert some document from one encoding to -another or if you have installed some programs which use Generic -Character Set Conversion Interface. - -%description -n iconv -l es.UTF-8 -Convierte la codificación de dados ficheros. Necesita este paquete si -quiere convertir un documento entre una codificación (juego de -caracteres) y otra, o si tiene instalado algún programa que usa el -Generic Character Set Conversion Interface (interfaz genérica de -conversión de juegos de caracteres). - -%description -n iconv -l pl.UTF-8 -Moduły do konwersji plików tekstowych z jednego kodowania do innego. -Trzeba mieć zainstalowany ten pakiet, aby wykonywać konwersję -dokumentów z jednego kodowania do innego lub do używania programów -korzystających z Generic Character Set Conversion Interface w glibc, -czyli z zestawu funkcji z tej biblioteki, które umożliwiają konwersję -kodowania danych z poziomu dowolnego programu. - %package static Summary: Static GNU libc libraries Summary(es.UTF-8): Bibliotecas estáticas @@ -818,135 +816,165 @@ złożoną z pojedynczych obiektów współdzielonych. Używana jest do tworzenia biblioteki będącej mniejszym podzestawem standardowej biblioteki współdzielonej libc. -%package -n nss_compat -Summary: Old style NYS NSS glibc module -Summary(es.UTF-8): El antiguo módulo NYS NSS de glibc -Summary(pl.UTF-8): Stary moduł NYS NSS glibc -Group: Base -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description -n nss_compat -Old style NYS NSS glibc module. - -%description -n nss_compat -l es.UTF-8 -El antiguo módulo NYS NSS de glibc - -%description -n nss_compat -l pl.UTF-8 -Stary moduł NYS NSS glibc. - -%package -n nss_dns -Summary: BIND NSS glibc module -Summary(es.UTF-8): Módulo BIND NSS de glibc -Summary(pl.UTF-8): Moduł BIND NSS glibc -Group: Base +%package -n nscd +Summary: Name Service Caching Daemon +Summary(es.UTF-8): Demonio de caché del servicio de nombres +Summary(ja.UTF-8): ネームサービスキャッシングデーモン (nacd) +Summary(pl.UTF-8): Demon zapamiętujący odpowiedzi serwisów nazw +Summary(ru.UTF-8): Кэширующий демон сервисов имен +Summary(uk.UTF-8): Кешуючий демон севісів імен +License: GPL v2 +Group: Networking/Daemons +Requires(post): fileutils +Requires(post,preun): /sbin/chkconfig +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +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.4.3.0 +Provides: group(nscd) +Provides: user(nscd) +Obsoletes: gnscd +Obsoletes: unscd -%description -n nss_dns -BIND NSS glibc module. - -%description -n nss_dns -l es.UTF-8 -Módulo BIND NSS de glibc. +%description -n nscd +nscd caches name service lookups; it can dramatically improve +performance with NIS+, and may help with DNS as well. -%description -n nss_dns -l pl.UTF-8 -Moduł BIND NSS glibc. +%description -n nscd -l es.UTF-8 +nscd guarda las peticiones del servicio de nombres en una caché; eso +puede aumentar drásticamente las prestaciones de NIS+, y también puede +ayudar con DNS. -%package -n nss_files -Summary: Traditional files databases NSS glibc module -Summary(es.UTF-8): Módulo de tradicionales bases de datos en ficheros para glibc -Summary(pl.UTF-8): Moduł tradycyjnych plikowych baz danych NSS glibc -Group: Base -Requires: %{name} = %{epoch}:%{version}-%{release} +%description -n nscd -l ja.UTF-8 +Nscd はネームサービス参照をキャッシュし、NIS+ のパフォーマンスを +ドラマティックに改善することができ、DNS を同様に補助します。 -%description -n nss_files -Traditional files databases NSS glibc module. +%description -n nscd -l pl.UTF-8 +nscd zapamiętuje zapytania i odpowiedzi NIS oraz DNS. Pozwala +drastycznie poprawić szybkość działania NIS+. -%description -n nss_files -l es.UTF-8 -Módulo de tradicionales bases de datos en ficheros para glibc. +%description -n nscd -l ru.UTF-8 +nscd кэширует результаты запросов к сервисам имен; это может резко +увеличить производительность работы с NIS+ и, также, может помочь с +DNS. -%description -n nss_files -l pl.UTF-8 -Moduł tradycyjnych plikowych baz danych NSS glibc. +%description -n nscd -l uk.UTF-8 +nscd кешує результати запросів до сервісів імен; це може сильно +збільшити швидкість роботи з NIS+ і, також, може допомогти з DNS. -%package -n nss_hesiod -Summary: hesiod NSS glibc module -Summary(es.UTF-8): Módulo hesiod NSS de glibc -Summary(pl.UTF-8): Moduł hesiod NSS glibc -Group: Base +%package -n localedb-src +Summary: locale database source code +Summary(es.UTF-8): Código fuente de la base de datos de los locales +Summary(pl.UTF-8): Kod źródłowy bazy locale +Group: Libraries Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: gzip +Requires: sed +Provides: localedb -%description -n nss_hesiod -glibc NSS (Name Service Switch) module for databases access. +%description -n localedb-src +This add-on package contains the data needed to build the locale data +files to use the internationalization features of the GNU libc. -%description -n nss_hesiod -l es.UTF-8 -Módulo hesiod NSS de glibc. +%description -n localedb-src -l es.UTF-8 +Este paquete adicional contiene los datos necesarios para construir +los ficheros de locale, imprescindibles para usar las cualidades de +internacionalización de GNU libc. -%description -n nss_hesiod -l pl.UTF-8 -Moduł glibc NSS (Name Service Switch) dostępu do baz danych. +%description -n localedb-src -l pl.UTF-8 +Pakiet ten zawiera dane niezbędne do zbudowania binarnych plików +lokalizacyjnych, by móc wykorzystać możliwości oferowane przez GNU +libc. -%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 +%package localedb-all +Summary: locale database for all locales supported by glibc +Summary(es.UTF-8): Base de datos de todos los locales soportados por glibc +Summary(pl.UTF-8): Baza danych locale dla wszystkich lokalizacji obsługiwanych przez glibc +Group: Libraries Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: iconv = %{epoch}:%{version}-%{release} +Provides: localedb -%description -n nss_nis -glibc NSS (Name Service Switch) module for NIS(YP) databases access. +%description localedb-all +This package contains locale database for all locales supported by +glibc. In glibc 2.3.x it's one large file (about 39MB) - if you want +something smaller with support for chosen locales only, consider +installing localedb-src and regenerating database using localedb-gen +script (when database is generated, localedb-src can be uninstalled). -%description -n nss_nis -l es.UTF-8 -Módulo NSS de glibc para acceder las bases de datos NIS(YP). +%description localedb-all -l es.UTF-8 +Este paquete contiene una base de datos de todos los locales +soportados por glibc. En glibc 2.3.x ése es un fichero grande (aprox. +39 MB) -- si prefiere algo más pequeño, sólo con soporte de unos +locales elegidos, considérese instalar localedb-src y regenerar la +base de datos usando el escript localedb-gen (una vez que la base de +datos esté creada, localedb-src se podrá desinstalar). -%description -n nss_nis -l pl.UTF-8 -Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS(YP). +%description localedb-all -l pl.UTF-8 +Ten pakiet zawiera bazę danych locale dla wszystkich lokalizacji +obsługiwanych przez glibc. W glibc 2.3.x jest to jeden duży plik +(około 39MB); aby mieć coś mniejszego, z obsługą tylko wybranych +lokalizacji, należy zainstalować pakiet localedb-src i przegenerować +bazę danych przy użyciu skryptu localedb-gen (po wygenerowaniu bazy +pakiet localedb-src można odinstalować). -%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 +%package -n iconv +Summary: Convert encoding of given files from one encoding to another +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}) +Conflicts: man-pages < 4.00 -%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 -Group: Development/Tools -Requires: %{name} = %{epoch}:%{version}-%{release} +%description -n iconv +Convert encoding of given files from one encoding to another. You need +this package if you want to convert some document from one encoding to +another or if you have installed some programs which use Generic +Character Set Conversion Interface. -%description memusage -Memory usage profiler. +%description -n iconv -l es.UTF-8 +Convierte la codificación de dados ficheros. Necesita este paquete si +quiere convertir un documento entre una codificación (juego de +caracteres) y otra, o si tiene instalado algún programa que usa el +Generic Character Set Conversion Interface (interfaz genérica de +conversión de juegos de caracteres). -%description memusage -l pl.UTF-8 -Narzędzie do profilowania zużycia pamięci. +%description -n iconv -l pl.UTF-8 +Moduły do konwersji plików tekstowych z jednego kodowania do innego. +Trzeba mieć zainstalowany ten pakiet, aby wykonywać konwersję +dokumentów z jednego kodowania do innego lub do używania programów +korzystających z Generic Character Set Conversion Interface w glibc, +czyli z zestawu funkcji z tej biblioteki, które umożliwiają konwersję +kodowania danych z poziomu dowolnego programu. %prep %setup -q -%if "%{min_kernel}" < "2.6.16" -echo "Minimal supported kernel is 2.6.16" >&2 +%if "%{min_kernel}" < "2.6.32" +echo "Minimal supported kernel is 2.6.32" >&2 exit 1 %endif +%patch0 -p1 + %patch2 -p1 %patch3 -p0 -%patch4 -p1 +%{!?with_bash_nls:%patch4 -p1} %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 +%patch9 -p0 + %patch10 -p1 %patch11 -p1 -%patch12 -p1 -%patch13 -p1 + %patch14 -p0 %patch15 -p1 %patch16 -p1 @@ -954,17 +982,14 @@ exit 1 %patch18 -p1 %patch19 -p1 %patch20 -p1 -%{?with_cross:%patch21 -p1} %patch22 -p1 %patch23 -p0 %patch25 -p1 -%patch26 -p1 - +%patch27 -p1 +%patch28 -p1 %patch29 -p1 -%patch30 -p0 -%patch31 -p1 -%patch32 -p1 +%patch30 -p1 %patch38 -p1 @@ -973,10 +998,6 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f chmod +x scripts/cpp -# i786 (aka pentium4) hack -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. unset LD_SYMBOLIC_FUNCTIONS || : @@ -992,11 +1013,6 @@ cd builddir CC="%{__cc} -m64 -mcpu=ultrasparc -mvis -fcall-used-g6" %endif -AddOns=nptl,libidn -%ifarch %{ports_arch} -AddOns=$AddOns,ports -%endif - # force ld bfd (instead of gold) install -d alt-tools ln -sf %{_bindir}/ld.bfd alt-tools/ld @@ -1004,45 +1020,31 @@ PATH=$(pwd)/alt-tools:$PATH; export PATH AWK="gawk" \ ../%configure \ - --with-bugurl=http://bugs.pld-linux.org/ \ - --with-binutils=$(pwd)/alt-tools \ + --enable-add-ons=libidn \ + --enable-bind-now \ + --enable-experimental-malloc \ + --enable-hidden-plt \ --enable-kernel="%{min_kernel}" \ - --with-headers=%{_includedir} \ - --with%{!?with_selinux:out}-selinux \ - --with-tls \ + --enable-nss-crypt%{!?with_nss_crypt:=no} \ --enable-obsolete-rpc \ - --enable-add-ons=$AddOns \ -%if "%{pld_release}" != "ti" - --enable-nss-crypt \ -%endif - --enable-experimental-malloc \ + --enable-profile \ --enable-stackguard-randomization \ - --enable-hidden-plt \ - --enable-bind-now \ - --enable-profile + --with-binutils=$(pwd)/alt-tools \ + --with-bugurl=http://bugs.pld-linux.org/ \ + --with-headers=%{_includedir} \ + --with-selinux%{!?with_selinux:=no} \ + --with-tls %{__make} \ AWK="gawk" \ + localedir=%{_prefix}/lib/locale \ sLIBdir=%{_libdir} cd .. %if %{with tests} -cd builddir env LANGUAGE=C LC_ALL=C \ -%{__make} -j1 tests 2>&1 | awk ' -BEGIN { file = "" } -{ - if (($0 ~ /\*\*\* \[.*\.out\] Error/) && ($0 !~ /annexc/) && (file == "")) { - file=$0; - gsub(/.*\[/, NIL, file); - gsub(/\].*/, NIL, file); - } - print $0; -} -END { if (file != "") { print "ERROR OUTPUT FROM " file; system("cat " file); exit(1); } }' -cd .. -done +%{__make} -j1 -C builddir tests %endif %if %{without cross} @@ -1052,21 +1054,25 @@ 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,init} \ - $RPM_BUILD_ROOT{%{_mandir}/man{3,8},/var/log,/var/{lib,run}/nscd} \ - $RPM_BUILD_ROOT{/var/cache/ldconfig,/usr/lib/tmpfiles.d} +install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,default,logrotate.d,init} \ + $RPM_BUILD_ROOT{%{_mandir},/var/log,/var/{lib,run}/nscd} \ + $RPM_BUILD_ROOT{/var/cache/ldconfig,%{systemdtmpfilesdir}} cd builddir env LANGUAGE=C LC_ALL=C \ %{__make} install \ install_root=$RPM_BUILD_ROOT \ + localedir=%{_prefix}/lib/locale \ infodir=%{_infodir} \ mandir=%{_mandir} %if %{with localedb} env LANGUAGE=C LC_ALL=C \ %{__make} localedata/install-locales \ + localedir=%{_prefix}/lib/locale \ install_root=$RPM_BUILD_ROOT +%else +install -d $RPM_BUILD_ROOT%{_prefix}/lib/locale %endif PICFILES="libc_pic.a libc.map @@ -1078,7 +1084,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)/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} @@ -1088,21 +1094,19 @@ install -p glibc-postinst $RPM_BUILD_ROOT/sbin %{?with_memusage:mv -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so $RPM_BUILD_ROOT%{_libdir}} mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so $RPM_BUILD_ROOT%{_libdir} -# moved to tzdata package -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 +for l in BrokenLocale anl cidn crypt dl \ +%ifarch %{x8664} x32 + mvec \ +%endif + 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 + %{__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 done # linking nss modules directly is not supported -rm -f $RPM_BUILD_ROOT%{_libdir}/libnss_*.so +%{__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 @@ -1113,38 +1117,36 @@ 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 -bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} +xz -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} : > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.cache install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d echo 'include ld.so.conf.d/*.conf' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf : > $RPM_BUILD_ROOT/var/cache/ldconfig/aux-cache -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* +%{__rm} $RPM_BUILD_ROOT%{_bindir}/tzselect +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/tzselect.8* +%{__rm} $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 : > $RPM_BUILD_ROOT/var/lib/nscd/hosts -install %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/nscd.conf +cp -p %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/nscd.conf rm -rf documentation install -d documentation -for f in ANNOUNCE ChangeLog DESIGN-{barrier,condvar,rwlock,sem}.txt TODO{,-kernel,-testing}; do +for f in ChangeLog.old DESIGN-{barrier,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 # 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}" @@ -1159,35 +1161,32 @@ done # 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) -# 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) -# hrx (stellarium) -# ilo (kudzu) -# 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) -# swg (sim) -# syr (iso-codes) -# tet (vlc) +# ach (vlc) +# ak (gtkspell3) +# bal (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) +# io (gtk+2, gnome, alacarte) +# jv (gmpc, avant-window-navigator, kdesudo) +# kmr (vlc) +# ku_IQ (mate-menus,mozo) +# man (ccsm; incorrectly named md) +# mus (bluez-gnome) +# nah (mate-system-monitor) +# 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) @@ -1196,27 +1195,34 @@ done # 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 # gez=gez_ET (?) # it=it_IT +# ku=ku_TR # li=li_NL # nds=nds_DE # nl=nl_NL # om=om_ET +# or=or_IN # pa=pa_IN # pt=pt_PT +# quz=quz_PE # ru=ru_RU +# sd=sd_IN # so=so_SO # sr=sr_RS [cyrillic] # sr@latin=sr_RS@latin @@ -1235,50 +1241,45 @@ done # 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 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 \ 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 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 se si sid sl so sq sr sr@Latn szl 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 -sed -e 's,@localedir@,%{_libdir}/locale,' %{SOURCE6} > $RPM_BUILD_ROOT%{_bindir}/localedb-gen -chmod +x $RPM_BUILD_ROOT%{_bindir}/localedb-gen -install localedata/SUPPORTED $RPM_BUILD_ROOT%{_datadir}/i18n +install -p %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/localedb-gen +cp -p localedata/SUPPORTED $RPM_BUILD_ROOT%{_datadir}/i18n # 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 +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 @@ -1287,7 +1288,7 @@ install -d $RPM_BUILD_ROOT%{_mandir}{/,/ru,/es,/fr,/ja}/man2 # 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 +%{__rm} $RPM_BUILD_ROOT%{_mandir}/tr/man3/{encrypt_r,setkey,setkey_r}.3 %clean rm -rf $RPM_BUILD_ROOT @@ -1310,6 +1311,14 @@ if [ "$1" != 1 ]; then %service -q crond restart fi +%ifarch %{x8664} +# when upgrading from glibc < 6:2.19-3 copy locale-archive +# from /usr/lib64/locale to /usr/lib/locale +# but only if the latter doesn't already exist +%triggerpostun -p /sbin/postshell -- %{name} < 6:2.19-3 +-/bin/cp -an %{_libdir}/locale/locale-archive %{_prefix}/lib/locale/locale-archive +%endif + %post libcrypt -p /sbin/ldconfig %postun libcrypt -p /sbin/ldconfig @@ -1324,10 +1333,10 @@ if [ "$SUPPORTED_LOCALES" ]; then localedb-gen || : fi -%post devel -p /sbin/postshell +%post devel-doc -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun devel -p /sbin/postshell +%postun devel-doc -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} %pre -n nscd @@ -1374,10 +1383,13 @@ fi %ifarch %{x8664} %attr(755,root,root) /%{_lib}/ld-linux-x86-64.so.2 %endif +%ifarch x32 +%attr(755,root,root) /%{_lib}/ld-linux-x32.so.2 +%endif %ifarch ppc64 s390x %attr(755,root,root) /%{_lib}/ld64.so.1 %endif -%ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} ppc64 s390x %{arm} +%ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} x32 ppc64 s390x %{arm} %attr(755,root,root) /%{_lib}/ld.so.1 %endif %attr(755,root,root) /%{_lib}/libBrokenLocale-%{core_version}.so @@ -1409,6 +1421,10 @@ fi %else %attr(755,root,root) /%{_lib}/libm.so.6 %endif +%ifarch %{x8664} x32 +%attr(755,root,root) /%{_lib}/libmvec-%{core_version}.so +%attr(755,root,root) /%{_lib}/libmvec.so.1 +%endif %attr(755,root,root) /%{_lib}/libnsl-%{core_version}.so %ifarch alpha %attr(755,root,root) /%{_lib}/libnsl.so.1.1 @@ -1433,7 +1449,7 @@ fi %else %attr(755,root,root) /%{_lib}/libutil.so.1 %endif -%{?with_localedb:%dir %{_libdir}/locale} +%dir %{_prefix}/lib/locale #%files -n nss_db %defattr(644,root,root,755) @@ -1464,9 +1480,6 @@ fi %attr(755,root,root) %{_bindir}/getconf %attr(755,root,root) %{_bindir}/getent %attr(755,root,root) %{_bindir}/iconv -%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) %{_sbindir}/zdump @@ -1475,25 +1488,33 @@ fi %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* %{_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* %{_mandir}/man5/nsswitch.conf.5* +%{_mandir}/man5/repertoiremap.5* +%{_mandir}/man5/rpc.5* %{_mandir}/man5/tzfile.5* +%{_mandir}/man7/armscii-8.7* %{_mandir}/man7/ascii.7* %{_mandir}/man7/charsets.7* +%{_mandir}/man7/cp1251.7* +%{_mandir}/man7/cp1252.7* %{_mandir}/man7/iso-8859-*.7* %{_mandir}/man7/iso_8859-*.7* %{_mandir}/man7/iso_8859_*.7* -%{_mandir}/man7/koi8-r.7* +%{_mandir}/man7/koi8-*.7* %{_mandir}/man7/latin*.7* %{_mandir}/man7/locale.7* +%{_mandir}/man7/tis-620.7* %{_mandir}/man7/unicode.7* %{_mandir}/man7/utf-8.7* %{_mandir}/man7/utf8.7* @@ -1503,13 +1524,36 @@ fi %{_mandir}/man8/sln.8* %{_mandir}/man8/zdump.8* %{_mandir}/man8/zic.8* -%lang(cs) %{_mandir}/cs/man7/* +%lang(cs) %{_mandir}/cs/man7/ascii.7* +%lang(cs) %{_mandir}/cs/man7/locale.7* +%lang(cs) %{_mandir}/cs/man7/unicode.7* +%lang(cs) %{_mandir}/cs/man7/utf-8.7* +%lang(cs) %{_mandir}/cs/man7/utf8.7* +%lang(de) %{_mandir}/de/man5/rpc.5* %lang(de) %{_mandir}/de/man5/tzfile.5* -%lang(de) %{_mandir}/de/man7/* +%lang(de) %{_mandir}/de/man7/ascii.7* +%lang(de) %{_mandir}/de/man7/iso-8859-*.7* +%lang(de) %{_mandir}/de/man7/iso_8859-*.7* +%lang(de) %{_mandir}/de/man7/iso_8859_*.7* +%lang(de) %{_mandir}/de/man7/latin*.7* +%lang(de) %{_mandir}/de/man7/locale.7* +%lang(de) %{_mandir}/de/man7/unicode.7* +%lang(de) %{_mandir}/de/man7/utf-8.7* +%lang(de) %{_mandir}/de/man7/utf8.7* %lang(es) %{_mandir}/es/man5/locale.5* %lang(es) %{_mandir}/es/man5/nsswitch.conf.5* +%lang(es) %{_mandir}/es/man5/rpc.5* %lang(es) %{_mandir}/es/man5/tzfile.5* -%lang(es) %{_mandir}/es/man7/* +%lang(es) %{_mandir}/es/man7/ascii.7* +%lang(es) %{_mandir}/es/man7/charsets.7* +%lang(es) %{_mandir}/es/man7/iso-8859-*.7* +%lang(es) %{_mandir}/es/man7/iso_8859-*.7* +%lang(es) %{_mandir}/es/man7/iso_8859_*.7* +%lang(es) %{_mandir}/es/man7/latin*.7* +%lang(es) %{_mandir}/es/man7/locale.7* +%lang(es) %{_mandir}/es/man7/unicode.7* +%lang(es) %{_mandir}/es/man7/utf-8.7* +%lang(es) %{_mandir}/es/man7/utf8.7* %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* @@ -1517,26 +1561,74 @@ fi %lang(es) %{_mandir}/es/man8/zic.8* %lang(fr) %{_mandir}/fr/man5/locale.5* %lang(fr) %{_mandir}/fr/man5/nsswitch.conf.5* +%lang(fr) %{_mandir}/fr/man5/rpc.5* %lang(fr) %{_mandir}/fr/man5/tzfile.5* -%lang(fr) %{_mandir}/fr/man7/* +%lang(fr) %{_mandir}/fr/man7/ascii.7* +%lang(fr) %{_mandir}/fr/man7/charsets.7* +%lang(fr) %{_mandir}/fr/man7/iso-8859-*.7* +%lang(fr) %{_mandir}/fr/man7/iso_8859-*.7* +%lang(fr) %{_mandir}/fr/man7/iso_8859_*.7* +%lang(fr) %{_mandir}/fr/man7/koi8-r.7* +%lang(fr) %{_mandir}/fr/man7/latin*.7* +%lang(fr) %{_mandir}/fr/man7/locale.7* +%lang(fr) %{_mandir}/fr/man7/unicode.7* +%lang(fr) %{_mandir}/fr/man7/utf-8.7* +%lang(fr) %{_mandir}/fr/man7/utf8.7* %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/zdump.8* %lang(fr) %{_mandir}/fr/man8/zic.8* -%lang(hu) %{_mandir}/hu/man7/* +%lang(hu) %{_mandir}/hu/man7/ascii.7* +%lang(hu) %{_mandir}/hu/man7/iso-8859-*.7* +%lang(hu) %{_mandir}/hu/man7/iso_8859-*.7* +%lang(hu) %{_mandir}/hu/man7/iso_8859_*.7* +%lang(hu) %{_mandir}/hu/man7/latin*.7* +%lang(hu) %{_mandir}/hu/man7/locale.7* +%lang(hu) %{_mandir}/hu/man7/utf-8.7* +%lang(hu) %{_mandir}/hu/man7/utf8.7* %lang(hu) %{_mandir}/hu/man8/ld-linux.8* %lang(hu) %{_mandir}/hu/man8/ld-linux.so.8* %lang(hu) %{_mandir}/hu/man8/ld.so.8* %lang(hu) %{_mandir}/hu/man8/zdump.8* %lang(it) %{_mandir}/it/man5/locale.5* -%lang(it) %{_mandir}/it/man7/* +%lang(it) %{_mandir}/it/man7/ascii.7* +%lang(it) %{_mandir}/it/man7/charsets.7* +%lang(it) %{_mandir}/it/man7/iso-8859-*.7* +%lang(it) %{_mandir}/it/man7/iso_8859-*.7* +%lang(it) %{_mandir}/it/man7/iso_8859_*.7* +%lang(it) %{_mandir}/it/man7/latin*.7* +%lang(it) %{_mandir}/it/man7/locale.7* +%lang(it) %{_mandir}/it/man7/unicode.7* +%lang(it) %{_mandir}/it/man7/utf-8.7* +%lang(it) %{_mandir}/it/man7/utf8.7* %lang(it) %{_mandir}/it/man8/zdump.8* +%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* %lang(ja) %{_mandir}/ja/man5/nsswitch.conf.5* +%lang(ja) %{_mandir}/ja/man5/repertoiremap.5* +%lang(ja) %{_mandir}/ja/man5/rpc.5* %lang(ja) %{_mandir}/ja/man5/tzfile.5* -%lang(ja) %{_mandir}/ja/man7/* +%lang(ja) %{_mandir}/ja/man7/armscii-8.7* +%lang(ja) %{_mandir}/ja/man7/ascii.7* +%lang(ja) %{_mandir}/ja/man7/charsets.7* +%lang(ja) %{_mandir}/ja/man7/cp1251.7* +%lang(ja) %{_mandir}/ja/man7/cp1252.7* +%lang(ja) %{_mandir}/ja/man7/iso-8859-*.7* +%lang(ja) %{_mandir}/ja/man7/iso_8859-*.7* +%lang(ja) %{_mandir}/ja/man7/iso_8859_*.7* +%lang(ja) %{_mandir}/ja/man7/koi8-*.7* +%lang(ja) %{_mandir}/ja/man7/latin*.7* +%lang(ja) %{_mandir}/ja/man7/locale.7* +%lang(ja) %{_mandir}/ja/man7/tis-620.7* +%lang(ja) %{_mandir}/ja/man7/unicode.7* +%lang(ja) %{_mandir}/ja/man7/utf-8.7* +%lang(ja) %{_mandir}/ja/man7/utf8.7* %lang(ja) %{_mandir}/ja/man8/ld-linux.8* %lang(ja) %{_mandir}/ja/man8/ld-linux.so.8* %lang(ja) %{_mandir}/ja/man8/ld.so.8* @@ -1544,18 +1636,44 @@ fi %lang(ja) %{_mandir}/ja/man8/zdump.8* %lang(ja) %{_mandir}/ja/man8/zic.8* %lang(ko) %{_mandir}/ko/man5/nsswitch.conf.5* +%lang(ko) %{_mandir}/ko/man5/rpc.5* %lang(ko) %{_mandir}/ko/man5/tzfile.5* -%lang(ko) %{_mandir}/ko/man7/* +%lang(ko) %{_mandir}/ko/man7/ascii.7* +%lang(ko) %{_mandir}/ko/man7/iso-8859-*.7* +%lang(ko) %{_mandir}/ko/man7/iso_8859-*.7* +%lang(ko) %{_mandir}/ko/man7/iso_8859_*.7* +%lang(ko) %{_mandir}/ko/man7/latin*.7* %lang(ko) %{_mandir}/ko/man8/zdump.8* %lang(pl) %{_mandir}/pl/man5/locale.5* -%lang(pl) %{_mandir}/pl/man7/* +%lang(pl) %{_mandir}/pl/man5/rpc.5* +%lang(pl) %{_mandir}/pl/man7/ascii.7* +%lang(pl) %{_mandir}/pl/man7/iso-8859-*.7* +%lang(pl) %{_mandir}/pl/man7/iso_8859-*.7* +%lang(pl) %{_mandir}/pl/man7/iso_8859_*.7* +%lang(pl) %{_mandir}/pl/man7/koi8-*.7* +%lang(pl) %{_mandir}/pl/man7/latin*.7* +%lang(pl) %{_mandir}/pl/man7/locale.7* +%lang(pl) %{_mandir}/pl/man7/unicode.7* +%lang(pl) %{_mandir}/pl/man7/utf-8.7* +%lang(pl) %{_mandir}/pl/man7/utf8.7* %lang(pl) %{_mandir}/pl/man8/ld-linux.8* %lang(pl) %{_mandir}/pl/man8/ld-linux.so.8* %lang(pl) %{_mandir}/pl/man8/ld.so.8* %lang(pt) %{_mandir}/pt/man5/locale.5* %lang(pt) %{_mandir}/pt/man5/nsswitch.conf.5* +%lang(pt) %{_mandir}/pt/man5/rpc.5* %lang(pt) %{_mandir}/pt/man5/tzfile.5* -%lang(pt) %{_mandir}/pt/man7/* +%lang(pt) %{_mandir}/pt/man7/ascii.7* +%lang(pt) %{_mandir}/pt/man7/charsets.7* +%lang(pt) %{_mandir}/pt/man7/iso-8859-*.7* +%lang(pt) %{_mandir}/pt/man7/iso_8859-*.7* +%lang(pt) %{_mandir}/pt/man7/iso_8859_*.7* +%lang(pt) %{_mandir}/pt/man7/koi8-*.7* +%lang(pt) %{_mandir}/pt/man7/latin*.7* +%lang(pt) %{_mandir}/pt/man7/locale.7* +%lang(pt) %{_mandir}/pt/man7/unicode.7* +%lang(pt) %{_mandir}/pt/man7/utf-8.7* +%lang(pt) %{_mandir}/pt/man7/utf8.7* %lang(pt) %{_mandir}/pt/man8/zdump.8* %lang(pt) %{_mandir}/pt/man8/zic.8* %lang(ru) %{_mandir}/ru/man1/getent.1* @@ -1564,17 +1682,35 @@ fi %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* %lang(ru) %{_mandir}/ru/man5/tzfile.5* -%lang(ru) %{_mandir}/ru/man7/* +%lang(ru) %{_mandir}/ru/man7/ascii.7* +%lang(ru) %{_mandir}/ru/man7/charsets.7* +%lang(ru) %{_mandir}/ru/man7/iso-8859-*.7* +%lang(ru) %{_mandir}/ru/man7/iso_8859-*.7* +%lang(ru) %{_mandir}/ru/man7/iso_8859_*.7* +%lang(ru) %{_mandir}/ru/man7/koi8-*.7* +%lang(ru) %{_mandir}/ru/man7/latin*.7* +%lang(ru) %{_mandir}/ru/man7/locale.7* +%lang(ru) %{_mandir}/ru/man7/unicode.7* +%lang(ru) %{_mandir}/ru/man7/utf-8.7* +%lang(ru) %{_mandir}/ru/man7/utf8.7* %lang(ru) %{_mandir}/ru/man8/ld-linux.so.8* %lang(ru) %{_mandir}/ru/man8/ld.so.8* %lang(ru) %{_mandir}/ru/man8/zdump.8* %lang(ru) %{_mandir}/ru/man8/zic.8* %lang(tr) %{_mandir}/tr/man1/iconv.1* +%lang(uk) %{_mandir}/uk/man5/rpc.5* %lang(zh_CN) %{_mandir}/zh_CN/man1/iconv.1* %lang(zh_CN) %{_mandir}/zh_CN/man5/locale.5* +%lang(zh_CN) %{_mandir}/zh_CN/man5/rpc.5* %lang(zh_CN) %{_mandir}/zh_CN/man5/tzfile.5* -%lang(zh_CN) %{_mandir}/zh_CN/man7/* +%lang(zh_CN) %{_mandir}/zh_CN/man7/ascii.7* +%lang(zh_CN) %{_mandir}/zh_CN/man7/charsets.7* +%lang(zh_CN) %{_mandir}/zh_CN/man7/locale.7* +%lang(zh_CN) %{_mandir}/zh_CN/man7/unicode.7* +%lang(zh_CN) %{_mandir}/zh_CN/man7/utf-8.7* +%lang(zh_CN) %{_mandir}/zh_CN/man7/utf8.7* %lang(zh_CN) %{_mandir}/zh_CN/man8/zdump.8* %lang(zh_CN) %{_mandir}/zh_CN/man8/zic.8* @@ -1583,17 +1719,24 @@ fi %attr(755,root,root) %{_bindir}/catchsegv %attr(755,root,root) %{_bindir}/ldd %attr(755,root,root) %{_bindir}/pldd +%ifarch %{ix86} m68k sparc sparcv9 +%attr(755,root,root) %{_bindir}/lddlibc4 +%endif %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* +%{_mandir}/man1/pldd.1* +%lang(cs) %{_mandir}/cs/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(it) %{_mandir}/it/man1/ldd.1* %lang(ja) %{_mandir}/ja/man1/ldd.1* +%lang(ja) %{_mandir}/ja/man1/pldd.1* %lang(ko) %{_mandir}/ko/man1/ldd.1* %lang(pl) %{_mandir}/pl/man1/ldd.1* %lang(ru) %{_mandir}/ru/man1/ldd.1* @@ -1649,8 +1792,13 @@ fi %if %{with memusage} %files memusage %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/memusage* +%attr(755,root,root) %{_bindir}/memusage +%attr(755,root,root) %{_bindir}/memusagestat %attr(755,root,root) %{_libdir}/libmemusage.so +%{_mandir}/man1/memusage.1* +%{_mandir}/man1/memusagestat.1* +%lang(ja) %{_mandir}/ja/man1/memusage.1* +%lang(ja) %{_mandir}/ja/man1/memusagestat.1* %endif %files devel @@ -1661,6 +1809,9 @@ fi %attr(755,root,root) %{_libdir}/libcidn.so %attr(755,root,root) %{_libdir}/libdl.so %attr(755,root,root) %{_libdir}/libm.so +%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 @@ -1673,8 +1824,6 @@ fi %{_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 @@ -1683,7 +1832,7 @@ fi %endif %{_libdir}/libpthread_nonshared.a %{_libdir}/librpcsvc.a -%ifarch %{ix86} %{x8664} ppc ppc64 s390 s390x sparc sparcv9 sparc64 +%ifarch %{ix86} %{x8664} x32 ppc ppc64 s390 s390x sparc sparcv9 sparc64 # ABI-dependent headers %{_includedir}/gnu/stubs-*.h %endif @@ -1720,8 +1869,12 @@ fi %files devel-utils %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/gencat -%attr(755,root,root) %{_bindir}/*prof* -%attr(755,root,root) %{_bindir}/*trace +%attr(755,root,root) %{_bindir}/mtrace +%attr(755,root,root) %{_bindir}/pcprofiledump +%attr(755,root,root) %{_bindir}/sprof +%attr(755,root,root) %{_bindir}/xtrace +%{_mandir}/man1/mtrace.1* +%lang(ja) %{_mandir}/ja/man1/mtrace.1* %files devel-doc %defattr(644,root,root,755) @@ -1729,23 +1882,94 @@ fi %{_infodir}/libc.info* %{_mandir}/man1/sprof.1* +# just a link to getcwd.3 +%{_mandir}/man2/getcwd.2* %{_mandir}/man3/* +%{_mandir}/man7/aio.7* +%{_mandir}/man7/attributes.7* +%{_mandir}/man7/complex.7* +%{_mandir}/man7/feature_test_macros.7* +%{_mandir}/man7/glibc.7* +%{_mandir}/man7/glob.7* +%{_mandir}/man7/libc.7* +%{_mandir}/man7/math_error.7* +%{_mandir}/man7/nptl.7* +%{_mandir}/man7/posixoptions.7* +%{_mandir}/man7/pthreads.7* +%{_mandir}/man7/rtld-audit.7* +%{_mandir}/man7/sem_overview.7* +%{_mandir}/man7/shm_overview.7* %lang(cs) %{_mandir}/cs/man3/* %lang(de) %{_mandir}/de/man3/* %lang(es) %{_mandir}/es/man3/* +%lang(es) %{_mandir}/es/man7/glob.7* +%lang(fr) %{_mandir}/fr/man2/getcwd.2* %lang(fr) %{_mandir}/fr/man3/* +%lang(fr) %{_mandir}/fr/man7/complex.7* +%lang(fr) %{_mandir}/fr/man7/feature_test_macros.7* +%lang(fr) %{_mandir}/fr/man7/glob.7* +%lang(fr) %{_mandir}/fr/man7/posixoptions.7* +%lang(fr) %{_mandir}/fr/man7/pthreads.7* +%lang(fr) %{_mandir}/fr/man7/sem_overview.7* +%lang(fr) %{_mandir}/fr/man7/shm_overview.7* %lang(hu) %{_mandir}/hu/man3/* %lang(it) %{_mandir}/it/man3/* +%lang(it) %{_mandir}/it/man7/glob.7* +%lang(ja) %{_mandir}/ja/man1/sprof.1* +%lang(ja) %{_mandir}/ja/man2/getcwd.2* %lang(ja) %{_mandir}/ja/man3/* +%lang(ja) %{_mandir}/ja/man7/aio.7* +%lang(ja) %{_mandir}/ja/man7/complex.7* +%lang(ja) %{_mandir}/ja/man7/feature_test_macros.7* +%lang(ja) %{_mandir}/ja/man7/glibc.7* +%lang(ja) %{_mandir}/ja/man7/glob.7* +%lang(ja) %{_mandir}/ja/man7/libc.7* +%lang(ja) %{_mandir}/ja/man7/math_error.7* +%lang(ja) %{_mandir}/ja/man7/posixoptions.7* +%lang(ja) %{_mandir}/ja/man7/pthreads.7* +%lang(ja) %{_mandir}/ja/man7/sem_overview.7* +%lang(ja) %{_mandir}/ja/man7/shm_overview.7* %lang(ko) %{_mandir}/ko/man3/* %lang(nl) %{_mandir}/nl/man3/* %lang(pl) %{_mandir}/pl/man3/* %lang(pt) %{_mandir}/pt/man3/* +%lang(pt) %{_mandir}/pt/man7/glob.7* %lang(ru) %{_mandir}/ru/man1/sprof.1* %lang(ru) %{_mandir}/ru/man3/* +%lang(ru) %{_mandir}/ru/man7/glob.7* %lang(tr) %{_mandir}/tr/man3/* %lang(uk) %{_mandir}/uk/man3/* %lang(zh_CN) %{_mandir}/zh_CN/man3/* +%lang(zh_CN) %{_mandir}/zh_CN/man7/glob.7* + +%files static +%defattr(644,root,root,755) +%{_libdir}/libanl.a +%{_libdir}/libBrokenLocale.a +%{_libdir}/libc.a +%{_libdir}/libcrypt.a +%{_libdir}/libdl.a +%{_libdir}/libm.a +%{_libdir}/libmcheck.a +%ifarch %{x8664} x32 +%{_libdir}/libmvec.a +%endif +%{_libdir}/libnsl.a +%{_libdir}/libpthread.a +%{_libdir}/libresolv.a +%{_libdir}/librt.a +%{_libdir}/libutil.a + +%files profile +%defattr(644,root,root,755) +%{_libdir}/lib*_p.a + +%files pic +%defattr(644,root,root,755) +%{_libdir}/lib*_pic.a +%{_libdir}/lib*.map +%{_libdir}/soinit.o +%{_libdir}/sofini.o %files -n nscd %defattr(644,root,root,755) @@ -1756,7 +1980,7 @@ fi %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 @@ -1788,7 +2012,7 @@ fi %if %{with localedb} %files localedb-all %defattr(644,root,root,755) -%{_libdir}/locale/locale-archive +%{_prefix}/lib/locale/locale-archive %endif %files -n iconv @@ -1798,29 +2022,5 @@ fi %{_libdir}/gconv/gconv-modules %verify(not md5 mtime size) %{_libdir}/gconv/gconv-modules.cache %attr(755,root,root) %{_libdir}/gconv/*.so - -%files static -%defattr(644,root,root,755) -%{_libdir}/libanl.a -%{_libdir}/libBrokenLocale.a -%{_libdir}/libc.a -%{_libdir}/libcrypt.a -%{_libdir}/libdl.a -%{_libdir}/libm.a -%{_libdir}/libmcheck.a -%{_libdir}/libnsl.a -%{_libdir}/libpthread.a -%{_libdir}/libresolv.a -%{_libdir}/librt.a -%{_libdir}/libutil.a - -%files profile -%defattr(644,root,root,755) -%{_libdir}/lib*_p.a - -%files pic -%defattr(644,root,root,755) -%{_libdir}/lib*_pic.a -%{_libdir}/lib*.map -%{_libdir}/soinit.o -%{_libdir}/sofini.o +%{_mandir}/man8/iconvconfig.8* +%lang(ja) %{_mandir}/ja/man8/iconvconfig.8*