From 072890e9b0ec5af1b28b3c1b213554c5b16ab50e Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Mon, 2 Nov 2020 11:33:44 +0100
Subject: Backport changes to package scripts

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 packages/squashfs-tools-ng.spec | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'packages/squashfs-tools-ng.spec')

diff --git a/packages/squashfs-tools-ng.spec b/packages/squashfs-tools-ng.spec
index 6ba2d5e..81add75 100644
--- a/packages/squashfs-tools-ng.spec
+++ b/packages/squashfs-tools-ng.spec
@@ -1,19 +1,12 @@
 ## Spec file to build squashf-tools-ng RPM package.
-##
-## Install following packages:
-##   - yum install -y rpm-build spectool
-##   - 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.
-##
-## 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,21 +37,32 @@ this package from the original:
    SELinux labels.
 
 
-%if 0%{?el} > 7
+%if 0%{?centos} > 7 || 0%{?fedora} >= 32 || 0%{?suse_version} >= 1500
 %global use_zstd 1
 %endif
 
+
+
 # rpm-build / rpmdevtools
 BuildRequires: gcc
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: libtool
 BuildRequires: doxygen
+BuildRequires: libselinux-devel
 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
@@ -71,6 +75,7 @@ Requires: xz
 Requires: lzo
 Requires: libattr
 Requires: lz4
+Requires: libselinux
 
 #Recommends: squashfs-tools
    
@@ -136,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2020 Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org> - 1.0.2-1
+- Add Fedora support.
+- Add OpenSUSE support.
+- Bump to version 1.0.2.
 * Thu Aug 20 2020 Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org> - 1.0.1-1
 - First package release.
-
-- 
cgit v1.2.3