rpm/glibc
SHA256
1
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 635265 from home:Andreas_Schwab:Factory

Browse Source 
- Add libpng-devel and zlib-devel for utils build

- Add glibc-locale-base subpackage containing only C, C.UTF-8 and
  en_US.UTF-8 locales (fate#326551)

OBS-URL: https://build.opensuse.org/request/show/635265
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=510
This commit is contained in:
Andreas Schwab 2018-09-12 07:22:12 +00:00 committed by Git OBS Bridge
parent c2c4c80482
commit 8fdb38368b
3 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
baselibs.conf
View File

@ -8,10 +8,11 @@ glibc
prereq -glibc-x86
+/usr/lib/getconf/[^g]
+/usr/sbin/iconvconfig -> /usr/sbin/iconvconfig-<extension>
glibc-locale
glibc-locale-base
arch i586 block!
+/usr/lib(64)?/gconv/gconv-modules
targettype x86 -/usr/lib(64)?/gconv/gconv-modules
obsoletes "glibc-locale-<targettype>"
glibc-devel
requires "glibc-<targettype> = %version"
arch i586 block!

11
glibc.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Sep 12 06:47:33 UTC 2018 - schwab@suse.de
- Add libpng-devel and zlib-devel for utils build
-------------------------------------------------------------------
Wed Aug 15 13:53:41 UTC 2018 - schwab@suse.de
- Add glibc-locale-base subpackage containing only C, C.UTF-8 and
en_US.UTF-8 locales (fate#326551)
-------------------------------------------------------------------
Thu Aug 2 07:48:07 UTC 2018 - schwab@suse.de

33
glibc.spec
View File

@ -76,6 +76,8 @@ BuildRequires: python3-pexpect
%endif
%if %{build_utils}
BuildRequires: gd-devel
BuildRequires: libpng-devel
BuildRequires: zlib-devel
%endif
%if "%flavor" == "i686"
ExclusiveArch: i586 i686
@ -347,12 +349,22 @@ use the internationalization features of the GNU libc. It is normally
not necessary to install this packages, the data files are already
created.
%package locale
%package locale-base
Summary: Locale Data for Localized Programs
License: GPL-2.0-or-later AND MIT AND LGPL-2.1-or-later
Group: System/Libraries
Requires(post): /bin/cat
Requires: glibc = %{version}
%description locale-base
Locale data for the internationalisation features of the GNU C library.
This package contains only the US-english locales.
%package locale
Summary: Locale Data for Localized Programs
License: GPL-2.0-or-later AND MIT AND LGPL-2.1-or-later
Group: System/Libraries
Requires: glibc-locale-base = %{version}
# bug437293
%ifarch ppc64
Obsoletes: glibc-locale-64bit
@ -839,7 +851,10 @@ cc-base/elf/ldconfig -vn $destdir
# non-parallel build for install-locales: 9:34mins
# parallel build with fdupes: 7:08mins
make %{?_smp_mflags} install_root=%{buildroot} localedata/install-locales
# Avoid hardlinks across subpackages
mv %{buildroot}/usr/lib/locale/{en_US,C}.utf8 .
%fdupes %{buildroot}/usr/lib/locale
mv {en_US,C}.utf8 %{buildroot}/usr/lib/locale/
cd ..
%endif
# Create file list for glibc-locale package
@ -992,7 +1007,7 @@ rm %{buildroot}/%{_lib}/lp64d %{buildroot}%{_libdir}/lp64d
%post -p %{_sbindir}/glibc_post_upgrade
%postun -p /sbin/ldconfig
%post locale
%post locale-base
for l in /usr/share/locale/locale.alias %{_libdir}/gconv/gconv-modules; do
[ -d "$l.d" ] || continue
echo "###X# The following is autogenerated from extra files in the .d directory:" >>"$l"
@ -1173,14 +1188,24 @@ exit 0
%{_sbindir}/glibc_post_upgrade
%{_sbindir}/iconvconfig
%files locale -f libc.lang
%files locale-base -f libc.lang
%defattr(-,root,root)
%{_datadir}/locale/locale.alias
%if %{build_locales}
/usr/lib/locale
%dir %{_prefix}/lib/locale
%{_prefix}/lib/locale/C.utf8
%{_prefix}/lib/locale/en_US.utf8
%endif
%{_libdir}/gconv
%files locale
%defattr(-,root,root)
%if %{build_locales}
%{_prefix}/lib/locale
%exclude %{_prefix}/lib/locale/C.utf8
%exclude %{_prefix}/lib/locale/en_US.utf8
%endif
%files devel
%defattr(-,root,root)
%license COPYING COPYING.LIB