vipr.spec

@@ -20,9 +20,9 @@ Patch:          %{name}-zlib-ng.patch
 
 # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
-BuildSystem:    cmake
 
 BuildRequires:  boost-devel
+BuildRequires:  cmake
 BuildRequires:  cmake(soplex)
 BuildRequires:  cmake(tbb)
 BuildRequires:  gcc-c++
@@ -38,23 +38,19 @@ certificates.
 %prep
 %autosetup -n %{name}-%{commit} -p1
 
-%conf -p
+%build
 cd code
+%cmake
+%cmake_build
 
-%build -p
-cd code
-
-%build -a
-%if "%{?_lto_cflags}" != ""
-# LTO inlines a few functions, leaving viprincomp with unneeded dependencies.
-# Relink to drop the unneeded dependencies.
+# For some reason, viprincomp is linked with libsoplex, even though
+# -Wl,-as-needed is in the link flags.  Relink to drop that dependency.
 cd %{_vpath_builddir}
 g++ %{build_cxxflags} %{build_ldflags} \
     -Wl,--dependency-file=CMakeFiles/viprincomp.dir/link.d \
     CMakeFiles/viprincomp.dir/incompletify.cpp.o \
     -o viprincomp -lmpfr -lgmp
-cd -
-%endif
+cd ../..
 
 %install
 #%%cmake_install does nothing, so install by hand