[rpms/ddnet] exclude-empty-files: Fix ninja build, by replacing %(make|ninja)_build and %(make|ninja)_install with %cmake_build and %cmake_install respectively

[rpms/ddnet] exclude-empty-files: Fix ninja build, by replacing %(make|ninja)_build and %(make|ninja)_install with %cmake_build and %cmake_install respectively

[@ 2026-09-03 0:10 UTC (permalink / raw)]

          A new commit has been pushed.

          Repo   : rpms/ddnet
          Branch : exclude-empty-files
          Commit : 2b100a0049c1429673a305e5c213423cec4477a6
          Author : Sérgio M. Basto <sergio@serjux.com>
          Date   : 2021-08-10T00:23:19+01:00
          Stats  : +9/-18 in 1 file(s)
          URL    : https://src.fedoraproject.org/rpms/ddnet/c/2b100a0049c1429673a305e5c213423cec4477a6?branch=exclude-empty-files

          Log:
          Fix ninja build, by replacing %(make|ninja)_build and %(make|ninja)_install with %cmake_build and %cmake_install respectively
reference: https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds#Migration

---
diff --git a/ddnet.spec b/ddnet.spec
index cfbc20b..97ebc75 100644
--- a/ddnet.spec
+++ b/ddnet.spec
@@ -3,7 +3,7 @@
 
 Name:           ddnet
 Version:        15.5.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DDraceNetwork, a cooperative racing mod of Teeworlds
 
 # Disabled while can't fix build
@@ -122,22 +122,13 @@ rm -rf src/engine/external
     %{?with_ninja_build: -GNinja} \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DPREFER_BUNDLED_LIBS=OFF \
-    -DAUTOUPDATE=OFF \
-    ..
+    -DAUTOUPDATE=OFF
 
-%if %{with ninja_build}
-%ninja_build -C %{_target_platform}
-%else
-%cmake_build -C %{_target_platform}
-%endif
+%cmake_build
 
 
 %install
-%if %{with ninja_build}
-%ninja_install -C %{_target_platform}
-%else
-%cmake_install -C %{_target_platform}
-%endif
+%cmake_install
 
 # Install man pages...
 install -Dp -m 0644 man/DDNet.6 %{buildroot}%{_mandir}/man6/DDNet.6
@@ -145,11 +136,7 @@ install -Dp -m 0644 man/DDNet-Server.6 %{buildroot}%{_mandir}/man6/DDNet-Server.
 
 
 %check
-%if %{with ninja_build}
-%ninja_build run_tests -C %{_target_platform}
-%else
-%cmake_build run_tests -C %{_target_platform}
-%endif
+%cmake_build --target run_tests
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 
@@ -176,6 +163,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 
 
 %changelog
+* Mon Aug 09 2021 Sérgio Basto <sergio@serjux.com> - 15.5.4-3
+- Fix ninja build, by replacing %%(make|ninja)_build and %%(make|ninja)_install with %%cmake_build and %%cmake_install respectively
+  reference: https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds#Migration
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 15.5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild