#1 Make it buildable for EPEL
Merged 2 years ago by jjames. Opened 2 years ago by dcavalca.
rpms/ dcavalca/pl epel-fixes  into  rawhide

file modified
+18 -1
@@ -17,7 +17,7 @@ 

  

  Name:       pl

  Version:    8.4.3

- Release:    3%{?dist}

+ Release:    4%{?dist}

  Summary:    SWI-Prolog - Edinburgh compatible Prolog compiler

  #LICENSE:                               BSD

  #library/qsave.pl                       BSD
@@ -99,7 +99,12 @@ 

  BuildRequires:  pkgconfig(libpcre)

  BuildRequires:  pkgconfig(libtcmalloc)

  BuildRequires:  pkgconfig(ncurses)

+ %if 0%{?el8}

+ # on el8 readline isn't picked up by pkgconfig

+ BuildRequires:  readline-devel

+ %else

  BuildRequires:  pkgconfig(readline)

+ %endif

  # archive

  BuildRequires:  pkgconfig(libarchive)

  # http
@@ -143,9 +148,12 @@ 

  # zlib

  BuildRequires:  pkgconfig(zlib)

  # Doc building

+ # Gated to Fedora as EL is currently missing tex(a4wide.sty)

+ %if 0%{?fedora}

  BuildRequires:  tex(latex)

  BuildRequires:  tex(a4wide.sty)

  BuildRequires:  tex(tabulary.sty)

+ %endif

  # http

  Requires:       js-jquery

  
@@ -320,7 +328,11 @@ 

  

  # Configure

  %cmake \

+ %if 0%{?fedora}

    -DBUILD_PDF_DOCUMENTATION:BOOL=ON \

+ %else

+   -DBUILD_PDF_DOCUMENTATION:BOOL=OFF \

+ %endif

    -DCPACK_GENERATOR:STRING=RPM \

    -DGET0SIG_CONST_T:STRING=const \

    -DJQUERYDIR:STRING=%{_datadir}/javascript/jquery/latest \
@@ -477,7 +489,9 @@ 

  

  %files doc

  %{_libdir}/swipl-%{version}/doc/

+ %if 0%{?fedora}

  %doc %{_vpath_builddir}/man/SWI-Prolog-%{version}.pdf

+ %endif

  %doc %{docdir}-xpce/*

  

  %files odbc
@@ -496,6 +510,9 @@ 

  

  

  %changelog

+ * Wed Aug 24 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 8.4.3-4

+ - Make it buildable for EPEL

+ 

  * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.3-3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

  

Required changes to make pl buildable in EPEL as requested in https://bugzilla.redhat.com/show_bug.cgi?id=2121160

While these don't have to be merged in the rawhide branch, having all branches in sync makes maintenance easier.

Sure, I don't mind having this in Rawhide. Thanks for the patch.

Pull-Request has been merged by jjames

2 years ago
Metadata