From 0e2f720fd162e93a1157d5e240446edc62109820 Mon Sep 17 00:00:00 2001 From: Sam Fowler Date: Thu, 19 Feb 2026 14:01:30 +1000 Subject: [PATCH 1/2] make-srpm.sh: update cmake macros and deps for cmake4 It seems that %cmake4 macros are no long provided in rawhide, nor is there a `Provides: cmake4`. https://fedoraproject.org/wiki/Changes/CMake4.0 --- make-srpm.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/make-srpm.sh b/make-srpm.sh index b0e2aab..b04ce30 100755 --- a/make-srpm.sh +++ b/make-srpm.sh @@ -90,7 +90,6 @@ fi cat > "$SPEC" << EOF # Disable in source builds on EPEL <9 %undefine __cmake_in_source_build -%undefine __cmake3_in_source_build Name: $PKG Version: $VER @@ -102,7 +101,7 @@ URL: https://github.com/csutils/%{name} Source0: https://github.com/csutils/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz BuildRequires: asciidoc -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: gcc # csmock copies the resulting cscppc binary into mock chroot, which may contain @@ -165,19 +164,19 @@ in background fully transparently. %autosetup %build -%cmake3 \\ +%cmake \\ -DPATH_TO_CSCPPC=\"%{_libdir}/cscppc\" \\ -DPATH_TO_CSCLNG=\"%{_libdir}/csclng\" \\ -DPATH_TO_CSGCCA=\"%{_libdir}/csgcca\" \\ -DPATH_TO_CSMATCH=\"%{_libdir}/csmatch\" \\ -DSTATIC_LINKING=ON -%cmake3_build +%cmake_build %check -%ctest3 +%ctest %install -%cmake3_install +%cmake_install install -m0755 -d "%{buildroot}%{_libdir}"{,/cs{cppc,clng,gcca,match}} From 0755837906dae073f5a64fe8796264b3ed64ac89 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 3 Jun 2026 09:57:41 +0200 Subject: [PATCH 2/2] ci: disable Coverity on the `main` branch temporarily The service has been down for quite some time now causing the CI to fail: ``` curl https://scan.coverity.com/download/other/linux64 \ % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 59 0 0 100 59 0 378 --:--:-- --:--:-- --:--:-- 378 100 1608 0 1549 100 59 7470 284 --:--:-- --:--:-- --:--:-- 7730 Error: Unable to process file command 'output' successfully. Error: Invalid format ' ' ``` --- .github/workflows/coverity.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 33c9a33..19cfb31 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -3,7 +3,9 @@ name: Coverity on: push: - branches: [main] + branches: + - coverity + # - main jobs: coverity: