public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/dionaea] rawhide: Fix build with CMake 4.0
@ 2026-06-14 22:31 Yaakov Selkowitz
  0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-06-14 22:31 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/dionaea
            Branch : rawhide
            Commit : 589dce91c5fb53e0c33ccda0a15c995ad4ed79f9
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-06-14T18:31:14-04:00
            Stats  : +4/-7 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/dionaea/c/589dce91c5fb53e0c33ccda0a15c995ad4ed79f9?branch=rawhide

            Log:
            Fix build with CMake 4.0

The cmake3 names are no longer provided, but EPEL 7 compatibility is no
longer required either.

---
diff --git a/dionaea.spec b/dionaea.spec
index 99687ff..c160d69 100644
--- a/dionaea.spec
+++ b/dionaea.spec
@@ -115,12 +115,8 @@ Patch19:        dionaea-19_setuptools.patch
 # Reported https://github.com/DinoTools/dionaea/pull/345
 Patch20:        dionaea-20_fix_cython3.1_build.patch
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
 BuildRequires:  cmake
 BuildRequires:  cmake-rpm-macros
-%else
-BuildRequires:  cmake3
-%endif
 
 BuildRequires:  make
 BuildRequires:  libtool
@@ -276,19 +272,20 @@ EOF
 
 # ============= Build ==========================================================
 %build
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
 export SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
 # %%configure --enable-python --with-python=`which python3` --with-glib=glib --with-nl-include=/usr/include/libnl3 --disable-werror
 # %%make_build CFLAGS="%%{optflags} -Wno-error -D_GNU_SOURCE -std=c99"
 
 # cmake build with higher parralelism ends up with errors for Fedora
-%cmake3 \
+%cmake \
     -L \
     -DCMAKE_INSTALL_FULL_SYSCONFDIR:PATH=%{_sysconfdir} \
     -DCMAKE_INSTALL_FULL_LIBDIR:PATH=%{_libdir} \
     -DCMAKE_INSTALL_FULL_LOCALSTATEDIR:PATH=%{_localstatedir} \
     -DDIONAEA_PYTHON_SITELIBDIR:PATH=%{python3_sitearch}
 
-%cmake3_build -j1 --verbose --verbose
+%cmake_build -j1 --verbose --verbose
 
 cd doc
 make html
@@ -300,7 +297,7 @@ cd ..
 
 # ============= Install ========================================================
 %install
-%cmake3_install
+%cmake_install
 
 # Use only the sitearch directory, otherwise python will be confused
 # by not having native and python modules in the same directory

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-14 22:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-14 22:31 [rpms/dionaea] rawhide: Fix build with CMake 4.0 Yaakov Selkowitz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox