diff --git a/2.2.1.zip b/2.2.1.zip deleted file mode 100644 index fac8d476d9edad373cbe2b8ea326ed3112ce3d53..0000000000000000000000000000000000000000 Binary files a/2.2.1.zip and /dev/null differ diff --git a/2.2.2.tar.gz b/2.2.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ddcce6dba08c8a12a5e7331ec448cbd73a63afe3 Binary files /dev/null and b/2.2.2.tar.gz differ diff --git a/zlib-ng.spec b/zlib-ng.spec index c92b8c26c39a7e414c766aad7d956d4ec3c9a7a5..62e805dabfb83bf0cdaee4a80fcbad01e66c387a 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -1,19 +1,19 @@ +%undefine __cmake_in_source_build %bcond_with compat Name: zlib-ng -Version: 2.2.1 -Release: 2 +Version: 2.2.2 +Release: 1 Summary: Zlib data compression library for the next generation systems License: zlib Url: https://github.com/zlib-ng/zlib-ng -Source0: https://github.com/zlib-ng/zlib-ng/archive/refs/tags/%{version}.zip +Source0: https://github.com/zlib-ng/zlib-ng/archive/refs/tags/%{version}.tar.gz # Be explicit about the soname in order to avoid unintentional changes. %global soname libz-ng.so.2 %global compat_soname libz.so.1 %global zlib_ver 1.3.1 %global zlib_obsoletes 1.3 -%global main_dir %_builddir/%{name}-%{version} BuildRequires: cmake >= 3.1 BuildRequires: gcc-c++ @@ -71,10 +71,9 @@ _EOF_ # zlib-ng uses a different macro for library directory. %global make_param -DWITH_GTEST=OFF -DWITH_SANITIZERS=ON -DINSTALL_LIB_DIR=%{_libdir} -mkdir -p %{main_dir}/build -cd %{main_dir}/build -%cmake .. %{make_param} -%make_build +%global __cmake_builddir %{_vpath_builddir} +%cmake %{make_param} +%cmake_build %if %{with compat} cat <<_EOF_ @@ -86,30 +85,29 @@ cat <<_EOF_ _EOF_ # Disable new strategies in order to keep compatibility with zlib. -mkdir -p %{main_dir}/build-compat -cd %{main_dir}/build-compat -%cmake .. %{make_param} -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -%make_build +%global __cmake_builddir %{_vpath_builddir}-compat +%cmake %{make_param} -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF +%cmake_build %endif - %check -make test +%global __cmake_builddir %{_vpath_builddir} +%ctest %install -cd %{main_dir}/build -%make_install +%global __cmake_builddir %{_vpath_builddir} +%cmake_install %if %{with compat} -cd %{main_dir}/build-compat -%make_install +%global __cmake_builddir %{_vpath_builddir}-compat +%cmake_install %endif %files -%{_libdir}/%{soname} -%{_libdir}/libz-ng.so.%{version} %license LICENSE.md %doc README.md +%{_libdir}/%{soname} +%{_libdir}/libz-ng.so.%{version} %files devel %{_includedir}/zconf-ng.h @@ -134,6 +132,9 @@ cd %{main_dir}/build-compat %endif %changelog +* Tue Nov 12 2024 Funda Wang - 2.2.2-1 +- update to 2.2.2 + * Sun Aug 11 2024 Funda Wang - 2.2.1-2 - Do not build compat package now, it does not comply current distro policy