From 6039a648c64bf0a0ae7cb07da1fc2cc84eb82ae4 Mon Sep 17 00:00:00 2001 From: Sébastien Gross Date: Thu, 1 Oct 2020 17:31:27 +0200 Subject: RPM: Add Fedora, OpenSUSE support and bump to v1.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Gross --- packages/squashfs-tools-ng.spec | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/packages/squashfs-tools-ng.spec b/packages/squashfs-tools-ng.spec index 6ba2d5e..c5a2ea0 100644 --- a/packages/squashfs-tools-ng.spec +++ b/packages/squashfs-tools-ng.spec @@ -2,18 +2,32 @@ ## ## Install following packages: ## - yum install -y rpm-build spectool +## - rpmdev-setuptree ## - spectool -g -R squashfs-tools-ng.spec ## - rpmspec --parse squashfs-tools-ng.spec | grep BuildRequires | cut -d' ' -f2 | xargs sudo yum install -y ## ## Note: tools like yum-builddep does not seem to work when installing ## build requirements. ## +## On OpenSUSE: +## +## * spectool des not exists. Too retrieve the source package: +## +## rpmspec --parse squashfs-tools-ng.spec | grep Source0 | awk '{print $2}' | xargs wget -N -P $(rpm --eval '%{_sourcedir}') +## +## * yum command should also be replaced by zypper. +## ## Run: ## - rpmbuild --clean -ba squashfs-tools-ng.spec ## +# OpenSUSE has no dist macro +%if 0%{suse_version} > 0 +%global dist .sles%{suse_version} +%endif + Name: squashfs-tools-ng -Version: 1.0.1 +Version: 1.0.2 Release: 1%{?dist} License: GPLv3+ URL: https://github.com/AgentD/squashfs-tools-ng @@ -44,10 +58,12 @@ this package from the original: SELinux labels. -%if 0%{?el} > 7 +%if 0%{?el} > 7 || 0%{?fedora} >= 32 || 0%{?suse_version} >= 1500 %global use_zstd 1 %endif + + # rpm-build / rpmdevtools BuildRequires: gcc BuildRequires: automake @@ -58,7 +74,15 @@ BuildRequires: zlib-devel BuildRequires: xz-devel BuildRequires: lzo-devel BuildRequires: libattr-devel +# Need to be explicitly declared on Fedora +BuildRequires: make + +# OpenSUSE has a different lz4 devel package name +%if 0%{?suse_version} > 0 +BuildRequires: liblz4-devel +%else BuildRequires: lz4-devel +%endif %if 0%{?use_zstd} BuildRequires: libzstd-devel @@ -136,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 01 2020 Sébastien Gross - 1.0.2-1 +- Add Fedora support. +- Add OpenSUSE support. +- Bump to version 1.0.2. * Thu Aug 20 2020 Sébastien Gross - 1.0.1-1 - First package release. - -- cgit v1.2.3