osc copypac from project:Base:System package:glibc revision:710

OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=712
This commit is contained in:
Andreas Schwab 2024-05-17 07:44:38 +00:00 committed by Git OBS Bridge
parent 44b00a6f27
commit c69351a7c3
3 changed files with 5 additions and 33 deletions

View File

@ -9,11 +9,6 @@ glibc
+/usr/lib/getconf/[^g] +/usr/lib/getconf/[^g]
+/usr/sbin/iconvconfig -> /usr/sbin/iconvconfig-<extension> +/usr/sbin/iconvconfig -> /usr/sbin/iconvconfig-<extension>
glibc-locale-base glibc-locale-base
arch i586 block!
+/usr/lib(64)?/gconv/gconv-modules
targettype x86 -/usr/lib(64)?/gconv/gconv-modules
post "/usr/sbin/iconvconfig-<extension>"
glibc-locale
arch i586 block! arch i586 block!
+/usr/lib(64)?/gconv/gconv-modules +/usr/lib(64)?/gconv/gconv-modules
targettype x86 -/usr/lib(64)?/gconv/gconv-modules targettype x86 -/usr/lib(64)?/gconv/gconv-modules

View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
Wed May 15 13:10:55 UTC 2024 - Andreas Schwab <schwab@suse.de>
- Move gconv extra modules into glibc-locale package
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 13 09:45:36 UTC 2024 - Andreas Schwab <schwab@suse.de> Mon May 13 09:45:36 UTC 2024 - Andreas Schwab <schwab@suse.de>

View File

@ -1162,15 +1162,14 @@ if posix.access("%{rootsbindir}/ldconfig", "x") then
exec("%{rootsbindir}/ldconfig", "-X") exec("%{rootsbindir}/ldconfig", "-X")
end end
if posix.utime("%{_libdir}/gconv/gconv-modules.cache") then if posix.utime("%{_libdir}/gconv/gconv-modules.cache") then
exec("%{_sbindir}/iconvconfig", "-o", "%{_libdir}/gconv/gconv-modules.cache", exec("/usr/sbin/iconvconfig", "-o", "%{_libdir}/gconv/gconv-modules.cache",
"--nostdlib", "%{_libdir}/gconv") "--nostdlib", "%{_libdir}/gconv")
end end
%postun -p %{rootsbindir}/ldconfig %postun -p %{rootsbindir}/ldconfig
%post locale -p %{_sbindir}/iconvconfig %post locale-base
/usr/sbin/iconvconfig
%post locale-base -p %{_sbindir}/iconvconfig
%post info %post info
%install_info --info-dir=%{_infodir} %{_infodir}/libc.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/libc.info.gz
@ -1276,16 +1275,9 @@ exit 0
%{_prefix}/lib/locale/en_US.utf8 %{_prefix}/lib/locale/en_US.utf8
%endif %endif
%dir %{_libdir}/gconv %dir %{_libdir}/gconv
%dir %{_libdir}/gconv/gconv-modules.d %{_libdir}/gconv/*.so
%{_libdir}/gconv/gconv-modules %{_libdir}/gconv/gconv-modules
%{_libdir}/gconv/ANSI_X3.110.so %{_libdir}/gconv/gconv-modules.d
%{_libdir}/gconv/CP1252.so
%{_libdir}/gconv/ISO8859-1.so
%{_libdir}/gconv/ISO8859-15.so
%{_libdir}/gconv/UNICODE.so
%{_libdir}/gconv/UTF-16.so
%{_libdir}/gconv/UTF-32.so
%{_libdir}/gconv/UTF-7.so
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %{_libdir}/gconv/gconv-modules.cache %attr(0644,root,root) %verify(not md5 size mtime) %ghost %{_libdir}/gconv/gconv-modules.cache
%files locale %files locale
@ -1294,16 +1286,6 @@ exit 0
%{_prefix}/lib/locale %{_prefix}/lib/locale
%exclude %{_prefix}/lib/locale/C.utf8 %exclude %{_prefix}/lib/locale/C.utf8
%exclude %{_prefix}/lib/locale/en_US.utf8 %exclude %{_prefix}/lib/locale/en_US.utf8
%{_libdir}/gconv/gconv-modules.d/gconv-modules-*.conf
%exclude %{_libdir}/gconv/ANSI_X3.110.so
%exclude %{_libdir}/gconv/CP1252.so
%exclude %{_libdir}/gconv/ISO8859-1.so
%exclude %{_libdir}/gconv/ISO8859-15.so
%exclude %{_libdir}/gconv/UNICODE.so
%exclude %{_libdir}/gconv/UTF-16.so
%exclude %{_libdir}/gconv/UTF-32.so
%exclude %{_libdir}/gconv/UTF-7.so
%{_libdir}/gconv/*.so
%endif %endif
%files devel %files devel