From 68f2e22949f5b42b9da9dead7b0e7dfe8b3fc5acd63e4be39cec9e9634d8ed7e Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Thu, 4 Jan 2024 09:17:23 +0000 Subject: [PATCH 1/2] Accepting request 1135665 from home:ecsos:python - Disable build of gzip for Leap to fix build error. OBS-URL: https://build.opensuse.org/request/show/1135665 OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=93 --- zstd.changes | 5 +++++ zstd.spec | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/zstd.changes b/zstd.changes index 51ea54f..7be4be5 100644 --- a/zstd.changes +++ b/zstd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 29 13:21:02 UTC 2023 - ecsos + +- Disable build of gzip for Leap to fix build error. + ------------------------------------------------------------------- Thu May 25 11:41:00 UTC 2023 - Ben Greiner diff --git a/zstd.spec b/zstd.spec index efc112f..2948def 100644 --- a/zstd.spec +++ b/zstd.spec @@ -16,6 +16,11 @@ # +%if 0%{?suse_version} <= 1600 +%define with_gzip 0 +%else +%define with_gzip 1 +%endif %define libname libzstd1 Name: zstd Version: 1.5.5 @@ -83,6 +88,7 @@ targeting faster compression than zlib at comparable ratios. Needed for compiling programs that link with the library. +%if %with_gzip %package gzip Summary: zstd and zlib based gzip drop-in Group: Productivity/Archiving/Compression @@ -99,6 +105,7 @@ targeting faster compression than zlib at comparable ratios. This subpackage provides a compatible alternative to gzip(1) using an optimized deflate/zlib handling. +%endif %prep %autosetup -p1 @@ -123,9 +130,11 @@ export CXXFLAGS="%{optflags} -std=c++11" %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 +%if %with_gzip ln -s zstd %{buildroot}/%{_bindir}/gzip ln -s zstd %{buildroot}/%{_bindir}/gunzip ln -s zstdcat %{buildroot}/%{_bindir}/zcat +%endif %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -155,9 +164,11 @@ ln -s zstdcat %{buildroot}/%{_bindir}/zcat %files -n lib%{name}-devel-static %{_libdir}/libzstd.a +%if %with_gzip %files gzip %{_bindir}/gzip %{_bindir}/gunzip %{_bindir}/zcat +%endif %changelog From 9afb571b347aba37267af1bf12a975e3efb123a5fa1fba2eaf9074244e3bbfdd Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Thu, 4 Jan 2024 09:18:09 +0000 Subject: [PATCH 2/2] Disable build of gzip for Leap 15.x to fix build error. OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=94 --- zstd.changes | 2 +- zstd.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zstd.changes b/zstd.changes index 7be4be5..d08eb98 100644 --- a/zstd.changes +++ b/zstd.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Dec 29 13:21:02 UTC 2023 - ecsos -- Disable build of gzip for Leap to fix build error. +- Disable build of gzip for Leap 15.x to fix build error. ------------------------------------------------------------------- Thu May 25 11:41:00 UTC 2023 - Ben Greiner diff --git a/zstd.spec b/zstd.spec index 2948def..475b63e 100644 --- a/zstd.spec +++ b/zstd.spec @@ -16,7 +16,7 @@ # -%if 0%{?suse_version} <= 1600 +%if 0%{?suse_version} <= 1500 %define with_gzip 0 %else %define with_gzip 1