From 777eb2a2cf00dae50583619636f2960790362190107568a39182f4447bef1cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 1 Mar 2022 15:17:54 +0000 Subject: [PATCH 1/4] use git spec file OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-recompress?expand=0&rev=48 --- _service | 1 + obs-service-recompress.spec | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/_service b/_service index c2c3036..9e967d9 100644 --- a/_service +++ b/_service @@ -4,6 +4,7 @@ git 0.5.2 0.5.2 + dist/obs-service-recompress.spec diff --git a/obs-service-recompress.spec b/obs-service-recompress.spec index 76f8ed2..5444174 100644 --- a/obs-service-recompress.spec +++ b/obs-service-recompress.spec @@ -17,6 +17,7 @@ %define service recompress + Name: obs-service-%{service} Version: 0.5.2 Release: 0 @@ -25,20 +26,22 @@ License: GPL-2.0-or-later Group: Development/Tools/Building URL: https://github.com/openSUSE/obs-service-%{service} Source: %{name}-%{version}.tar.gz +BuildRequires: perl(Test::More) + BuildRequires: bzip2 BuildRequires: gzip BuildRequires: xz -BuildRequires: perl(Test::More) -Requires: %{_bindir}/gzip Requires: bzip2 +Requires: gzip Requires: xz -BuildArch: noarch -# Enable zstd on all supported distributions -%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150000 || 0%{?fedora_version} > 25 + +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150000 || 0%{?fedora_version} > 25 || 0%{?rhel} >= 6 BuildRequires: zstd Requires: zstd %endif +BuildArch: noarch + %description This is a source service for openSUSE Build Service. @@ -56,12 +59,13 @@ It supports to compress, uncompress or recompress files from or to %build %install -%make_install +make DESTDIR=%buildroot install %check -%make_build test +make test %files +%defattr(-,root,root) %dir %{_prefix}/lib/obs %{_prefix}/lib/obs/service From 720f02944a53191aeef7d82d96acaeb8db7b83fd0dfbec921b2b9a77f121abdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 7 Mar 2022 08:47:49 +0000 Subject: [PATCH 2/4] merge OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-recompress?expand=0&rev=49 --- obs-service-recompress.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/obs-service-recompress.spec b/obs-service-recompress.spec index 5444174..4590907 100644 --- a/obs-service-recompress.spec +++ b/obs-service-recompress.spec @@ -34,8 +34,9 @@ BuildRequires: xz Requires: bzip2 Requires: gzip Requires: xz - -%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150000 || 0%{?fedora_version} > 25 || 0%{?rhel} >= 6 +BuildArch: noarch +# Enable zstd on all supported distributions +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150000 || 0%{?fedora_version} > 25 BuildRequires: zstd Requires: zstd %endif From 8fe03acaac1e0ee5bbb9851f8d58fd4733ec7ab5a4d5a619c05922ee87f8c16e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 13 Mar 2022 14:16:01 +0000 Subject: [PATCH 3/4] Accepting request 961019 from home:olh:branches:openSUSE:Tools fix mismerge OBS-URL: https://build.opensuse.org/request/show/961019 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-recompress?expand=0&rev=50 --- obs-service-recompress.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/obs-service-recompress.spec b/obs-service-recompress.spec index 4590907..8e29650 100644 --- a/obs-service-recompress.spec +++ b/obs-service-recompress.spec @@ -34,7 +34,6 @@ BuildRequires: xz Requires: bzip2 Requires: gzip Requires: xz -BuildArch: noarch # Enable zstd on all supported distributions %if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150000 || 0%{?fedora_version} > 25 BuildRequires: zstd From 95d9301063b7dd45764159cac9a52bd981f001f77a60d598f538fd433b0a1d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 5 Jan 2024 08:55:09 +0000 Subject: [PATCH 4/4] sync OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-recompress?expand=0&rev=51 --- obs-service-recompress.changes | 6 ++++++ obs-service-recompress.spec | 18 +++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/obs-service-recompress.changes b/obs-service-recompress.changes index 66c09f0..d98f87b 100644 --- a/obs-service-recompress.changes +++ b/obs-service-recompress.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 5 08:53:17 UTC 2024 - Adrian Schröter + +- zstd is now available on SLE 15 SP0 + Adding dependency there as well to fix bsc#1216361 + ------------------------------------------------------------------- Tue Mar 1 14:41:26 UTC 2022 - Adrian Schröter diff --git a/obs-service-recompress.spec b/obs-service-recompress.spec index 8e29650..19a5e7b 100644 --- a/obs-service-recompress.spec +++ b/obs-service-recompress.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,6 @@ %define service recompress - Name: obs-service-%{service} Version: 0.5.2 Release: 0 @@ -26,22 +25,20 @@ License: GPL-2.0-or-later Group: Development/Tools/Building URL: https://github.com/openSUSE/obs-service-%{service} Source: %{name}-%{version}.tar.gz -BuildRequires: perl(Test::More) - BuildRequires: bzip2 BuildRequires: gzip BuildRequires: xz +BuildRequires: perl(Test::More) +Requires: %{_bindir}/gzip Requires: bzip2 -Requires: gzip Requires: xz +BuildArch: noarch # Enable zstd on all supported distributions -%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150000 || 0%{?fedora_version} > 25 +%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} > 25 BuildRequires: zstd Requires: zstd %endif -BuildArch: noarch - %description This is a source service for openSUSE Build Service. @@ -59,13 +56,12 @@ It supports to compress, uncompress or recompress files from or to %build %install -make DESTDIR=%buildroot install +%make_install %check -make test +%make_build test %files -%defattr(-,root,root) %dir %{_prefix}/lib/obs %{_prefix}/lib/obs/service