From b8a0db79f196725aef26919f05fb19c18b365b32 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Jul 23 2020 20:52:37 +0000
Subject: Update for cmake changes in Rawhide.


---

diff --git a/pl.spec b/pl.spec
index 5b0045f..96a7191 100644
--- a/pl.spec
+++ b/pl.spec
@@ -18,7 +18,7 @@
 
 Name:       pl
 Version:    8.2.1
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    SWI-Prolog - Edinburgh compatible Prolog compiler
 #LICENSE:                               BSD
 #library/qsave.pl                       BSD
@@ -315,37 +315,34 @@ export DISABLE_PKGS="jpl"
 %endif
 
 # Build
-mkdir build
-cd build
 %cmake \
   -DBUILD_PDF_DOCUMENTATION:BOOL=ON \
   -DCPACK_GENERATOR:STRING=RPM \
   -DGET0SIG_CONST_T:STRING=const \
   -DJQUERYDIR:STRING=%{_datadir}/javascript/jquery/latest \
   -DSWIPL_VERSIONED_DIR:BOOL=ON \
-  -G Ninja ..
-ninja
+  -G Ninja .
+%cmake_build
 
 # Switch back before installing; see above
-cp -p ../packages/jpl/jpl.pl.install home/library/jpl.pl
+mv packages/jpl/jpl.pl.install packages/jpl/jpl.pl
 
 
 %install
-cd build
 # See <http://www.swi-prolog.org/build/guidelines.html> for file layout
-DESTDIR=%{buildroot} ninja install
+%cmake_install
 
 # Script with shebang should be executable
 chmod 0755 %{buildroot}%{_libdir}/swipl-%{version}/library/dialect/sicstus/swipl-lfr.pl
 chmod 0755 %{buildroot}%{_libdir}/swipl-%{version}/customize/edit
 
 # Some XPCE files do not get installed
-cp -p ../packages/xpce/man/*.1 %{buildroot}%{_mandir}/man1
+cp -p packages/xpce/man/*.1 %{buildroot}%{_mandir}/man1
 
 %if %{with_java}
 # Move the JPL JNI stuff to where the Java packaging guidelines 
 # say it should be
-jpl_ver=$(sed -n 's/.*JPL_VERSION \([.[:digit:]]*\).*/\1/p' ../packages/jpl/CMakeLists.txt)
+jpl_ver=$(sed -n 's/.*JPL_VERSION \([.[:digit:]]*\).*/\1/p' packages/jpl/CMakeLists.txt)
 
 pushd %{buildroot}%{_libdir}
 mkdir -p swipl-jpl
@@ -466,7 +463,7 @@ rm %{buildroot}%{_libdir}/swipl-%{version}/customize/README.md
 
 %files doc
 %{_libdir}/swipl-%{version}/doc/
-%doc build/man/SWI-Prolog-%{version}.pdf
+%doc %{__cmake_builddir}/man/SWI-Prolog-%{version}.pdf
 %doc %{docdir}-xpce/*
 
 %files odbc
@@ -485,6 +482,9 @@ rm %{buildroot}%{_libdir}/swipl-%{version}/customize/README.md
 
 
 %changelog
+* Thu Jul 23 2020 Jerry James <loganjerry@gmail.com> - 8.2.1-3
+- Update for cmake changes in Rawhide
+
 * Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 8.2.1-2
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11