From e188f590cef001a770cf479af53a2ee46ee265a3fdb4f0851592f39b57950939 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Mon, 23 Sep 2019 15:01:10 +0000
Subject: [PATCH] Accepting request 732758 from home:Andreas_Schwab:Factory

- Package gconv-modules.cache as %ghost
- Regenerate it also in the %post of glibc-local-base-<targettype>

OBS-URL: https://build.opensuse.org/request/show/732758
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=541
---
 baselibs.conf |  1 +
 glibc.changes |  6 ++++++
 glibc.spec    | 11 ++++++-----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index 522c24b..5840700 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -13,6 +13,7 @@ glibc-locale-base
   +/usr/lib(64)?/gconv/gconv-modules
   targettype x86 -/usr/lib(64)?/gconv/gconv-modules
   obsoletes "glibc-locale-<targettype>"
+  post "/usr/sbin/iconvconfig-<extension>"
 glibc-devel
   requires "glibc-<targettype> = %version"
   arch i586 block!
diff --git a/glibc.changes b/glibc.changes
index 3e5fa99..27e5317 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 23 14:00:09 UTC 2019 - Andreas Schwab <schwab@suse.de>
+
+- Package gconv-modules.cache as %ghost
+- Regenerate it also in the %post of glibc-local-base-<targettype> 
+
 -------------------------------------------------------------------
 Mon Sep 23 13:01:24 UTC 2019 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/glibc.spec b/glibc.spec
index 1dc7ee5..6ae155e 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -745,10 +745,6 @@ ln -s . %{buildroot}/%{_lib}/lp64d
 # files - specifically valgrind and PurifyPlus.
 export STRIP_KEEP_SYMTAB=*.so*
 
-# Make sure we will create the gconv-modules.cache
-mkdir -p %{buildroot}%{_libdir}/gconv
-touch %{buildroot}%{_libdir}/gconv/gconv-modules.cache
-
 # Install base glibc
 make %{?_smp_mflags} install_root=%{buildroot} install -C cc-base
 
@@ -838,6 +834,8 @@ mkdir -p %{buildroot}%{_includedir}/resolv
 install -m 0644 resolv/mapv4v6addr.h %{buildroot}%{_includedir}/resolv/
 install -m 0644 resolv/mapv4v6hostent.h %{buildroot}%{_includedir}/resolv/
 
+touch %{buildroot}%{_libdir}/gconv/gconv-modules.cache
+
 %if %{build_html}
 mkdir -p %{buildroot}%{_datadir}/doc/glibc
 cp -p cc-base/manual/libc/*.html %{buildroot}%{_datadir}/doc/glibc
@@ -1226,7 +1224,10 @@ exit 0
 %{_prefix}/lib/locale/C.utf8
 %{_prefix}/lib/locale/en_US.utf8
 %endif
-%{_libdir}/gconv
+%dir %{_libdir}/gconv
+%{_libdir}/gconv/*.so
+%{_libdir}/gconv/gconv-modules
+%attr(0644,root,root) %verify(not md5 size mtime) %ghost %{_libdir}/gconv/gconv-modules.cache
 
 %files locale -f libc.lang
 %defattr(-,root,root)