Accepting request 1245041 from home:Andreas_Schwab:Factory

- Use rpm.execute when available (bsc#1236869)

OBS-URL: https://build.opensuse.org/request/show/1245041
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=731

glibc.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 10 12:19:00 UTC 2025 - Andreas Schwab <schwab@suse.de>
+
+- Use rpm.execute when available (bsc#1236869)
+
 -------------------------------------------------------------------
 Wed Jan 29 09:19:29 UTC 2025 - Andreas Schwab <schwab@suse.de>
 

glibc.spec

@@ -57,13 +57,13 @@
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
 
-%if 0%{?suse_version} >= 1550
+%if %{suse_version} >= 1550
 %bcond_without usrmerged
 %else
 %bcond_with usrmerged
 %endif
 
-%if 0%{?suse_version} >= 1600
+%if %{suse_version} >= 1600
 %bcond_with nscd
 %else
 %bcond_without nscd
@@ -102,7 +102,7 @@ ExclusiveArch:  do_not_build
 %undefine _build_create_debug
 %define _enable_debug_packages 0
 ExcludeArch:    %{cross_arch}
-%if 0%{?suse_version} < 1600
+%if %{suse_version} < 1600
 ExclusiveArch:  do_not_build
 %endif
 %endif
@@ -554,7 +554,7 @@ Group:          System/Libraries
 Network Support Library for legacy architectures.  This library does not
 have support for IPv6.
 
-%if 0%{suse_version} >= 1500
+%if %{suse_version} >= 1500
 %define make_output_sync -Oline
 %endif
 
@@ -722,7 +722,7 @@ profile="--disable-profile"
 	--with-cpu=power7 \
 %endif
 %ifarch x86_64
-%if %suse_version > 1500
+%if %{suse_version} > 1500
 	--enable-cet \
 %endif
 %endif
@@ -965,7 +965,7 @@ rm -rf %{buildroot}%{_datadir}/locale/*/
 # Miscelanna:
 
 install -m 644 %{SOURCE7} %{buildroot}/etc
-%if %suse_version > 1500
+%if %{suse_version} > 1500
 install -D -m 644 %{SOURCE5} %{buildroot}%{_prefix}/etc/nsswitch.conf
 %else
 install -m 644 %{SOURCE5} %{buildroot}/etc/nsswitch.conf
@@ -1153,6 +1153,9 @@ rm %{buildroot}/sbin
 %if %{build_main}
 
 %post -p <lua>
+%if %{suse_version} >= 1600
+exec = rpm.execute
+%else
 function exec(path, ...)
   local pid = posix.fork()
   if pid == 0 then
@@ -1165,6 +1168,7 @@ function exec(path, ...)
   end
   posix.wait(pid)
 end
+%endif
 
 -- First, get rid of platform-optimized libraries. We remove any we have
 -- ever built, since otherwise we might end up using some old leftover
@@ -1244,7 +1248,7 @@ exit 0
 %config /etc/ld.so.conf
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/ld.so.cache
 %config(noreplace) /etc/rpc
-%if %suse_version > 1500
+%if %{suse_version} > 1500
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/nsswitch.conf
 %{_prefix}/etc/nsswitch.conf
 %else