Hello community, here is the log from the commit of package ruby2.6 for openSUSE:Factory checked in at 2019-02-08 12:02:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby2.6 (Old) and /work/SRC/openSUSE:Factory/.ruby2.6.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ruby2.6" Fri Feb 8 12:02:26 2019 rev:2 rq:672001 version:2.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ruby2.6/ruby2.6.changes 2019-01-28 20:49:54.093813005 +0100 +++ /work/SRC/openSUSE:Factory/.ruby2.6.new.28833/ruby2.6.changes 2019-02-08 12:02:31.573722180 +0100 @@ -1,0 +2,25 @@ +Tue Feb 5 17:16:36 UTC 2019 - Marcus Rueckert <[email protected]> + +- the last change was in the wrong %if branch +- add option to build without docs for testing + +------------------------------------------------------------------- +Tue Feb 5 16:14:44 UTC 2019 - Marcus Rueckert <[email protected]> + +- until we have a nicer solution duplicate the intree gem provides + for the non seperated stdlib path + +------------------------------------------------------------------- +Tue Feb 5 12:47:00 UTC 2019 - Marcus Rueckert <[email protected]> + +- enable jemalloc by default on 15.0 and newer +- undo the split of the stdlib. you can still build the old style + by passing --with=separate_stdlib + +------------------------------------------------------------------- +Tue Feb 5 12:12:39 UTC 2019 - Marcus Rueckert <[email protected]> + +- update to 2.6.1 + http://www.ruby-lang.org/en/news/2019/01/30/ruby-2-6-1-released/ + +------------------------------------------------------------------- Old: ---- ruby-2.6.0.tar.xz New: ---- ruby-2.6.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby2.6.spec ++++++ --- /var/tmp/diff_new_pack.JtxOq9/_old 2019-02-08 12:02:33.997721075 +0100 +++ /var/tmp/diff_new_pack.JtxOq9/_new 2019-02-08 12:02:34.009721069 +0100 @@ -1,7 +1,7 @@ # # spec file for package ruby2.6 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,13 +25,13 @@ #### %define patch_level p0 -Version: 2.6.0 +Version: 2.6.1 Release: 0 +%define pkg_version 2.6.1 # make the exported API version explicit %define api_version 2.6.0 %define rb_binary_suffix .ruby2.6 %define rb_soname ruby2.6 -%define pkg_version 2.6.0 # ruby-macros and ruby-common version %define rpm_macros_version 3 @@ -63,15 +63,26 @@ %endif # turn on testsuite by default. we dont hard fail anyway. %bcond_without run_tests -%if 0%{?is_opensuse} || 0%{?sle_version} >= 150000 -%bcond_with jemalloc +%bcond_without build_docs +%if 0%{?sle_version} >= 150000 +%bcond_without jemalloc %else %bcond_with jemalloc %endif %bcond_with clang +%bcond_with separate_stdlib + +# +Url: https://www.ruby-lang.org/ +Source: https://cache.ruby-lang.org/pub/ruby/2.6/ruby-%{pkg_version}.tar.xz +Source1: generate_rubygemprovides.awk +Source2: dump-versions.rb +# +Source3: %{name}.macros +Source4: %{name}-default.macros +Source99: %{name}-rpmlintrc # -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: awk %if %{with clang} BuildRequires: binutils-gold @@ -82,17 +93,17 @@ %if %{with jemalloc} BuildRequires: jemalloc-devel %endif +BuildRequires: autoconf BuildRequires: libffi-devel BuildRequires: libyaml-devel BuildRequires: ncurses-devel +BuildRequires: netcfg BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: procps BuildRequires: readline-devel -BuildRequires: netcfg BuildRequires: timezone BuildRequires: zlib-devel -BuildRequires: autoconf # this requires is needed as distros older than 11.3 have a buildignore on freetype2, without this the detection of the tk extension fails BuildRequires: freetype2-devel %if 0%{?suse_version} > 1010 @@ -118,22 +129,72 @@ Conflicts: otherproviders(ruby-default) %endif Requires: %{libname} = %{version} +################################ +# generate provides for embedded rubygems +# must be 'manually' generated since +# - the final .gemspec files are created during %build and %install +# - the usual means to generate provides for rubygems is using ruby +# and ruby is not available while building ruby :-/ + +%define gen_embedded_provides3() %(awk -f %{S:1} -- %api_version %arch %1 %2 %3) +%define gen_embedded_provides4() %(awk -f %{S:1} -- %api_version %arch %1 %2 %3 %4) +%define gen_embedded_provides5() %(awk -f %{S:1} -- %api_version %arch %1 %2 %3 %4 %5) + +%if %{with separate_stdlib} Requires: %{name}-stdlib = %{version} +%else +%gen_embedded_provides4 bigdecimal 1 4 1 +%gen_embedded_provides4 date 2 0 0 +%gen_embedded_provides4 dbm 1 0 0 +%gen_embedded_provides4 etc 1 0 1 +%gen_embedded_provides4 fcntl 1 0 0 +%gen_embedded_provides4 fiddle 1 0 0 +%gen_embedded_provides4 gdbm 2 0 0 +%gen_embedded_provides4 io-console 0 4 7 +%gen_embedded_provides4 json 2 1 0 +%gen_embedded_provides4 openssl 2 1 2 +%gen_embedded_provides4 psych 3 1 0 +%gen_embedded_provides4 sdbm 1 0 0 +%gen_embedded_provides4 stringio 0 0 2 +%gen_embedded_provides4 strscan 1 0 0 +%gen_embedded_provides4 zlib 1 0 0 +%gen_embedded_provides4 did_you_mean 1 3 0 +%gen_embedded_provides4 minitest 5 11 3 +%gen_embedded_provides4 net-telnet 0 2 0 +%gen_embedded_provides4 power_assert 1 1 3 +%gen_embedded_provides4 rake 12 3 2 +%gen_embedded_provides4 test-unit 3 2 9 +%gen_embedded_provides4 xmlrpc 0 3 0 +%gen_embedded_provides4 bundler 1 17 2 +%gen_embedded_provides4 cmath 1 0 0 +%gen_embedded_provides4 csv 3 0 4 +%gen_embedded_provides4 e2mmap 0 1 0 +%gen_embedded_provides4 fileutils 1 1 0 +%gen_embedded_provides4 forwardable 1 2 0 +%gen_embedded_provides4 ipaddr 1 2 2 +%gen_embedded_provides4 irb 1 0 0 +%gen_embedded_provides4 logger 1 3 0 +%gen_embedded_provides4 matrix 0 1 0 +%gen_embedded_provides4 mutex_m 0 1 0 +%gen_embedded_provides4 ostruct 0 1 0 +%gen_embedded_provides4 prime 0 1 0 +%gen_embedded_provides4 rdoc 6 1 0 +%gen_embedded_provides4 rexml 3 1 9 +%gen_embedded_provides4 rss 0 2 7 +%gen_embedded_provides4 scanf 1 0 0 +%gen_embedded_provides3 shell 0 7 +%gen_embedded_provides4 sync 0 5 0 +%gen_embedded_provides4 thwait 0 1 0 +%gen_embedded_provides4 tracer 0 1 0 +%gen_embedded_provides4 webrick 1 4 2 +Provides: %{name}-stdlib = %{version}-%{release} +Obsoletes: %{name}-stdlib < %{version}-%{release} +%endif PreReq: update-alternatives BuildRequires: update-alternatives Requires: ruby-common # -Url: https://www.ruby-lang.org/ -Source: https://cache.ruby-lang.org/pub/ruby/2.6/ruby-%{pkg_version}.tar.xz -Source1: generate_rubygemprovides.awk -Source2: dump-versions.rb -# -Source3: %{name}.macros -Source4: %{name}-default.macros -Source99: %{name}-rpmlintrc - -# Summary: An Interpreted Object-Oriented Scripting Language License: BSD-2-Clause OR Ruby Group: Development/Languages/Ruby @@ -182,25 +243,15 @@ %description doc Documentation and samples for Ruby +%if %{with separate_stdlib} %package stdlib Summary: The Ruby standard library Group: Development/Languages/Ruby Provides: ruby-stdlib = %{version}-%{release} Requires: %{libname} = %{version} -################################ -# generate provides for embedded rubygems -# must be 'manually' generated since -# - the final .gemspec files are created during %build and %install -# - the usual means to generate provides for rubygems is using ruby -# and ruby is not available while building ruby :-/ - -%define gen_embedded_provides3() %(awk -f %{S:1} -- %api_version %arch %1 %2 %3) -%define gen_embedded_provides4() %(awk -f %{S:1} -- %api_version %arch %1 %2 %3 %4) -%define gen_embedded_provides5() %(awk -f %{S:1} -- %api_version %arch %1 %2 %3 %4 %5) - %gen_embedded_provides4 bigdecimal 1 4 1 -%gen_embedded_provides4 date 1 0 0 +%gen_embedded_provides4 date 2 0 0 %gen_embedded_provides4 dbm 1 0 0 %gen_embedded_provides4 etc 1 0 1 %gen_embedded_provides4 fcntl 1 0 0 @@ -223,7 +274,7 @@ %gen_embedded_provides4 xmlrpc 0 3 0 %gen_embedded_provides4 bundler 1 17 2 %gen_embedded_provides4 cmath 1 0 0 -%gen_embedded_provides4 csv 3 0 2 +%gen_embedded_provides4 csv 3 0 4 %gen_embedded_provides4 e2mmap 0 1 0 %gen_embedded_provides4 fileutils 1 1 0 %gen_embedded_provides4 forwardable 1 2 0 @@ -248,12 +299,13 @@ %description stdlib The Ruby standard library +%endif %package devel Summary: Development files to link against Ruby Group: Development/Languages/Ruby Requires: %{name} = %{version} -Provides: rubygems = 3.0.0~beta1 +Provides: rubygems = 3.0.1 Provides: rubygems_with_buildroot_patch %if %{with jemalloc} Requires: jemalloc-devel @@ -369,6 +421,11 @@ %if 0%{?use_valgrind} --with-valgrind \ %endif + %if ! %{with build_docs} + --disable-install-doc \ + --disable-install-rdoc \ + --disable-install-capi \ + %endif --with-mantype=man \ --enable-shared \ --disable-static \ @@ -481,16 +538,10 @@ %doc ChangeLog COPYING COPYING.ja GPL KNOWNBUGS.rb LEGAL NEWS README* %config /etc/rpm/macros.suse-ruby2.6* -%files -n %{libname} -%defattr(-,root,root,-) -%{_libdir}/libruby*.so.* - -%files doc -%defattr(-,root,root,-) -%doc doc/* sample/ - +%if %{with separate_stdlib} %files stdlib %defattr(-,root,root,-) +%endif %{_libdir}/ruby/ %exclude %{_libdir}/ruby/gems/%{api_version}/gems/*/test/ %dir %rb_extdir @@ -499,6 +550,10 @@ %dir %rb_extdocdir %dir %rb_extarchdocdir +%files -n %{libname} +%defattr(-,root,root,-) +%{_libdir}/libruby*.so.* + %files devel -f devel-extra-excludes %defattr(-,root,root,-) %{_includedir}/ruby-%{rb_ver} @@ -507,9 +562,15 @@ %files devel-extra -f devel-extra-list +%if %{with build_docs} +%files doc +%defattr(-,root,root,-) +%doc doc/* sample/ + %files doc-ri %defattr(-,root,root,-) %dir %{_datadir}/ri/ %{_datadir}/ri/%{rb_ver}/ +%endif %changelog ++++++ ruby-2.6.0.tar.xz -> ruby-2.6.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/ruby2.6/ruby-2.6.0.tar.xz /work/SRC/openSUSE:Factory/.ruby2.6.new.28833/ruby-2.6.1.tar.xz differ: char 26, line 1
