More work on locales build

This commit is contained in:
Andrey Bondrov 2016-09-01 22:20:35 +10:00
parent 3c6b207914
commit 66c6138197

View file

@ -57,7 +57,7 @@ Summary: The GNU libc libraries
Name: glibc Name: glibc
Epoch: 6 Epoch: 6
Version: 2.24 Version: 2.24
Release: 2 Release: 1
License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
Group: System/Libraries Group: System/Libraries
Url: http://www.eglibc.org/ Url: http://www.eglibc.org/
@ -245,8 +245,10 @@ Provides: should-restart = system
# Determine minimum kernel versions (rhbz#619538) # Determine minimum kernel versions (rhbz#619538)
%define enablekernel 2.6.32 %define enablekernel 2.6.32
Conflicts: kernel < %{enablekernel} Conflicts: kernel < %{enablekernel}
%if %{with locales}
Conflicts: locales < %{EVRD} Conflicts: locales < %{EVRD}
Conflicts: locales > %{EVRD} Conflicts: locales > %{EVRD}
%endif
# Don't try to explicitly provide GLIBC_PRIVATE versioned libraries # Don't try to explicitly provide GLIBC_PRIVATE versioned libraries
%define _filter_GLIBC_PRIVATE 1 %define _filter_GLIBC_PRIVATE 1
@ -1301,7 +1303,10 @@ rm -f %{buildroot}%{_infodir}/dir
%if %{with locales} %if %{with locales}
export PATH=%{buildroot}%{_bindir}:%{buildroot}%{_sbindir}:$PATH export PATH=%{buildroot}%{_bindir}:%{buildroot}%{_sbindir}:$PATH
%global glibcver %(rpm -q --qf "%%{VERSION}" glibc)
%if "%{shrink:%{python:rpm.evrCompare(rpm.expandMacro("%{ver}"),rpm.expandMacro("%{glibcver}"))}}" == "0"
export LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir}:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir}:$LD_LIBRARY_PATH
%endif
export I18NPATH=%{buildroot}%{_datadir}/i18n export I18NPATH=%{buildroot}%{_datadir}/i18n
# Needed for/used by locale-archive # Needed for/used by locale-archive