- obsolete; 2.28 uses 64bit time_t for parsing even on 32bit architectures

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index 465a8f7ee9f1993d21f983952cdbef39fc1e7155..0ab4ff8ab4dfded6ac7f828aae7eacffc8a6f49f 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -27,7 +27,7 @@
 %undefine      with_memusage
 %endif
 
-%define                core_version    2.27
+%define                core_version    2.28
 %define                llh_version     7:2.6.32.1-1
 
 Summary:       GNU libc
@@ -46,7 +46,7 @@ Epoch:                6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: 898cd5656519ffbc3a03fe811dd89e82
+# Source0-md5: c81d2388896379997bc359d4f2084239
 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
@@ -64,7 +64,7 @@ Source9:      nscd.tmpfiles
 Patch2:                %{name}-pld.patch
 Patch3:                %{name}-crypt-blowfish.patch
 Patch4:                %{name}-no-bash-nls.patch
-Patch5:                %{name}-sparc-softfp-gcc.patch
+
 Patch6:                %{name}-paths.patch
 
 Patch8:                %{name}-missing-nls.patch
@@ -96,7 +96,7 @@ BuildRequires:        binutils >= 2:2.29
 BuildRequires: bison >= 2.7
 %{!?with_cross:BuildRequires:  dietlibc-static}
 BuildRequires: gawk
-BuildRequires: gcc >= 6:4.7
+BuildRequires: gcc >= 6:8.0
 %{?with_memusage:BuildRequires:        gd-devel >= 2.0.1}
 BuildRequires: gettext-tools >= 0.10.36
 %{?with_selinux:BuildRequires: libselinux-devel >= 1.18}
@@ -123,6 +123,7 @@ Obsoletes:  glibc-debug
 Provides:      glibc64
 Obsoletes:     glibc64
 %endif
+Suggests:      libidn2 >= 2.0.5
 Suggests:      localedb
 Suggests:      tzdata
 Conflicts:     %{name}-misc < %{epoch}:%{version}-%{release}
@@ -175,6 +176,9 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _noautoprov             .*\(GLIBC_PRIVATE\)
 %define                _noautoreq              .*\(GLIBC_PRIVATE\)
 
+# to avoid multi-arch conflicts on getconf/* files
+%define                _libexecdir             %{_libdir}
+
 %description
 Contains the standard libraries that are used by multiple programs on
 the system. In order to save disk space and memory, as well as to ease
@@ -953,7 +957,7 @@ exit 1
 %patch2 -p1
 %patch3 -p0
 %{!?with_bash_nls:%patch4 -p1}
-%patch5 -p1
+
 %patch6 -p1
 
 %patch8 -p1
@@ -965,10 +969,8 @@ exit 1
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
-# ENABLE WHEN "[error] circular dependencies between locale definitions" is fixed
-#%patch17 -p1
-# FIXME
-#%patch18 -p1
+%patch17 -p1
+%patch18 -p1
 %patch19 -p1
 
 %patch23 -p0
@@ -1005,7 +1007,9 @@ PATH=$(pwd)/alt-tools:$PATH; export PATH
 
 AWK="gawk" \
 ../%configure \
-       --enable-add-ons=libidn \
+%ifarch %{x8664} i686 x32
+       --enable-cet \
+%endif
        --enable-bind-now \
        --enable-experimental-malloc \
        --enable-hidden-plt \
@@ -1086,7 +1090,7 @@ 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 cidn crypt dl \
+for l in BrokenLocale anl crypt dl \
 %ifarch %{x8664} x32
        mvec \
 %endif
@@ -1421,8 +1425,6 @@ fi
 %else
 %attr(755,root,root) /%{_lib}/libc.so.6
 %endif
-%attr(755,root,root) /%{_lib}/libcidn-%{core_version}.so
-%attr(755,root,root) /%{_lib}/libcidn.so.1
 %attr(755,root,root) /%{_lib}/libdl-%{core_version}.so
 %ifarch alpha
 %attr(755,root,root) /%{_lib}/libdl.so.2.1
@@ -1820,7 +1822,6 @@ fi
 %attr(755,root,root) %{_libdir}/libBrokenLocale.so
 %attr(755,root,root) %{_libdir}/libanl.so
 %attr(755,root,root) %{_libdir}/libcrypt.so
-%attr(755,root,root) %{_libdir}/libcidn.so
 %attr(755,root,root) %{_libdir}/libdl.so
 %attr(755,root,root) %{_libdir}/libm.so
 %ifarch %{x8664} x32
@@ -1847,7 +1848,6 @@ fi
 %ifarch alpha ppc sparc
 %{_libdir}/libnldbl_nonshared.a
 %endif
-%{_libdir}/libpthread_nonshared.a
 %{_libdir}/librpcsvc.a
 %ifarch %{ix86} %{x8664} x32 ppc ppc64 s390 s390x sparc sparcv9 sparc64
 # ABI-dependent headers