- add country_car for wal_ET

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index 77d0cbbcb4fcd1068619c89e99e4ade07fe14364..bf828cad0558860240c1e41ffae4f49056e10ee7 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -21,7 +21,7 @@
 %undefine      with_memusage
 %endif
 
-%define                core_version    2.17
+%define                core_version    2.18
 %define                llh_version     7:2.6.20.4-1
 
 Summary:       GNU libc
@@ -35,12 +35,12 @@ Summary(tr.UTF-8):  GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       6
+Release:       1
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: 87bf675c8ee523ebda4803e8e1cec638
+# Source0-md5: 88fbbceafee809e82efd52efa1e3c58f
 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
@@ -64,7 +64,7 @@ Patch9:               %{name}-java-libc-wait.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
@@ -79,7 +79,7 @@ Patch25:      %{name}-cv_gnu89_inline.patch
 Patch26:       %{name}-posix-sh.patch
 
 Patch29:       %{name}-arm-alignment-fix.patch
-Patch30:       %{name}-bug-12492.patch
+
 Patch31:       %{name}-origin.patch
 Patch32:       %{name}-Os-fail-workaround.patch
 
@@ -100,7 +100,7 @@ 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
@@ -947,7 +947,7 @@ exit 1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
+
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
@@ -963,7 +963,7 @@ exit 1
 %patch26 -p1
 
 %patch29 -p1
-%patch30 -p0
+
 %patch31 -p1
 %patch32 -p1
 
@@ -1079,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)/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}
@@ -1206,6 +1206,7 @@ done
 # eo=common
 # es=es_ES
 # eu=eu_ES
+# fa=fa_IR
 # ff=ff_SN
 # fr=fr_FR
 # fy=fy_NL
@@ -1215,6 +1216,7 @@ done
 # nds=nds_DE
 # nl=nl_NL
 # om=om_ET
+# or=or_IN
 # pa=pa_IN
 # pt=pt_PT
 # ru=ru_RU
@@ -1272,8 +1274,6 @@ install 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