X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ruby.spec;h=afe22b1a2f2f780ec8504c9c71f814f00597b5ed;hb=27553c8baf5777ed22b5b47ef167c9a2688fd671;hp=c00e808a0301126e2380efc93105e65b9f15b189;hpb=50c9bd0efefdb0a2ff5c1b0fb260d3d3e7449da3;p=packages%2Fruby.git

diff --git a/ruby.spec b/ruby.spec
index c00e808..afe22b1 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,5 +1,4 @@
 # TODO:
-#	- provide standalone ruby-tk package (to replace retired -tk subpackage)
 #	- include ext/ in docs
 #	- replace ri with fastri
 #	- patch ri to search multiple indexes (one per package), so RPMs can install ri docs
@@ -11,7 +10,7 @@
 %bcond_with	bootstrap	# build bootstrap version
 %bcond_with	tests		# build without tests
 
-%define		rel		5
+%define		rel		12
 %define		ruby_version	2.4
 %define		patchlevel	4
 %define		pkg_version	%{ruby_version}.%{patchlevel}
@@ -50,12 +49,10 @@ Source53:	http://www.unicode.org/Public/9.0.0/ucd/SpecialCasing.txt
 # Source53-md5:	fea30f45a2f81ffa474fd984d297e2ea
 Source54:	http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt
 # Source54-md5:	dde25b1cf9bbb4ba1140ac12e4128b0b
-Source100:	ftp://ftp.ruby-lang.org/pub/ruby/1.8/%{oname}-1.8.7-p330.tar.gz
-# Source100-md5:	50a49edb787211598d08e756e733e42e
 Source4:	rdoc.1
 Source5:	testrb.1
 Source6:	operating_system.rb
-#Patch1:		%{oname}-ffs.patch
+Patch1:		rubygems.patch
 Patch2:		fix-bison-invocation.patch
 Patch3:		mkmf-verbose.patch
 Patch4:		strip-ccache.patch
@@ -78,6 +75,10 @@ BuildRequires:	openssl-devel >= 0.9.6
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	rpm-build >= 5.4.10-49
+# which version is minimum now? 1.8.7 is not enough, fails with:
+# ./tool/generic_erb.rb:31: syntax error, unexpected ':', expecting ')'
+# ...O.popen("tput smso", "r", err: IO::NULL, &:read) rescue nil)
+BuildRequires:	ruby >= 1:1.9
 BuildRequires:	sed >= 4.0
 BuildRequires:	systemtap-sdt-devel
 BuildRequires:	tar >= 1:1.22
@@ -87,7 +88,6 @@ BuildRequires:	zlib-devel
 %if %{without bootstrap}
 # bootstrap needs ruby binary, erb module
 BuildRequires:	rpm-rubyprov
-BuildRequires:	ruby
 BuildRequires:	ruby-modules
 %endif
 Requires(post,postun):	/sbin/ldconfig
@@ -643,8 +643,8 @@ stworzenie serwera implementującego procedury zdalne oraz klienta
 wywołującego je. Aby to osiągnąć wystarczy bardzo mało kodu.
 
 %prep
-%setup -q -n %{oname}-%{pkg_version} -a2 -a3 %{?with_bootstrap:-a100}
-#%patch1 -p1
+%setup -q -n %{oname}-%{pkg_version} -a2 -a3
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -674,6 +674,11 @@ find -type f '(' -name '*.rb' -o -name '*.cgi' -o -name '*.test' \
 	-o -name 'ruby.1' -o -name '*.html' -o -name '*.tcl' ')' \
 	| xargs %{__sed} -i 's,/usr/local/bin/,%{_bindir}/,'
 
+%if %{with bootstrap}
+# avoid regeneration, needs iostring module
+touch enc/unicode/9.0.0/*.h
+%endif
+
 %build
 rubygems_ver=$(awk '/VERSION =/ && $1 == "VERSION" {print $3}' lib/rubygems.rb | xargs)
 if [ $rubygems_ver != %{rubygems_ver} ]; then
@@ -688,17 +693,9 @@ fi
 
 cp -f /usr/share/automake/config.sub .
 
-# build ruby-1.8.7 first
-%if %{with bootstrap}
-cd %{oname}-1.8.7-p330
-%configure
-%{__make}
-cd ..
-%endif
-
 %{__autoconf}
 %configure \
-	%{?with_bootstrap:--with-baseruby=%{oname}-1.8.7-p330/miniruby} \
+	%{?with_bootstrap:--with-baseruby="%{_bindir}/ruby -I$(pwd)/lib"} \
 	--program-suffix=%{ruby_suffix} \
 	--with-archlibdir=%{_libdir} \
 	--with-rubygemsdir=%{rubygems_dir} \
@@ -720,8 +717,8 @@ cd ..
 	--with-ruby-version='' \
 
 %{__make} -j1 main \
-	COPY="cp -p" Q= \
-	%{?with_bootstrap:BASERUBY="%{oname}-1.8.7-p330/miniruby -I./ruby-1.8.7-p330/lib"}
+	COPY="cp -p" \
+	V=1
 
 %if %{with doc}
 %{__make} -j1 rdoc