The package rpms/plplot.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/plplot.git/commit/?id=54b8b5ce8e0....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit 54b8b5ce8e0f5c2ce448d827b5612587c6f570af
Author: Orion Poplawski <orion(a)nwra.com>
Date: Thu Sep 19 21:38:20 2019 -0600
Drop octave and itcl for EPEL8
Drop perl dummy package
diff --git a/plplot.spec b/plplot.spec
index f12d6ab..3c8c30b 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -2,15 +2,13 @@
# Set to bcond_with or use --without doc to disable doc build
%bcond_without doc
# Set to bcond_with or use --without octave to disable octave support
-%if 0%{?el7}
+%if 0%{?el7}%{?el8}
# EL7 has too old of a swig -
https://bugzilla.redhat.com/show_bug.cgi?id=1136487
+# EL8 has too old of a swig -
https://bugzilla.redhat.com/show_bug.cgi?id=1753475
%bcond_with octave
%else
%bcond_without octave
%endif
-# Set to bcond_with or use --without pdl to disable pdl tests - needed to
-# bootstrap or for soname bumps in a plplot dependency
-%bcond_with pdl
# conditionalize Ada support
%ifnarch %{GNAT_arches}
@@ -31,11 +29,29 @@
%endif
%endif
+# Let's drop itcl for EPEL8
+%if 0%{?rhel} >= 8
+%bcond_with itcl
+%else
+%bcond_without itcl
+%endif
+
+#RHEL8 does not have X on s390x
+%ifarch s390x
+%if 0%{?el8}
+%bcond_with check
+%else
+%bcond_without check
+%endif
+%else
+%bcond_without check
+%endif
+
%global commit 48a56ee63d25d24eeb44f392025953a6e9cc6b3f
Name: plplot
Version: 5.14.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Library of functions for making scientific plots
License: LGPLv2+
@@ -72,23 +88,29 @@ Obsoletes: %{name}-octave < %{version}-%{release}
BuildRequires: java-devel
BuildRequires: freetype-devel, qhull-devel , ncurses-devel
BuildRequires: gd-devel, tcl-devel, tk-devel
+%if %{with itcl}
BuildRequires: itcl-devel, itk-devel
BuildRequires: iwidgets
+%endif
BuildRequires: python3-devel, python3-numpy
BuildRequires: perl(XML::DOM), lasi-devel, wxGTK3-devel
BuildRequires: gnu-free-mono-fonts
BuildRequires: gnu-free-sans-fonts
BuildRequires: gnu-free-serif-fonts
-%if %{with pdl}
-BuildRequires: perl(PDL::Graphics::PLplot)
-%endif
%if %{with doc}
BuildRequires: docbook2X
BuildRequires: doxygen
+%if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: fop
+%endif
BuildRequires: texlive-xmltex
BuildRequires: tex(ulem.sty)
+# RHEL8 does not ship xmlto-tex
+%if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: xmlto-tex
+%else
+BuildRequires: xmlto
+%endif
%endif
%if %{with ocaml}
BuildRequires: ocaml
@@ -96,7 +118,9 @@ BuildRequires: ocaml
# BuildRequires: ocaml-cairo-devel
BuildRequires: ocaml-camlidl-devel
BuildRequires: ocaml-findlib
+%if ! ( 0%{?rhel} >= 8 )
BuildRequires: ocaml-lablgtk-devel
+%endif
BuildRequires: ocaml-ocamldoc
%endif
BuildRequires: libharu-devel
@@ -106,8 +130,10 @@ BuildRequires: qt5-devel
BuildRequires: python3-qt5-devel
BuildRequires: shapelib-devel
# For %check
+%if %{with check}
BuildRequires: xorg-x11-drv-dummy
BuildRequires: mesa-dri-drivers
+%endif
BuildRequires: chrpath
Requires: gnu-free-mono-fonts
Requires: gnu-free-sans-fonts
@@ -143,6 +169,7 @@ the png and jpeg drivers that uses the Freetype library.
%package libs
Summary: Libraries for PLplot
Requires: %{name}-data = %{version}-%{release}
+Obsoletes: %{name}-perl < 5.14.0-8
%description libs
%{summary}.
@@ -273,18 +300,6 @@ Requires: octave(api) = %{octave_api}
%endif
-%package perl
-Summary: Examples for using plplot with PDL
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description perl
-%if %{with pdl}
-%{summary}.
-%else
-This is a dummy package, since pdl support was not enabled in the plplot build.
-%endif
-
-
%package pyqt
Summary: Functions for scientific plotting with PyQt
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -371,23 +386,30 @@ unset TERM
printenv
# We assume that tk version is the same as tcl, cannot check without DISPLAY
tkver=$(echo 'puts [info patchlevel]; exit' | tclsh)
+%if %{with itcl}
# Hacks to determine versions without DISPLAY
itclver=$(echo %{_libdir}/libitcl*.so | sed -e 's/.*itcl\([0-9.]*\)\.so/\1/')
itkver=$(echo %{_libdir}/libitk*.so | sed -e 's/.*itk\([0-9.]*\)\.so/\1/')
iwidgetsver=$(echo %{_datadir}/tcl*/iwidgets* | sed -e 's/.*iwidgets//')
+%endif
%cmake .. \
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-DFORTRAN_MOD_DIR:PATH=%{_fmoddir} \
-DUSE_RPATH:BOOL=OFF \
-DENABLE_ada:BOOL=ON \
-DENABLE_d:BOOL=ON \
+%if %{with itcl}
-DENABLE_itcl:BOOL=ON \
-DENABLE_itk:BOOL=ON \
+ -DPLPLOT_ITCL_VERSION=$itclver \
+ -DPLPLOT_ITK_VERSION=$itkver \
+ -DIWIDGETS_VERSIONS_LIST:STRING="$iwidgetsver;$itkver;$itclver" \
+ -DUSE_INCRTCL_VERSION_4:BOOL=ON \
+%endif
-DENABLE_lua:BOOL=ON \
-DENABLE_ocaml:BOOL=ON \
-DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \
%{build_octave} \
- -DENABLE_pdl:BOOL=ON \
-DENABLE_tk:BOOL=ON \
-DJAVAWRAPPER_DIR:PATH="%{_libdir}/plplot%{version}" \
-DNON_TRANSITIVE:BOOL=ON \
@@ -398,16 +420,11 @@ iwidgetsver=$(echo %{_datadir}/tcl*/iwidgets* | sed -e
's/.*iwidgets//')
-DPLD_svg:BOOL=ON \
-DPLD_wxwidgets:BOOL=ON \
-DPLPLOT_TK_VERSION=$tkver \
- -DPLPLOT_ITCL_VERSION=$itclver \
- -DPLPLOT_ITK_VERSION=$itkver \
- -DIWIDGETS_VERSIONS_LIST:STRING="$iwidgetsver;$itkver;$itclver" \
-DPLPLOT_USE_QT5=ON \
- -DUSE_INCRTCL_VERSION_4:BOOL=ON \
%if %{with doc}
-DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
-DBUILD_DOC:BOOL=ON \
-DBUILD_DOX_DOC:BOOL=ON \
- -DBUILD_DVI:BOOL=OFF \
%else
-DPREBUILT_DOC:BOOL=ON \
%endif
@@ -437,6 +454,7 @@ chrpath -d $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllpl*_stubs.so
%endif
+%if %{with check}
%check
cd fedora
cp %SOURCE1 .
@@ -460,6 +478,7 @@ ctest -V -E 'octave'
ctest -V -R 'octave' || :
%endif
%endif
+%endif
%files
@@ -602,7 +621,7 @@ ctest -V -R 'octave' || :
%doc %{_datadir}/plplot%{version}/examples/test_java.sh
%files lua
-%if 0%{?fedora} >= 29
+%if 0%{?fedora} || 0%{?rhel} >= 8
%{_libdir}/lua/plplot/
%else
%{_libdir}/lua/*/plplot/
@@ -644,12 +663,6 @@ ctest -V -R 'octave' || :
%doc %{_datadir}/plplot%{version}/examples/test_octave_interactive.sh
%endif
-%files perl
-%if %{with pdl}
-%doc %{_datadir}/plplot%{version}/examples/perl/
-%doc %{_datadir}/plplot%{version}/examples/test_pdl.sh
-%endif
-
%files pyqt
%{python3_sitearch}/plplot_pyqt5.so
@@ -708,6 +721,10 @@ ctest -V -R 'octave' || :
%changelog
+* Thu Sep 19 2019 Orion Poplawski <orion(a)nwra.com> - 5.14.0-8
+- Drop octave and itcl for EPEL8
+- Drop perl dummy package
+
* Mon Aug 19 2019 Miro Hronok <mhroncok(a)redhat.com> - 5.14.0-7
- Rebuilt for Python 3.8