X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=f559d840939c50ae22e20dabcece8a64a9c127e6;hb=6fbd27f18464cc8a3093ed16264a488bf6217df8;hp=89576e5e8b6d4161202fb18fd4b7df9bc734f21a;hpb=75051ff3acbc8cd899ef512d3fbc855d87d950fb;p=packages%2Fglibc.git

diff --git a/glibc.spec b/glibc.spec
index 89576e5..f559d84 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -45,7 +45,7 @@ Summary(tr.UTF-8):	GNU libc
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	%{core_version}
-Release:	0.1
+Release:	1
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
@@ -71,8 +71,6 @@ Patch4:		%{name}-no-bash-nls.patch
 
 Patch6:		%{name}-paths.patch
 
-Patch8:		%{name}-missing-nls.patch
-Patch9:		%{name}-nss_include_dirs.patch
 Patch10:	%{name}-info.patch
 Patch11:	%{name}-autoconf.patch
 
@@ -99,7 +97,7 @@ BuildRequires:	automake
 BuildRequires:	binutils >= 2:2.29
 BuildRequires:	bison >= 2.7
 %{!?with_cross:BuildRequires:	dietlibc-static}
-BuildRequires:	gawk
+BuildRequires:	gawk >= 3.1.2
 %if %{with cet}
 BuildRequires:	gcc >= 6:8.0
 %else
@@ -109,6 +107,7 @@ BuildRequires:	gcc >= 6:6.2
 BuildRequires:	gettext-tools >= 0.10.36
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
 BuildRequires:	linux-libc-headers >= %{llh_version}
+BuildRequires:	make >= 1:4.0
 %{?with_nss_crypt:BuildRequires:	nss-devel >= 1:3.15.1-2}
 BuildRequires:	perl-base
 BuildRequires:	python3 >= 1:3.4
@@ -116,7 +115,7 @@ BuildRequires:	python3-modules >= 1:3.4
 BuildRequires:	rpm-build >= 4.3-0.20030610.28
 BuildRequires:	rpmbuild(macros) >= 1.567
 BuildRequires:	sed >= 4.0.5
-BuildRequires:	texinfo
+BuildRequires:	texinfo >= 4.7
 Requires:	%{name}-ld = %{epoch}:%{version}-%{release}
 Requires:	filesystem
 Requires:	uname(release) >= %{min_kernel}
@@ -953,9 +952,6 @@ exit 1
 
 %patch6 -p1
 
-%patch8 -p1
-%patch9 -p1
-
 %patch10 -p1
 %patch11 -p1
 
@@ -1021,6 +1017,15 @@ AWK="gawk" \
 	--with-selinux%{!?with_selinux:=no} \
 	--with-tls
 
+# hack: libgd (used by memusagestat) requires librt, which is built after malloc/ subdir.
+# First build all without libgd-dependent components (LIBGD=no)...
+%{__make} \
+	AWK="gawk" \
+	complocaledir=%{_prefix}/lib/locale \
+	sLIBdir=%{_libdir} \
+	LIBGD=no
+
+# ...then, when librt is ready, rerun make to build memusagestat
 %{__make} \
 	AWK="gawk" \
 	complocaledir=%{_prefix}/lib/locale \
@@ -1878,9 +1883,6 @@ fi
 %{_libdir}/libc.so
 %{_libdir}/libpthread.so
 # static-only libs
-%ifarch %{x8664} x32
-%{_libdir}/libmvec_nonshared.a
-%endif
 %{_libdir}/libc_nonshared.a
 %{_libdir}/libg.a
 %ifarch alpha ppc sparc