Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package zlib-ng for openSUSE:Factory checked
in at 2024-08-26 22:10:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zlib-ng (Old)
and /work/SRC/openSUSE:Factory/.zlib-ng.new.2698 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zlib-ng"
Mon Aug 26 22:10:57 2024 rev:18 rq:1196043 version:2.1.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/zlib-ng/zlib-ng.changes 2024-01-15
22:20:48.194315285 +0100
+++ /work/SRC/openSUSE:Factory/.zlib-ng.new.2698/zlib-ng.changes
2024-08-26 22:13:53.747200903 +0200
@@ -1,0 +2,12 @@
+Fri Aug 23 12:00:29 UTC 2024 - Dr. Werner Fink <wer...@suse.de>
+
+- Also perform abicheck with the help of libabigail(-tools)
+
+-------------------------------------------------------------------
+Fri Aug 23 08:15:51 UTC 2024 - Dr. Werner Fink <wer...@suse.de>
+
+- Make libz-ng-compat1 not conflicting to libz but use the runtime
+ linker to decide to overwrite the original libz with the compatibility
+ version installed below subdirectory in libdir (boo#1229408)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zlib-ng.spec ++++++
--- /var/tmp/diff_new_pack.iYfZSv/_old 2024-08-26 22:13:54.219220613 +0200
+++ /var/tmp/diff_new_pack.iYfZSv/_new 2024-08-26 22:13:54.219220613 +0200
@@ -40,6 +40,8 @@
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
+BuildRequires: libabigail-tools
+BuildRequires: cmake(GTest)
%if %{with systemtap}
BuildRequires: systemtap-sdt-devel
%endif
@@ -50,9 +52,6 @@
%package -n libz-ng%{?compat_suffix}%{soversion}
Summary: Zlib replacement with SIMD optimizations
-%if %{with zlib_compat}
-Conflicts: libz%{soversion}
-%endif
%description -n libz-ng%{?compat_suffix}%{soversion}
zlib-ng is a zlib replacement with support for CPU intrinsics (SSSE3,
@@ -76,6 +75,7 @@
%build
# zlib-ng uses a different macro for library directory.
# 32-bit Arm requires to set soft/hard float
+export CC=gcc
%cmake \
%ifarch %{arm32}
-DCMAKE_C_FLAGS="%{optflags} -mfloat-abi=hard" \
@@ -84,7 +84,7 @@
-DWITH_ARMV6:BOOL=OFF \
%endif
%if %{with zlib_compat}
- -DZLIB_COMPAT=ON \
+ -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF \
%endif
-DINSTALL_LIB_DIR=%{_libdir} \
-DWITH_RVV=OFF \
@@ -93,19 +93,58 @@
%install
%cmake_install
+%if %{with zlib_compat}
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+mkdir -p %{buildroot}%{_libdir}/zlib-ng-compat
+(cat > %{buildroot}%{_sysconfdir}/ld.so.conf.d/zlib-ng-compat.conf) <<-EOF
+ %{_libdir}/zlib-ng-compat
+ EOF
+pushd %{buildroot}%{_libdir}/
+ mv libz.so.* zlib-ng-compat/
+ ln -sf zlib-ng-compat/libz.so.1 libz.so
+popd
+%endif
%check
# Tests fail when run in parallel.
# %%define _smp_mflags -j1
+%if %{with zlib_compat}
+export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/zlib-ng-compat
+%else
export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}
+%endif
%ctest
+%ifarch ppc64le
+%global target_cpu powerpc64le
+%else
+%global target_cpu %{_target_cpu}
+%endif
+%ifarch x86_64
+%global cpu_vendor pc
+%else
+%global cpu_vendor unknown
+%endif
+
+%ifarch aarch64 ppc64le x86_64
+%global __cmake_builddir %{_vpath_builddir}
+export CC=gcc
+export CFLAGS="%{optflags} -fPIC"
+%if %{with zlib_compat}
+CHOST=%{target_cpu}-%{cpu_vendor}-linux-gnu sh test/abicheck.sh --zlib-compat
+%else
+CHOST=%{target_cpu}-%{cpu_vendor}-linux-gnu sh test/abicheck.sh
+%endif
+%endif
+
%post -n libz-ng%{?compat_suffix}%{soversion} -p /sbin/ldconfig
%postun -n libz-ng%{?compat_suffix}%{soversion} -p /sbin/ldconfig
%files -n libz-ng%{?compat_suffix}%{soversion}
%if %{with zlib_compat}
-%{_libdir}/libz.so.%{soversion}*
+%config %{_sysconfdir}/ld.so.conf.d/zlib-ng-compat.conf
+%dir %{_libdir}/zlib-ng-compat/
+%{_libdir}/zlib-ng-compat/libz.so.%{soversion}*
%else
%{_libdir}/libz-ng.so.%{soversion}*
%endif
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.iYfZSv/_old 2024-08-26 22:13:54.263222450 +0200
+++ /var/tmp/diff_new_pack.iYfZSv/_new 2024-08-26 22:13:54.267222618 +0200
@@ -1,5 +1,3 @@
libz-ng2
libz-ng-compat1
- conflicts "libz1-<targettype>"
-(No newline at EOF)
