From 0edc987645b53192f605955f2a952304aac31a28 Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Wed, 7 Feb 2024 01:30:12 -0300
Subject: build: mkrpm.sh: remove --quiet from rpmbuild

To make the CI logs more informative, as currently nothing from the
build itself is shown.

Added on commit d684d9988 ("Fix mkrpm.sh", 2016-02-16) / PR #297.
---
 platform/rpm/mkrpm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/rpm/mkrpm.sh b/platform/rpm/mkrpm.sh
index 7fbc35575..a8e7e55ab 100755
--- a/platform/rpm/mkrpm.sh
+++ b/platform/rpm/mkrpm.sh
@@ -47,7 +47,7 @@ tar --exclude='./.git*' --transform "s/^./${name}-${version}/" \
     -czf "${tmpdir}/SOURCES/${name}-${version}.tar.gz" .
 
 # Build the files (rpm, debug rpm and source rpm)
-rpmbuild --quiet --define "_topdir ${tmpdir}" -ba "${tmp_spec_file}"
+rpmbuild --define "_topdir ${tmpdir}" -ba "${tmp_spec_file}"
 
 # Copy the results to cwd
 mv "${tmpdir}/SRPMS"/*.rpm "${tmpdir}/RPMS"/*/*rpm .
-- 
cgit v1.2.3-70-g09d2


From 3c86526b812120f756ecfbebaebea22b5ff5e665 Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Sun, 4 Feb 2024 06:04:10 -0300
Subject: build: mkrpm.sh: use set -e

To abort the build if any error occurs.

See also commit 7d9db8355 ("fail build if any step in the script fails",
2019-06-21).
---
 platform/rpm/mkrpm.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/rpm/mkrpm.sh b/platform/rpm/mkrpm.sh
index a8e7e55ab..da0c19c18 100755
--- a/platform/rpm/mkrpm.sh
+++ b/platform/rpm/mkrpm.sh
@@ -8,6 +8,8 @@
 # Builds rpms in a temporary directory then places the result in the
 # current working directory.
 
+set -e
+
 # shellcheck source=config.sh
 . "$(dirname "$0")/../../config.sh" || exit 1
 
-- 
cgit v1.2.3-70-g09d2


From 44b4657969356bf65f5b76bef38cf3e357a984a9 Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Wed, 13 Dec 2023 22:26:23 -0300
Subject: build: mkrpm.sh: allow / in configure args

---
 platform/rpm/mkrpm.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/rpm/mkrpm.sh b/platform/rpm/mkrpm.sh
index da0c19c18..0221fa607 100755
--- a/platform/rpm/mkrpm.sh
+++ b/platform/rpm/mkrpm.sh
@@ -38,9 +38,9 @@ trap cleanup EXIT
 
 # Create the spec file
 tmp_spec_file="${tmpdir}/SPECS/${name}.spec"
-sed -e "s/__NAME__/${name}/g" \
-    -e "s/__VERSION__/${version}/g" \
-    -e "s/__CONFIG_OPT__/${config_opt}/g" \
+sed -e "s|__NAME__|${name}|g" \
+    -e "s|__VERSION__|${version}|g" \
+    -e "s|__CONFIG_OPT__|${config_opt}|g" \
     "platform/rpm/${name}.spec" >"${tmp_spec_file}"
 # FIXME: We could parse RELNOTES and create a %changelog section here
 
-- 
cgit v1.2.3-70-g09d2


From 543ba298f18b5b29171153934d2267f6afaf7694 Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Tue, 6 Feb 2024 01:30:04 -0300
Subject: ci: remove unused configure arguments in rpm jobs

They are not being properly forwarded to mkrpm.sh (which re-runs
./configure before the actual build), so just remove them for now.
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08b006f74..33835ba71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ build_redhat_package:
         - dnf update -y
         - dnf install -y rpm-build gcc make
         - ./ci/printenv.sh
-        - ./configure --prefix=/usr || (cat config.log; exit 1)
+        - ./configure || (cat config.log; exit 1)
         - make rpms
         - rpm -i firejail*.rpm
         - command -V firejail && firejail --version
@@ -59,7 +59,7 @@ build_fedora_package:
         - dnf update -y
         - dnf install -y rpm-build gcc make
         - ./ci/printenv.sh
-        - ./configure --prefix=/usr || (cat config.log; exit 1)
+        - ./configure || (cat config.log; exit 1)
         - make rpms
         - rpm -i firejail*.rpm
         - command -V firejail && firejail --version
-- 
cgit v1.2.3-70-g09d2