Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package zstd for openSUSE:Factory checked in
at 2025-03-20 19:23:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zstd (Old)
and /work/SRC/openSUSE:Factory/.zstd.new.2696 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zstd"
Thu Mar 20 19:23:26 2025 rev:40 rq:1254402 version:1.5.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/zstd/zstd.changes 2025-02-22
19:04:17.597143614 +0100
+++ /work/SRC/openSUSE:Factory/.zstd.new.2696/zstd.changes 2025-03-20
19:23:27.541836155 +0100
@@ -1,0 +2,6 @@
+Sat Mar 1 03:59:19 UTC 2025 - Marcus Rueckert <mrueck...@suse.de>
+
+- build with cmake as it is needed for building blender 4.4
+ this should not be a problem any more as cmake:mini is in ring0
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zstd.spec ++++++
--- /var/tmp/diff_new_pack.4UnlUR/_old 2025-03-20 19:23:28.385871038 +0100
+++ /var/tmp/diff_new_pack.4UnlUR/_new 2025-03-20 19:23:28.389871204 +0100
@@ -1,7 +1,7 @@
#
# spec file for package zstd
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,8 @@
#
+%bcond_without cmake
+
%define libname libzstd1
%if 0%{?suse_version} <= 1500
%define with_gzip 0
@@ -33,6 +35,9 @@
Source1:
https://github.com/facebook/zstd/releases/download/v%{version}/%{name}-%{version}.tar.gz.sig
Source2: zstd.keyring
Source99: baselibs.conf
+%if %{with cmake}
+BuildRequires: cmake
+%endif
BuildRequires: gcc
# C++ is needed for pzstd only
BuildRequires: gcc-c++
@@ -113,11 +118,16 @@
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags} -std=c++11"
+%if %{with cmake}
+%cmake ./cmake -DZSTD_BUILD_CONTRIB:BOOL=ON -DZSTD_ZLIB_SUPPORT:BOOL=ON
+%cmake_build
+%else
# lib-mt is alias for multi-threaded library support
%make_build HAVE_ZLIB=1 prefix=%{_prefix} libdir=%{_libdir} -C lib lib-mt
for dir in programs contrib/pzstd; do
%make_build -C "$dir"
done
+%endif
%check
export CFLAGS="%{optflags}"
@@ -126,9 +136,14 @@
#make_build -C contrib/pzstd test-pzstd
%install
+%if %{with cmake}
+%cmake_install
+rm %{buildroot}%{_datadir}/doc/packages/zstd/zstd_manual.html
+%else
%make_install V=1 VERBOSE=1 prefix=%{_prefix} libdir=%{_libdir}
install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd
install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1
+%endif
%if %{with_gzip}
ln -s zstd %{buildroot}/%{_bindir}/gzip
ln -s zstd %{buildroot}/%{_bindir}/gunzip
@@ -158,6 +173,9 @@
%{_includedir}/*.h
%{_libdir}/pkgconfig/libzstd.pc
%{_libdir}/libzstd.so
+%if %{with cmake}
+%{_libdir}/cmake/zstd/
+%endif
%files -n lib%{name}-devel-static
%license COPYING LICENSE
