diff --git a/pl.spec b/pl.spec index 220e3bc..4a8cca8 100644 --- a/pl.spec +++ b/pl.spec @@ -17,8 +17,8 @@ %endif Name: pl -Version: 8.2.1 -Release: 4%{?dist} +Version: 8.2.2 +Release: 1%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler #LICENSE: BSD #library/qsave.pl BSD @@ -88,8 +88,9 @@ Patch0: swipl-8.2.0-Remove-files-locations-from-swipl-1-manual.patch Patch1: swipl-8.2.1-Fix-JNI.patch # Unbundle libstemmer Patch2: swipl-8.2.0-unbundle-libstemmer.patch -# Fix a bad BibTeX entry -Patch3: swipl-8.2.1-bad-bibtex-entry.patch +# Fix a LaTeX error when labels contain underscores +Patch3: swipl-8.2.2-underscore.patch + BuildRequires: cmake BuildRequires: findutils BuildRequires: gcc-c++ @@ -257,11 +258,7 @@ in Prolog. In both setups it provides a re-entrant bidirectional interface. %prep %global docdir doc-install -%setup -q -n swipl-%{version} -%patch0 -p1 -b .man-files -%patch1 -p1 -b .jni -%patch2 -p1 -b .libstemmer -%patch3 -p1 -b .bibtex +%autosetup -p1 -n swipl-%{version} # Fix the installation path on 64-bit systems if [ "%{_lib}" = "lib64" ]; then @@ -282,8 +279,8 @@ popd cp -p %{SOURCE2} . # Adjustments to take into account the new location of JNI stuff -sed --in-place=.jni2 -e 's#LIBDIR#%{_libdir}#g' packages/jpl/jpl.pl -sed --in-place=.jni2 -e 's#LIBDIR#"%{_libdir}/swipl-jpl"#g' packages/jpl/src/main/java/org/jpl7/JPL.java +sed --in-place=.jni -e 's#LIBDIR#%{_libdir}#g' packages/jpl/jpl.pl +sed --in-place=.jni -e 's#LIBDIR#"%{_libdir}/swipl-jpl"#g' packages/jpl/src/main/java/org/jpl7/JPL.java # Find junit.jar sed --in-place 's,\(%{_datadir}/java/junit\)4\.jar,\1.jar,' \ @@ -348,11 +345,9 @@ pushd %{buildroot}%{_libdir} mkdir -p swipl-jpl mv swipl-%{version}/lib/%{swipl_arch}/libjpl.so swipl-jpl/ mv swipl-%{version}/lib/jpl.jar swipl-jpl/ -mv swipl-%{version}/lib/jpl-${jpl_ver}.jar swipl-jpl/ # Original locations are referenced by internal libraries and examples ln -s ../../../swipl-jpl/libjpl.so swipl-%{version}/lib/%{swipl_arch}/libjpl.so ln -s ../../swipl-jpl/jpl.jar swipl-%{version}/lib/jpl.jar -ln -s ../../swipl-jpl/jpl-${jpl_ver}.jar swipl-%{version}/lib/jpl-${jpl_ver}.jar popd %endif @@ -463,7 +458,7 @@ rm %{buildroot}%{_libdir}/swipl-%{version}/customize/README.md %files doc %{_libdir}/swipl-%{version}/doc/ -%doc %{__cmake_builddir}/man/SWI-Prolog-%{version}.pdf +%doc %{_vpath_builddir}/man/SWI-Prolog-%{version}.pdf %doc %{docdir}-xpce/* %files odbc @@ -482,6 +477,11 @@ rm %{buildroot}%{_libdir}/swipl-%{version}/customize/README.md %changelog +* Tue Oct 27 2020 Jerry James - 8.2.2-1 +- Version 8.2.2 +- Remove upstreamed -bad-bibtex-entry patch +- Add -underscore patch to work around LaTeX errors + * Tue Jul 28 2020 Fedora Release Engineering - 8.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index f31eac2..5c7be1b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (userguide.html.tgz) = baa16d8f06a666e77ef45aaf7708e877710bfcb8fc0fb519bc70c54619c45def2d2ab4feaa0f1a1875b2a2270e8907551b63582da1b4beaa5b50f013a41d7ab9 -SHA512 (swipl-8.2.1_repackaged.tar.gz) = 644e59dcf69fc69155ae1ba21cf9b04eca2454d3602687be5d1c24aaaa151a41da97556c44f52ff0bc96e8ed5f4b8970c34e28d4591f55caa93e8cbcfd192987 +SHA512 (swipl-8.2.2_repackaged.tar.gz) = 63736e8e245dedc3e177084d1d3e89ce41adcb3c079701b502ae867d762c638f4eb363e658641a8ca97badcf43e40290251481d40a7bd677e9a5dfb784be6943 diff --git a/swipl-8.2.1-bad-bibtex-entry.patch b/swipl-8.2.1-bad-bibtex-entry.patch deleted file mode 100644 index 701c3e5..0000000 --- a/swipl-8.2.1-bad-bibtex-entry.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/man/pl.bib -+++ b/man/pl.bib -@@ -1111,7 +1111,7 @@ pages = {14--17} - Languages Implementation and Logic Programming (PLILP'94)}, LNCS - 844, Madrid 1994. - --@inproceedings{DBLP:dblpjournals/tplp/CovingtonBOWP12, -+@article{DBLP:dblpjournals/tplp/CovingtonBOWP12, - author = {Michael A. Covington and - Roberto Bagnara and - Richard A. O'Keefe and -@@ -1119,6 +1119,8 @@ pages = {14--17} - Simon Price}, - title = {Coding guidelines for {Prolog}.}, - journal = {{TPLP}}, -+ volume = {12}, -+ number = {6}, - year = {2012}, - pages = {889-927}, - ee = {http://journals.cambridge.org/action/displayAbstract?aid} diff --git a/swipl-8.2.2-underscore.patch b/swipl-8.2.2-underscore.patch new file mode 100644 index 0000000..daf9f27 --- /dev/null +++ b/swipl-8.2.2-underscore.patch @@ -0,0 +1,37 @@ +This prevents a LaTeX error when labels contain underscores: + +(./SWI-Prolog-8.2.2.aux (./intro.aux) (./overview.aux) (./ide.aux) +(./builtin.aux +! Missing \endcsname inserted. + + \protect +l.12 ...{Redicate indicators}{subsection.4.1.2}{}} + +? +! Emergency stop. + + \protect +l.12 ...{Redicate indicators}{subsection.4.1.2}{}} + +End of file on the terminal! + +--- a/man/builtin.doc 2020-10-27 05:10:19.000000000 -0600 ++++ b/man/builtin.doc 2020-10-27 12:43:43.386433966 -0600 +@@ -78,7 +78,7 @@ See also \secref{metacall} for examples + \secref{metapred} for mode flags to label meta-predicate arguments in + module export declarations. + +-\subsection{Redicate indicators} \label{sec:predicate_indic} ++\subsection{Redicate indicators} \label{sec:predicate:indic} + + \index{predicate indicator}% + Referring to a predicate in running text is done using a +@@ -87,7 +87,7 @@ predicate indicator is a term \exam{[