From 359a1232cb6e3354ab56e89f9dc2e6cc08ed7f03 Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Jul 28 2020 21:47:41 +0000 Subject: Fix cmake build --- diff --git a/gammu.spec b/gammu.spec index e70c22a..6592a68 100644 --- a/gammu.spec +++ b/gammu.spec @@ -87,8 +87,6 @@ developing applications that use %{name} %patch0 -p1 -b .udev %build -mkdir build -pushd build %cmake3 \ -DENABLE_BACKUP=ON \ -DWITH_NOKIA_SUPPORT=ON \ @@ -107,11 +105,10 @@ pushd build -DWITH_SYSTEMD=ON \ -DSYSTEMD_SERVICES_INSTALL_DIR=%{_unitdir} \ ../ -%make_build -popd +%cmake_build %install -%make_install -C build +%cmake_install # Install config file install -d %{buildroot}%{_sysconfdir} @@ -122,10 +119,9 @@ install -pm 0644 docs/config/smsdrc %{buildroot}%{_sysconfdir}/gammu-smsdrc %check %if %{with tests} -pushd build # add %%{?_smp_mflags} breaks the tests -ctest3 -V -popd +%global _smp_mflags %{nil} +%ctest3 %endif %post @@ -174,6 +170,7 @@ fi %changelog * Mon Jul 27 2020 Fedora Release Engineering - 1.41.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +- Fix cmake build * Tue Jan 28 2020 Fedora Release Engineering - 1.41.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild