zimpl.spec

@@ -33,9 +33,9 @@ Patch:          %{name}-test-bsearch.patch
 
 # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
-BuildSystem:    cmake
 
 BuildRequires:  bison
+BuildRequires:  cmake
 BuildRequires:  flex
 BuildRequires:  gcc
 BuildRequires:  pkgconfig(gmp)
@@ -80,14 +80,18 @@ that use libzimpl.
 %prep
 %autosetup -p1
 
+%conf
 # Avoid warnings about obsolete invocations of grep
 sed -i 's/fgrep/grep -F/' check/check.sh
 
-%conf -p
+%build
 export CFLAGS='%{build_cflags} -DFREEMEM -DNO_MSHELL'
 export CXXFLAGS='%{build_cxxflags} -DFREEMEM -DNO_MSHELL'
+%cmake
+%cmake_build
 
-%install -a
+%install
+%cmake_install
 mkdir -p %{buildroot}%{_mandir}/man1
 cp -p doc/zimpl.man %{buildroot}%{_mandir}/man1/zimpl.1
 
@@ -99,9 +103,9 @@ mkdir -p %{_vpath_builddir}/zimpl
 ln -s ../../src/zimpl/mmlscan.l %{_vpath_builddir}/zimpl
 ln -s ../../src/zimpl/mmlparse2.y %{_vpath_builddir}/zimpl
 
-%check
 # FIXME: Test qubo.zpl (qbo: lp) fails on ppc64le
 %ifnarch %{power64}
+%check
 export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 cd check
 sh check.sh ../%{_vpath_builddir}/bin/zimpl