From 101c8e0ef78241ba10af54c1f534b0512a020c0b3b9d02494847d2b6fdc9752f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 9 Feb 2022 10:28:51 +0000 Subject: [PATCH] Accepting request 950055 from home:dirkmueller:Factory - use filebased requires on gzip so that zstd can supplement it as well OBS-URL: https://build.opensuse.org/request/show/950055 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-recompress?expand=0&rev=45 --- obs-service-recompress.changes | 6 ++++++ obs-service-recompress.spec | 20 +++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/obs-service-recompress.changes b/obs-service-recompress.changes index 2576288..28ef865 100644 --- a/obs-service-recompress.changes +++ b/obs-service-recompress.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 30 23:05:35 UTC 2022 - Dirk Müller + +- use filebased requires on gzip so that zstd can supplement it as + well + ------------------------------------------------------------------- Wed May 26 11:55:33 UTC 2021 - Ferdinand Thiessen diff --git a/obs-service-recompress.spec b/obs-service-recompress.spec index a960112..33f9c30 100644 --- a/obs-service-recompress.spec +++ b/obs-service-recompress.spec @@ -1,7 +1,7 @@ # -# spec file for package obs-service-recompress +# spec file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 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.1 Release: 0 @@ -26,23 +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 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -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 || 0%{?rhel} >= 6 BuildRequires: zstd Requires: zstd %endif -BuildArch: noarch - %description This is a source service for openSUSE Build Service. @@ -54,20 +50,18 @@ It supports to compress, uncompress or recompress files from or to xz : XZ Compression zstd : Zstd Compression - %prep %setup -q %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