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 2021-06-24 18:22:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zlib-ng (Old)
 and      /work/SRC/openSUSE:Factory/.zlib-ng.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "zlib-ng"

Thu Jun 24 18:22:26 2021 rev:2 rq:901559 version:2.0.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/zlib-ng/zlib-ng.changes  2021-06-21 
20:36:37.194695041 +0200
+++ /work/SRC/openSUSE:Factory/.zlib-ng.new.2625/zlib-ng.changes        
2021-06-24 18:22:41.660924214 +0200
@@ -1,0 +2,6 @@
+Tue Jun 22 15:32:22 UTC 2021 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Add 'compat' flavor which can be used as a drop-in replacement
+  of libz
+
+-------------------------------------------------------------------

New:
----
  _multibuild

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zlib-ng.spec ++++++
--- /var/tmp/diff_new_pack.poMFlM/_old  2021-06-24 18:22:42.760925434 +0200
+++ /var/tmp/diff_new_pack.poMFlM/_new  2021-06-24 18:22:42.764925439 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package zlib-ng
+# spec file
 #
 # Copyright (c) 2021 SUSE LLC
 #
@@ -15,14 +15,27 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+# 'compat' flavor can be used as a drop-in replacement of 'libz'
+%define target @BUILD_FLAVOR@%{nil}
+%if "%target" == "compat"
+%bcond_without zlib_compat
+%else
+%bcond_with zlib_compat
+%endif
+
+%if %{with zlib_compat}
+%define soversion 1
+%define compat_suffix -compat
+%else
 %define soversion 2
+%endif
 
-Name:           zlib-ng
+Name:           zlib-ng%{?compat_suffix}
 Version:        2.0.4
 Release:        0
 Summary:        Zlib replacement with SIMD optimizations
 License:        Zlib
-Url:            https://github.com/zlib-ng/zlib-ng
+URL:            https://github.com/zlib-ng/zlib-ng
 Source0:        
https://github.com/zlib-ng/zlib-ng/archive/refs/tags/%{version}.tar.gz#/zlib-ng-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  gcc
@@ -32,23 +45,29 @@
 zlib-ng is a zlib replacement with support for CPU intrinsics (SSSE3,
 AVX2, NEON, VSX) when available.
  
-%package -n     libz-ng%{soversion}
+%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%{soversion}
+%description -n libz-ng%{?compat_suffix}%{soversion}
 zlib-ng is a zlib replacement with support for CPU intrinsics (SSSE3,
 AVX2, NEON, VSX) when available.
 
 %package        devel
 Summary:        Development files for %{name}
-Requires:       libz-ng%{soversion} = %{version}-%{release}
+Requires:       libz-ng%{?compat_suffix}%{soversion} = %{version}-%{release}
+%if %{with zlib_compat}
+Conflicts:      zlib-devel
+%endif
  
 %description    devel
 The %{name}-devel package contains header files for
 developing application that use %{name}.
  
 %prep
-%autosetup -p1
+%autosetup -p1 -n zlib-ng-%{version}
  
 %build
 # zlib-ng uses a different macro for library directory.
@@ -58,6 +77,9 @@
   -DCMAKE_C_FLAGS=-mfloat-abi=hard \
 %endif
   -DWITH_SANITIZERS=ON \
+%if %{with zlib_compat}
+  -DZLIB_COMPAT=ON \
+%endif
   -DINSTALL_LIB_DIR=%{_libdir}
 %cmake_build
 
@@ -70,18 +92,29 @@
 export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}
 %ctest
 
-%post -n libz-ng%{soversion} -p /sbin/ldconfig
-%postun -n libz-ng%{soversion} -p /sbin/ldconfig
+%post -n libz-ng%{?compat_suffix}%{soversion} -p /sbin/ldconfig
+%postun -n libz-ng%{?compat_suffix}%{soversion} -p /sbin/ldconfig
 
-%files -n libz-ng%{soversion}
+%files -n libz-ng%{?compat_suffix}%{soversion}
+%if %{with zlib_compat}
+%{_libdir}/libz.so.%{soversion}*
+%else
 %{_libdir}/libz-ng.so.%{soversion}*
+%endif
 %license LICENSE.md
 %doc README.md
  
 %files devel
+%if %{with zlib_compat}
+%{_includedir}/zconf.h
+%{_includedir}/zlib.h
+%{_libdir}/libz.so
+%{_libdir}/pkgconfig/zlib.pc
+%else
 %{_includedir}/zconf-ng.h
 %{_includedir}/zlib-ng.h
 %{_libdir}/libz-ng.so
-%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/zlib-ng.pc
+%endif
  
 %changelog

++++++ _multibuild ++++++
<multibuild>
  <flavor>compat</flavor>
</multibuild>

Reply via email to