- PLD merge, our rpm now supports rubyprov

- updated to 2.3.6

diff --git a/ruby.spec b/ruby.spec
index bc01ec2eb134c622220b257b765829220f24a73a..b0620971b4f4f1c8d083c83996e2cddbab3ff360 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -11,9 +11,9 @@
 %bcond_with    bootstrap       # build bootstrap version
 %bcond_with    tests           # build without tests
 
-%define                rel             4
+%define                rel             1
 %define                ruby_version    2.3
-%define                patchlevel      5
+%define                patchlevel      6
 %define                pkg_version     %{ruby_version}.%{patchlevel}
 %define                ruby_suffix %{!?with_default_ruby:%{ruby_version}}
 %define                doc_version     2_3_4
@@ -35,7 +35,7 @@ License:      (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD
 Group:         Development/Languages
 # https://www.ruby-lang.org/en/downloads/
 Source0:       https://cache.ruby-lang.org/pub/ruby/%{ruby_version}/%{oname}-%{pkg_version}.tar.xz
-# Source0-md5: 7bc4c199647f9eceb66c9611f11d6da0
+# Source0-md5: 85b127e7ddaa427a63889434f2c411df
 Source2:       http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
 # Source2-md5: 7eaa030a197aec91f601810e5956f01d
 Source3:       http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
@@ -68,6 +68,7 @@ BuildRequires:        ncurses-devel
 BuildRequires: openssl-devel >= 0.9.6
 BuildRequires: pkgconfig
 BuildRequires: readline-devel >= 4.2
+BuildRequires: rpm-build >= 4.5-83
 BuildRequires: sed >= 4.0
 BuildRequires: systemtap-sdt-devel
 BuildRequires: tar >= 1:1.22
@@ -76,6 +77,7 @@ BuildRequires:        yaml-devel
 BuildRequires: zlib-devel
 %if %{without bootstrap}
 # bootstrap needs ruby binary, erb module
+BuildRequires: rpm-rubyprov
 BuildRequires: ruby
 BuildRequires: ruby-modules
 %endif
@@ -100,7 +102,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define        psych_ver               2.1.0.1
 %define        rake_ver                10.4.2
 %define        rdoc_ver                4.2.1
-%define        rubygems_ver            2.5.2.1
+%define        rubygems_ver            2.5.2.2
 %define        test_unit_ver           3.1.5
 %define        power_assert_ver        0.2.6
 %define        did_you_mean_ver        1.0.0
@@ -171,9 +173,10 @@ Summary(pl.UTF-8): Standardowe moduły i narzędzia dla języka Ruby
 Group:         Development/Languages
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Suggests:      ruby-rubygems
-# workaround for autodep generator not getting version properly
-Provides:      ruby(abi) = %{ruby_version}
+# ruby-modules deprecated, rpm generates ruby(abi) itself
 Provides:      ruby-modules(ver) = %{ruby_version}
+# FIXME later
+Provides:      ruby(abi) = %{ruby_version}
 %requires_ge_to        openssl openssl-devel
 
 %description modules