diff --git a/lasso.spec b/lasso.spec index 40e309f..1640999 100644 --- a/lasso.spec +++ b/lasso.spec @@ -58,7 +58,7 @@ Summary: Liberty Alliance Single Sign On Name: lasso Version: 2.6.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Libraries Source: http://dev.entrouvert.org/lasso/lasso-%{version}.tar.gz @@ -70,6 +70,19 @@ Patch4: versioned-python-configure.patch BuildRequires: libtool autoconf automake +# The Lasso build system requires python, especially the binding generators +%if %{with_python2} +BuildRequires: python2 +BuildRequires: python2-lxml +BuildRequires: python2-six +%endif + +%if %{with_python3} +BuildRequires: python3 +BuildRequires: python3-lxml +BuildRequires: python3-six +%endif + %if %{with_wsf} BuildRequires: cyrus-sasl-devel %endif @@ -79,7 +92,6 @@ BuildRequires: libxml2-devel, openssl-devel BuildRequires: xmlsec1-devel >= 1.2.25-4, xmlsec1-openssl-devel >= 1.2.25-4 BuildRequires: zlib-devel, check-devel BuildRequires: libtool autoconf automake -BuildRequires: python2-six Url: http://lasso.entrouvert.org/ Requires: xmlsec1 >= 1.2.25-4 @@ -138,7 +150,6 @@ Java language bindings for the lasso (Liberty Alliance Single Sign On) library. Summary: Liberty Alliance Single Sign On (lasso) PHP bindings Group: Development/Libraries BuildRequires: php-devel, expat-devel -BuildRequires: python2 Requires: %{name}%{?_isa} = %{version}-%{release} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} @@ -154,7 +165,6 @@ PHP language bindings for the lasso (Liberty Alliance Single Sign On) library. Summary: Liberty Alliance Single Sign On (lasso) Python bindings Group: Development/Libraries BuildRequires: python2-devel -BuildRequires: python2-lxml Requires: python2 Requires: %{name}%{?_isa} = %{version}-%{release} %if %{obsolete_old_lang_subpackages} @@ -174,7 +184,6 @@ library. Summary: Liberty Alliance Single Sign On (lasso) Python bindings Group: Development/Libraries BuildRequires: python3-devel -BuildRequires: python3-lxml Requires: python3 Requires: %{name}%{?_isa} = %{version}-%{release} @@ -307,6 +316,9 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name} %endif %changelog +* Tue Jul 17 2018 - 2.6.0-8 +- more py2/py3 build dependencies fixes + * Fri Jul 13 2018 Fedora Release Engineering - 2.6.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild