diff --git a/subversion.spec b/subversion.spec index e5d7340..cd1fbc2 100644 --- a/subversion.spec +++ b/subversion.spec @@ -14,10 +14,12 @@ %bcond_without python2 %bcond_with python3 %bcond_without pyswig +%bcond_without ruby %else %bcond_with python2 %bcond_without python3 %bcond_without pyswig +%bcond_with ruby %endif %ifarch %{power64} s390x @@ -199,6 +201,7 @@ BuildArch: noarch This package includes the JNI bindings to the Subversion libraries. %endif +%if %{with ruby} %package ruby Summary: Ruby bindings to the Subversion libraries BuildRequires: ruby-devel >= 1.9.1, ruby >= 1.9.1 @@ -208,6 +211,7 @@ Conflicts: ruby-libs%{?_isa} < 1.8.2 %description ruby This package includes the Ruby bindings to the Subversion libraries. +%endif %package tools Summary: Supplementary tools for Subversion @@ -223,6 +227,13 @@ This package includes supplementary tools for use with Subversion. %patch4 -p1 -b .rubybind %patch5 -p1 -b .swigplWall +: +: === Building: +: === Python3=%{with python3} Python2=%{with python2} PySwig=%{with pyswig} +: === Java=%{with_java} Ruby=%{with ruby} +: === BDB=%{with bdb} Tests=%{with tests} KWallet=%{with kwallet} +: + %build # Regenerate the buildsystem, so that any patches applied to # configure, swig bindings etc take effect. @@ -285,7 +296,10 @@ make %{?_smp_mflags} all tools %if %{with pyswig} make swig-py swig-py-lib %{swigdirs} %endif -make swig-pl swig-pl-lib swig-rb swig-rb-lib +make swig-pl swig-pl-lib +%if %{with ruby} +make swig-rb swig-rb-lib +%endif %if %{with_java} # javahl-javah does not parallel-make with javahl #make javahl-java javahl-javah @@ -537,9 +551,11 @@ make check-javahl %{_libdir}/libsvn_swig_perl* %{_mandir}/man*/*::* +%if %{with ruby} %files ruby %{_libdir}/libsvn_swig_ruby* %{ruby_vendorarchdir}/svn +%endif %if %{with_java} %files javahl @@ -549,6 +565,7 @@ make check-javahl %changelog * Mon Jun 1 2020 Joe Orton - 1.14.0-1 - update to 1.14.0 (#1840565, #1812195) +- disable Ruby bindings, failing tests with Ruby 2.7 * Tue May 19 2020 Joe Orton - 1.14.0~rc2-2 - switch subpackages to lock-step requires on -libs rather than subversion