From 35ee79c61940ead1a289ceb3ddab93ce45a93270 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Aug 05 2020 02:06:06 +0000 Subject: Fix FTBFS (rhbz#1863878) Update cmake macros to cmake system-wide change. --- diff --git a/ignition-msgs.spec b/ignition-msgs.spec index 07373b3..bfc8fc1 100644 --- a/ignition-msgs.spec +++ b/ignition-msgs.spec @@ -1,3 +1,4 @@ +%undefine __cmake_in_source_build %global abiver 1 Name: ignition-msgs @@ -44,9 +45,8 @@ Automatically generated API documentation for the ignition-msgs library %autosetup %build -mkdir build; cd build export CXXFLAGS="%{optflags} -Wl,--as-needed" -%cmake .. \ +%cmake \ %ifnarch x86_64 -DSSE2_FOUND=FALSE \ %endif @@ -56,25 +56,24 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed" -DSSE4_2_FOUND=FALSE \ -DCMAKE_C_FLAGS_ALL="%{optflags}" \ -DCMAKE_CXX_FLAGS_ALL="%{optflags}" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DCMAKE_BUILD_TYPE=Release -make %{?_smp_mflags} -make doc +%cmake_build +%cmake_build --target doc %install -%make_install -C build +%cmake_install rm -fr %{buildroot}%{_prefix}/lib/ruby %check -make -C build test - -%ldconfig_scriptlets +%ctest %files %license COPYING LICENSE %doc AUTHORS NEWS README.md -%{_libdir}/*.so.* +%{_libdir}/*.so.%{version} +%{_libdir}/*.so.%{abiver} %{_datadir}/ignition %files devel @@ -85,7 +84,7 @@ make -C build test %files doc %license COPYING LICENSE -%doc build/doxygen/html +%doc %{_vpath_builddir}/doxygen/html %changelog * Sat Aug 01 2020 Fedora Release Engineering - 1.0.0-8