From fdcc9f9b848ac662304b30ddbc533ab8c3b1c887 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Fri, 19 Dec 2025 17:52:05 +0100
Subject: [PATCH] fix fedora package

---
 CMakeLists.txt                | 19 +++++++++++++------
 docker/test/fedora/Dockerfile |  7 +++----
 packaging/biboumi.spec.cmake  | 11 ++++++-----
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d05db4..c2f4188 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -350,9 +350,7 @@ install(FILES   ${policy_files}                             DESTINATION etc/bibo
 #
 add_custom_command(OUTPUT ${ARCHIVE_NAME}.tar.xz
   COMMAND git archive --prefix=${ARCHIVE_NAME}/ --format=tar HEAD^{tree}
-          > ${CMAKE_CURRENT_BINARY_DIR}/${ARCHIVE_NAME}.tar
-  # Append this specific file that is not part of the git repo
-  COMMAND tar -rf ${CMAKE_CURRENT_BINARY_DIR}/${ARCHIVE_NAME}.tar -P ${SOURCE_DIR}/single_include/catch.hpp --xform 's|/.*/|${ARCHIVE_NAME}/tests/|g'
+        --output=${CMAKE_CURRENT_BINARY_DIR}/${ARCHIVE_NAME}.tar
   # Remove a potential existing archive
   COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/${ARCHIVE_NAME}.tar.xz
   # Compress the archive
@@ -360,12 +358,21 @@ add_custom_command(OUTPUT ${ARCHIVE_NAME}.tar.xz
   COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "${ARCHIVE_NAME}.tar.xz created."
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
   )
+
 add_custom_target(dist
-  DEPENDS ${ARCHIVE_NAME}.tar.xz
-  DEPENDS catch)
+  DEPENDS ${ARCHIVE_NAME}.tar.xz)
+
+# The forge only provides .tar.gz, so make this target to be used to simulate
+# downloading a tarball
+add_custom_command(OUTPUT ${RPM_VERSION}.tar.gz
+  COMMAND git archive --prefix=${ARCHIVE_NAME}/ --format=tar.gz HEAD^{tree}
+          --output=${CMAKE_CURRENT_BINARY_DIR}/${RPM_VERSION}.tar.gz
+  COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "${RPM_VERSION}.tar.gz created."
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  )
 
 add_custom_target(rpm
-  DEPENDS dist
+  DEPENDS ${RPM_VERSION}.tar.gz
   COMMAND mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
   COMMAND rpmbuild --define "_topdir `pwd`/rpmbuild/" --define "_sourcedir `pwd`" -ba biboumi.spec
   )
diff --git a/docker/test/fedora/Dockerfile b/docker/test/fedora/Dockerfile
index cdab0c4..a5b3dec 100644
--- a/docker/test/fedora/Dockerfile
+++ b/docker/test/fedora/Dockerfile
@@ -1,12 +1,11 @@
 # This Dockerfile creates a docker image suitable to run biboumi’s build and
 # tests.  For example, it can be used on with gitlab-ci.
 
-FROM docker.io/fedora:latest
+FROM docker.io/fedora:44
 
 ARG ERGO_VERSION=2.16.0
 ENV LC_ALL=C.UTF-8
 
-# TODO: upgrade to botan3
 RUN dnf --refresh install -y \
 git \
 make \
@@ -17,7 +16,7 @@ udns-devel \
 expat-devel \
 libidn-devel \
 sqlite-devel \
-botan2-devel \
+botan3-devel \
 systemd-devel \
 libuuid-devel \
 libgcrypt-devel \
@@ -25,7 +24,7 @@ postgresql-devel \
 lcov \
 libasan \
 libubsan \
-catch \
+catch-devel \
 valgrind \
 python3-pip \
 python3-lxml \
diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake
index 1352505..7dc30d0 100644
--- a/packaging/biboumi.spec.cmake
+++ b/packaging/biboumi.spec.cmake
@@ -4,8 +4,8 @@ Release:  1%{?dist}
 Summary:  Lightweight XMPP to IRC gateway
 
 License:  zlib
-URL:      http://biboumi.louiz.org
-Source0:  http://git.louiz.org/biboumi/snapshot/biboumi-%{version}.tar.xz
+URL:      https://biboumi.codeberg.page/
+Source0:  https://codeberg.org/poezio/biboumi/archive/%{version}.tar.gz
 
 BuildRequires: libidn-devel
 BuildRequires: expat-devel
@@ -13,7 +13,8 @@ BuildRequires: libuuid-devel
 BuildRequires: systemd-devel
 BuildRequires: sqlite-devel
 BuildRequires: postgresql-devel
-BuildRequires: botan2-devel
+BuildRequires: botan3-devel
+BuildRequires: catch-devel
 BuildRequires: cmake
 BuildRequires: systemd
 BuildRequires: python3-sphinx
@@ -64,8 +65,8 @@ make check %{?_smp_mflags}
 
 
 %changelog
--* ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1
--- Build latest git revision
+* ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1
+  Build latest git revision
 
 * Tue Sep 22 2020 Le Coz Florent <louiz@louiz.org> - 9.0-1
   Update to version 9.0