From 3715880bfc3b523e8733dd37eb05fd03072774852ee3c48d30c596e92cb46ebd Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 20 Apr 2020 14:05:31 +0000 Subject: [PATCH 1/2] Accepting request 795854 from home:Andreas_Schwab:Factory - Split off %lang_package OBS-URL: https://build.opensuse.org/request/show/795854 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=556 --- glibc.changes | 5 +++++ glibc.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/glibc.changes b/glibc.changes index fbb08f8..e4fd004 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 20 12:43:19 UTC 2020 - Andreas Schwab + +- Split off %lang_package + ------------------------------------------------------------------- Thu Mar 12 10:21:15 UTC 2020 - Andreas Schwab diff --git a/glibc.spec b/glibc.spec index 14c0e89..7bbfa2f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -446,6 +446,8 @@ The glibc-extra package contains some extra binaries for glibc that are not essential but recommend to use. makedb: A program to create a database for nss + +%lang_package %endif # main %prep @@ -819,7 +821,7 @@ cc-base/elf/ldconfig -vn $destdir mv {en_US,C}.utf8 %{buildroot}/usr/lib/locale/ cd .. %endif -# Create file list for glibc-locale package +# Create file list for glibc-lang package %{find_lang} libc # Miscelanna: @@ -1225,7 +1227,7 @@ exit 0 %{_libdir}/gconv/gconv-modules %attr(0644,root,root) %verify(not md5 size mtime) %ghost %{_libdir}/gconv/gconv-modules.cache -%files locale -f libc.lang +%files locale %defattr(-,root,root) %if %{build_locales} %{_prefix}/lib/locale @@ -1330,6 +1332,8 @@ exit 0 /var/lib/misc/Makefile %endif # !i686 +%files lang -f libc.lang + %endif # main %if %{build_utils} From da64db43be164e25b5426618a3014ec99adc1fbde6c8ddafdd9b023ccfe19e45 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 23 Apr 2020 10:06:33 +0000 Subject: [PATCH 2/2] Accepting request 796476 from home:Andreas_Schwab:Factory - Split off %lang_package OBS-URL: https://build.opensuse.org/request/show/796476 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=557 --- glibc.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/glibc.spec b/glibc.spec index 7bbfa2f..361f040 100644 --- a/glibc.spec +++ b/glibc.spec @@ -821,8 +821,14 @@ cc-base/elf/ldconfig -vn $destdir mv {en_US,C}.utf8 %{buildroot}/usr/lib/locale/ cd .. %endif + +%ifnarch i686 # Create file list for glibc-lang package %{find_lang} libc +%else +# The translations are shared with the base flavour +rm -rf %{buildroot}%{_datadir}/locale/*/ +%endif # Miscelanna: @@ -1330,9 +1336,9 @@ exit 0 %{_bindir}/makedb %{_prefix}/share/misc/Makefile.makedb /var/lib/misc/Makefile -%endif # !i686 %files lang -f libc.lang +%endif # !i686 %endif # main