diff --git a/ruby-2.3.4-api_break_rb_thread_fd_close.patch b/ruby-2.3.4-api_break_rb_thread_fd_close.patch new file mode 100644 index 0000000..60660d4 --- /dev/null +++ b/ruby-2.3.4-api_break_rb_thread_fd_close.patch @@ -0,0 +1,15 @@ +--- ruby-2.3.4/thread.c 2017-03-27 18:54:09.000000000 +0200 ++++ ruby-2.3.4/thread.c.api_break 2017-06-18 19:25:49.671240689 +0200 +@@ -2187,6 +2187,12 @@ + return busy; + } + ++void ++rb_thread_fd_close(int fd) ++{ ++ while (rb_notify_fd_close(fd)); ++} ++ + /* + * call-seq: + * thr.raise diff --git a/ruby.spec b/ruby.spec index 3e23b8a..bfbc280 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,12 +1,9 @@ -%define dotversion %(echo %{version} | sed 's/-/./g') %define majorminor %(echo %{version} | cut -d. -f 1-2) %define apiver %(echo %{version} | cut -d. -f 1-2).0 -%define patchl %(echo %{version} | cut -dp -f 2) -%define majver %(echo %{version} | cut -d_ -f 1) Name: ruby Epoch: 1 -Version: 2.0.0_p353 +Version: 2.5.1 Release: 1mamba Summary: An interpreted scripting language for quick and easy object-oriented programming Group: Applications/Development @@ -14,18 +11,21 @@ Vendor: openmamba Distribution: openmamba Packager: Davide Madrisan URL: http://www.ruby-lang.org -Source0: ftp://ftp.ruby-lang.org/pub/ruby/%{majorminor}/ruby-%{majver}-p%{patchl}.tar.bz2 +Source0: https://cache.ruby-lang.org/pub/ruby/%{majorminor}/ruby-%{version}.tar.xz +Patch: ruby-2.3.4-api_break_rb_thread_fd_close.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libdb47-devel +BuildRequires: libffi-devel BuildRequires: libgdbm-devel +BuildRequires: libgmp-devel BuildRequires: libncurses-devel BuildRequires: libopenssl-devel BuildRequires: libreadline-devel -BuildRequires: libtermcap-devel +BuildRequires: libtcl-devel BuildRequires: libtk-devel BuildRequires: libX11-devel +BuildRequires: libyaml-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: groff @@ -49,25 +49,16 @@ It is simple, straight-forward, extensible, and portable. This package contains Ruby's devel files. %prep -%setup -q -n ruby-%{majver}%{?patchl:-p%patchl} +%setup -q +#%patch0 -p1 %build CFLAGS=`echo %{optflags} | sed 's/-fomit-frame-pointer //'` -##***************************************************************************** -##** -##** PTHREAD SUPPORT MODE ERROR: -##** -##** Ruby is not compiled with --enable-pthread, but your Tcl/Tk -##** library seems to be compiled with pthread support. This -##** combination may cause frequent hang or segmentation fault -##** errors when Ruby/Tk is working. We recommend that you NEVER -##** create the library with such a combination of pthread support. -##** -##** Please recompile Ruby with the "--enable-pthread" configure option -##** or recompile Tcl/Tk with the "--disable-threads" configure option. -##** -##***************************************************************************** -%configure --enable-shared --enable-pthread +%configure \ + --disable-rpath \ + --enable-shared +# --with-ruby-version='' + %make make test @@ -84,6 +75,9 @@ echo "\ %%ruby_sitearch %%(%{__ruby} -rrbconfig -e 'puts RbConfig::CONFIG[\"sitearchdir\"]')" \ > %{buildroot}%{_sysconfdir}/rpm/macros.ruby +# remove unpackaged files +rm -fr %{buildroot}%{_docdir} + %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -99,41 +93,39 @@ echo "\ %{_bindir}/rdoc %{_bindir}/ri %{_bindir}/ruby -%{_bindir}/testrb %{_libdir}/libruby.so.* +%{_libdir}/ruby/gems/%{apiver}/cache %{_libdir}/ruby/gems/%{apiver}/gems %{_libdir}/ruby/gems/%{apiver}/specifications %dir %{_libdir}/ruby/%{apiver} -%dir %{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux* +%dir %{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux* +%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/cgi %{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/digest -%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/dl %{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/enc %{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/io %{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/json -%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/mathn +#%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/mathn %{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/racc +%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/rbconfig %{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/*.rb %{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux*/*.so %{_libdir}/ruby/%{apiver}/*.rb %{_libdir}/ruby/%{apiver}/bigdecimal %{_libdir}/ruby/%{apiver}/cgi -%{_libdir}/ruby/%{apiver}/date %{_libdir}/ruby/%{apiver}/digest -%{_libdir}/ruby/%{apiver}/dl %{_libdir}/ruby/%{apiver}/drb %{_libdir}/ruby/%{apiver}/fiddle +%{_libdir}/ruby/%{apiver}/forwardable/impl.rb %{_libdir}/ruby/%{apiver}/io %{_libdir}/ruby/%{apiver}/irb %{_libdir}/ruby/%{apiver}/json %{_libdir}/ruby/%{apiver}/matrix -%{_libdir}/ruby/%{apiver}/minitest %{_libdir}/ruby/%{apiver}/net %{_libdir}/ruby/%{apiver}/openssl %{_libdir}/ruby/%{apiver}/optparse %{_libdir}/ruby/%{apiver}/psych %{_libdir}/ruby/%{apiver}/racc -%{_libdir}/ruby/%{apiver}/rake -%{_libdir}/ruby/%{apiver}/rbconfig +#%{_libdir}/ruby/%{apiver}/rbconfig %{_libdir}/ruby/%{apiver}/rdoc %{_libdir}/ruby/%{apiver}/rexml %{_libdir}/ruby/%{apiver}/rinda @@ -141,26 +133,18 @@ echo "\ %{_libdir}/ruby/%{apiver}/rss %{_libdir}/ruby/%{apiver}/rubygems %{_libdir}/ruby/%{apiver}/shell -%{_libdir}/ruby/2.0.0/syslog/logger.rb -#%{_libdir}/ruby/%{apiver}/syck -#%{_libdir}/ruby/%{apiver}/specifications -%{_libdir}/ruby/%{apiver}/test -%{_libdir}/ruby/%{apiver}/tk -%{_libdir}/ruby/%{apiver}/tkextlib +%{_libdir}/ruby/%{apiver}/syslog +#%{_libdir}/ruby/%{apiver}/tk +#%{_libdir}/ruby/%{apiver}/tkextlib +%{_libdir}/ruby/%{apiver}/unicode_normalize %{_libdir}/ruby/%{apiver}/uri %{_libdir}/ruby/%{apiver}/webrick -#%{_libdir}/ruby/%{apiver}/wsdl -%{_libdir}/ruby/%{apiver}/xmlrpc -#%{_libdir}/ruby/%{apiver}/xsd +#%{_libdir}/ruby/%{apiver}/xmlrpc %{_libdir}/ruby/%{apiver}/yaml %dir %{_datadir}/ri/%{apiver} %dir %{_datadir}/ri/%{apiver}/system %{_datadir}/ri/%{apiver}/system/* -%{_mandir}/man1/ruby.1* -%{_mandir}/man1/erb.1* -%{_mandir}/man1/irb.1* -%{_mandir}/man1/rake.1* -%{_mandir}/man1/ri.1* +%{_mandir}/man1/*.1* %doc COPYING %files devel @@ -173,19 +157,72 @@ echo "\ %{_includedir}/ruby-%{apiver}/ruby/*.h %dir %{_includedir}/ruby-%{apiver}/ruby/backward %{_includedir}/ruby-%{apiver}/ruby/backward/*.h -#%ifarch arm -#%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux-eabi/*.h -#%else -#%{_libdir}/ruby/%{apiver}/%{_target_cpu}-linux/*.h -#%endif -%{_libdir}/libruby-static.a +#%{_libdir}/libruby-static.a %{_libdir}/libruby.so %{_libdir}/pkgconfig/ruby-*.pc -%dir %{_datadir}/doc/ruby/ -%{_datadir}/doc/ruby/* -%doc ChangeLog README README.EXT README.EXT.ja README.ja +#%doc ChangeLog README.* %changelog +* Thu Mar 29 2018 Automatic Build System 2.5.1-1mamba +- automatic version update by autodist + +* Mon Feb 12 2018 Automatic Build System 2.5.0-1mamba +- automatic version update by autodist + +* Tue Oct 24 2017 Automatic Build System 2.4.2-1mamba +- automatic version update by autodist + +* Sun Jun 18 2017 Davide Madrisan 2.3.4-1mamba +- update to 2.3.4 + +* Mon Feb 06 2017 Automatic Build System 2.4.0-1mamba +- automatic version update by autodist + +* Mon Nov 21 2016 Automatic Build System 2.3.3-1mamba +- automatic version update by autodist + +* Tue Nov 15 2016 Automatic Build System 2.3.2-1mamba +- automatic version update by autodist + +* Wed Apr 27 2016 Automatic Build System 2.3.1-1mamba +- automatic version update by autodist + +* Sun Dec 27 2015 Automatic Build System 2.3.0-1mamba +- automatic version update by autodist + +* Wed Dec 16 2015 Automatic Build System 2.2.4-1mamba +- automatic version update by autodist + +* Wed Aug 19 2015 Automatic Build System 2.2.3-1mamba +- automatic version update by autodist + +* Thu Apr 16 2015 Automatic Build System 2.2.2-1mamba +- automatic update by autodist + +* Tue Mar 17 2015 Automatic Build System 2.2.1-1mamba +- automatic update by autodist + +* Sun Dec 28 2014 Automatic Build System 2.2.0-1mamba +- automatic version update by autodist + +* Fri Nov 14 2014 Automatic Build System 2.1.5-2mamba +- automatic version update by autodist + +* Fri Nov 14 2014 Automatic Build System 2.1.5-1mamba +- automatic version update by autodist + +* Thu Oct 30 2014 Automatic Build System 2.1.4-1mamba +- automatic version update by autodist + +* Sun Sep 21 2014 Automatic Build System 2.1.3-1mamba +- automatic version update by autodist + +* Thu Jul 10 2014 Silvan Calarco 2.1.2-1mamba +- update to 2.1.2 + +* Wed Jan 15 2014 Silvan Calarco 2.1.0-1mamba +- update to 2.1.0 + * Tue Dec 03 2013 Automatic Build System 2.0.0_p353-1mamba - automatic version update by autodist @@ -296,4 +333,4 @@ echo "\ - security update: CVE-2006-3694, bugzilla 208 * Fri May 19 2006 Davide Madrisan 1.8.4-1qilnx -- package created by autospec +- package created by autospec \ No newline at end of file