Partial 2.34 update.

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index e143a4c514ab27466de4f8c0c5fb8970d0ab918c..3b209b2d6011c13b79f3bbaa6dc8d622bccfdfed 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -36,7 +36,7 @@
 %undefine              with_static_pie
 %endif
 
-%define                core_version    2.33
+%define                core_version    2.34
 %define                llh_version     7:2.6.32.1-1
 
 Summary:       GNU libc
@@ -50,12 +50,12 @@ Summary(tr.UTF-8):  GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       2
+Release:       0.1
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       https://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: 390bbd889c7e8e8a7041564cb6b27cca
+# Source0-md5: 31998b53fb39cb946e96abc310af1c89
 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
@@ -66,8 +66,8 @@ Source6:      %{name}-localedb-gen
 Source7:       %{name}-LD-path.c
 Source9:       nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
-Patch0:                glibc-git.patch
-# Patch0-md5:  74fe5d1f0d652a5c4d46e4c52edd8694
+#Patch0:               glibc-git.patch
+# Patch0-md5:  d41d8cd98f00b204e9800998ecf8427e
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch
@@ -125,6 +125,7 @@ BuildRequires:      texinfo >= 4.7
 BuildRequires: xz
 Requires(post):        ldconfig = %{epoch}:%{version}-%{release}
 Requires:      filesystem
+Requires:      ldconfig = %{epoch}:%{version}-%{release}
 Requires:      uname(release) >= %{min_kernel}
 Provides:      %{name}(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 %ifarch %{ix86}
@@ -155,7 +156,7 @@ Conflicts:  rc-scripts < 0.3.1-13
 Conflicts:     rpm < 4.1
 Conflicts:     util-linux < 2.35.1-2
 Conflicts:     xorg-driver-video-nvidia-libs < 1:295.33
-ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64 armv5tel armv6hl aarch64
+ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64 armv5tel armv6hl armv7hl armv7hnl aarch64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # avoid -s here (ld.so must not be stripped to allow any program debugging)
@@ -356,8 +357,7 @@ Provides:   rtld(GNU_HASH)
 # 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
+Conflicts:     glibc-ld < 6:2.33-2
 
 %description -n ldconfig
 ldconfig scans a running system and sets up the symbolic links that
@@ -676,7 +676,7 @@ 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
 Conflicts:     man-pages < 4.09
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description devel-doc
 The glibc-devel-doc package contains info and manual pages necessary
@@ -948,7 +948,7 @@ exit 1
 #%patch0 -p1
 
 %patch2 -p1
-%patch3 -p0
+%patch3 -p1
 %{!?with_bash_nls:%patch4 -p1}
 
 %patch6 -p1
@@ -1089,11 +1089,11 @@ install -p glibc-postinst                               $RPM_BUILD_ROOT/sbin
 mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so  $RPM_BUILD_ROOT%{_libdir}
 
 # make symlinks across top-level directories absolute
-for l in BrokenLocale anl %{?with_crypt:crypt} dl \
+for l in BrokenLocale anl %{?with_crypt:crypt} \
 %ifarch %{x8664} x32
        mvec \
 %endif
-       resolv rt thread_db util; do
+       ; do
        test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1
        %{__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
@@ -1435,7 +1435,7 @@ fi
 %attr(755,root,root) /lib/ld-linux-aarch64.so.1
 %attr(755,root,root) /%{_lib}/ld-linux-aarch64.so.1
 %endif
-%ifarch armv6hl
+%ifarch armv6hl armv7hl armv7hnl
 %attr(755,root,root) /lib/ld-linux-armhf.so.3
 %endif
 %ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} x32 ppc64 s390x %{arm} aarch64
@@ -1883,7 +1883,7 @@ fi
 %ifarch alpha ppc sparc
 %{_libdir}/libnldbl_nonshared.a
 %endif
-%ifarch %{ix86} %{x8664} x32 ppc ppc64 s390 s390x sparc sparcv9 sparc64 aarch64 armv6hl
+%ifarch %{ix86} %{x8664} x32 ppc ppc64 s390 s390x sparc sparcv9 sparc64 aarch64 armv6hl armv7hl armv7hnl
 # ABI-dependent headers
 %{_includedir}/gnu/stubs-*.h
 %endif
@@ -1936,6 +1936,7 @@ fi
 %doc documentation/*
 %{_infodir}/libc.info*
 
+%{_mandir}/man2/getcwd.2*
 %{_mandir}/man3/*
 %{_mandir}/man7/aio.7*
 %{_mandir}/man7/attributes.7*
@@ -1948,9 +1949,11 @@ fi
 %{_mandir}/man7/nptl.7*
 %{_mandir}/man7/posixoptions.7*
 %{_mandir}/man7/pthreads.7*
+%{_mandir}/man7/queue.7*
 %{_mandir}/man7/rtld-audit.7*
 %{_mandir}/man7/sem_overview.7*
 %{_mandir}/man7/shm_overview.7*
+%{_mandir}/man7/system_data_types.7*
 %lang(cs) %{_mandir}/cs/man3/*
 %lang(de) %{_mandir}/de/man3/*
 %lang(es) %{_mandir}/es/man3/*
@@ -1971,6 +1974,7 @@ fi
 %lang(hu) %{_mandir}/hu/man3/*
 %lang(it) %{_mandir}/it/man3/*
 %lang(it) %{_mandir}/it/man7/glob.7*
+%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*