Hello community, here is the log from the commit of package ruby2.1 for openSUSE:Factory checked in at 2015-05-07 08:27:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby2.1 (Old) and /work/SRC/openSUSE:Factory/.ruby2.1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ruby2.1" Changes: -------- --- /work/SRC/openSUSE:Factory/ruby2.1/ruby2.1.changes 2015-02-20 12:43:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ruby2.1.new/ruby2.1.changes 2015-05-07 08:27:51.000000000 +0200 @@ -1,0 +2,22 @@ +Thu Apr 16 23:16:46 UTC 2015 - [email protected] + +- update to 2.1.6 (bsc# 926974) + - stricter hostname verification following RFC 6125. with the + patch provided by Tony Arcieri and Hiroshi Nakamura + [ruby-core:61545] [Bug #9644] CVE-2015-1855 + - upgrade to RubyGems 2.2.3. [Backport #10515] + - lots of documentation updates + - a few crash and parser fixes + For all the changes see /usr/share/doc/packages/ruby2.1/ChangeLog +- drop the SSE2 patches as they are included upstream: + ruby-2.1.3-no_sse2_patch_configure_too.patch + ruby-no_sse2.patch + +------------------------------------------------------------------- +Wed Mar 11 20:00:04 UTC 2015 - [email protected] + +- Remove the support to have the shared files from ruby-common + intree again. +- merged TK conditionals with the 2.2 package + +------------------------------------------------------------------- Old: ---- gem_build_cleanup gem_install.sh generate_buildrequires.sh ruby-2.1.3-no_sse2_patch_configure_too.patch ruby-2.1.5.tar.bz2 ruby-no_sse2.patch ruby.macros ruby.rpm-macros rubygems.attr rubygemsdeps.rb New: ---- ruby-2.1.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby2.1.spec ++++++ --- /var/tmp/diff_new_pack.lkY8rC/_old 2015-05-07 08:27:53.000000000 +0200 +++ /var/tmp/diff_new_pack.lkY8rC/_new 2015-05-07 08:27:53.000000000 +0200 @@ -16,8 +16,6 @@ # -%bcond_with ruby_intree_common - Name: ruby2.1 #### @@ -27,7 +25,7 @@ #### %define patch_level p0 -Version: 2.1.5 +Version: 2.1.6 Release: 0 # make the exported API version explicit %define api_version 2.1.0 @@ -60,7 +58,9 @@ %endif # see https://bugs.ruby-lang.org/issues/8000 - might come back %if 0%{?suse_version} && 0%{?suse_version} < 1230 -%define tk_version_supported 1 +%bcond_without tk_version_supported +%else +%bcond_with tk_version_supported %endif # turn on testsuite by default. we dont hard fail anyway. %bcond_without run_tests @@ -77,7 +77,9 @@ BuildRequires: procps BuildRequires: readline-devel BuildRequires: timezone +%if %{with tk_version_supported} BuildRequires: tk-devel +%endif BuildRequires: zlib-devel # 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 @@ -93,15 +95,11 @@ BuildRequires: valgrind %endif %endif +BuildRequires: xz Provides: ruby(abi) = %{rb_ver} %if 0%{?suse_version} > 1130 Conflicts: ruby(abi) = %{rb_ver} %endif -%if %{with ruby_intree_common} -Provides: ruby-common = %{rpm_macros_version} -Obsoletes: ruby-common < %{rpm_macros_version} -Provides: ruby-macros = %{rpm_macros_version} -%endif Provides: ruby21 = %{version}-%{release} Requires: %{libname} = %{version} Requires: %{name}-stdlib = %{version} @@ -112,28 +110,18 @@ # Url: http://www.ruby-lang.org/ -Source: http://cache.ruby-lang.org/pub/ruby/2.1/ruby-%{pkg_version}.tar.bz2 -# sources from former ruby-common -Source1: gem_build_cleanup -Source2: ruby.macros -Source3: ruby.rpm-macros -Source4: rubygems.attr -Source5: rubygemsdeps.rb -Source6: gem_install.sh -Source7: generate_buildrequires.sh -Source8: generate_rubygemprovides.awk +Source: http://cache.ruby-lang.org/pub/ruby/2.1/ruby-%{pkg_version}.tar.xz +Source1: generate_rubygemprovides.awk # -Source10: ruby2.1.macros -Source11: ruby2.1-default.macros -Source100: %{name}-rpmlintrc +Source2: %{name}.macros +Source3: %{name}-default.macros +Source99: %{name}-rpmlintrc Patch0: rubygems-1.5.0_buildroot.patch Patch1: ruby-1.9.2p290_tcl_no_stupid_rpaths.patch -Patch2: ruby-no_sse2.patch -Patch3: rubygems-testsuite-handle_gem_loaderror.patch -Patch4: ruby-1.9.3-mkmf-verbose.patch -Patch5: ruby-2.1.3-no_sse2_patch_configure_too.patch -Patch6: make-gem-build-reproducible.patch +Patch2: rubygems-testsuite-handle_gem_loaderror.patch +Patch3: ruby-1.9.3-mkmf-verbose.patch +Patch4: make-gem-build-reproducible.patch # Summary: An Interpreted Object-Oriented Scripting Language License: BSD-2-Clause or Ruby @@ -185,7 +173,7 @@ %package stdlib Summary: The Ruby standard library Group: Development/Languages/Ruby -Obsoletes: ruby-stdlib < 2.1.3 +Provides: ruby-stdlib = %{version}-%{release} Requires: %{libname} = %{version} ################################ @@ -195,8 +183,8 @@ # - the usual means to generate provides for rubygems is using ruby # and ruby is not available while building ruby :-/ -%define gen_embedded_provides4() %(awk -f %{S:8} -- %api_version %arch %1 %2 %3 %4) -%define gen_embedded_provides5() %(awk -f %{S:8} -- %api_version %arch %1 %2 %3 %4 %5) +%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 io-console 0 4 2 %gen_embedded_provides4 json 1 8 1 %gen_embedded_provides4 minitest 4 7 5 @@ -228,7 +216,7 @@ %description devel-extra Development files to link against Ruby. -%if 0%{?tk_version_supported} > 0 +%if %{with tk_version_supported} %package tk Summary: TCL/TK bindings for Ruby Group: Development/Languages/Ruby @@ -315,8 +303,6 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 find sample -type f -print0 | xargs -r0 chmod a-x grep -Erl '^#! */' benchmark bootstraptest ext lib sample test \ | xargs -r perl -p -i -e 's|^#!\s*\S+(\s+.*)?$|#!/usr/bin/ruby%{rb_binary_suffix} $1|' @@ -353,22 +339,10 @@ %define rb_binary %{buildroot}/usr/bin/ruby -I %{buildroot}%{rb_libdir} -I %{buildroot}%{rb_archdir} export LD_LIBRARY_PATH=%{buildroot}%{_libdir} -%if %{with ruby_intree_common} -# formerly ruby-common -# we need to make sure it overwrites older macro versions and rpm sorts alphabetically -install -D -m 0644 %{S:2} %{buildroot}/etc/rpm/macros.ruby -install -D -m 0644 %{S:3} %{buildroot}/etc/rpm/macros.suse-ruby -install -D -m 0644 %{S:4} %{buildroot}/usr/lib/rpm/fileattrs/rubygems.attr -install -D -m 0755 %{S:5} %{buildroot}/usr/lib/rpm/rubygemsdeps.rb -install -D -m 0755 %{S:6} %{buildroot}/usr/lib/rpm/gem_install.sh -install -D -m 0755 %{S:1} %{buildroot}/usr/lib/rpm/gem_build_cleanup.sh -install -D -m 0755 %{S:7} %{buildroot}/usr/lib/rpm/generate_buildrequires.sh -%endif - -install -D -m 0644 %{S:10} %{buildroot}/etc/rpm/macros.suse-ruby2.1 +install -D -m 0644 %{S:2} %{buildroot}/etc/rpm/macros.suse-ruby2.1 mkdir -p %{buildroot}%{_sysconfdir}/alternatives %if "%{rb_default_ruby_suffix}" == "%{rb_soname}" - install -D -m 0644 %{S:11} %{buildroot}/etc/rpm/macros.suse-ruby2.1-default + install -D -m 0644 %{S:3} %{buildroot}/etc/rpm/macros.suse-ruby2.1-default for bin in %{buildroot}%{_bindir}/{erb,gem,irb,ruby,testrb}%{rb_binary_suffix} ; do # yes really hard links ln $bin ${bin%%%{rb_binary_suffix}} @@ -449,7 +423,7 @@ %{_bindir}/ri* %{_bindir}/ruby* %{_bindir}/testrb* -%if 0%{?tk_version_supported} > 0 +%if %{with tk_version_supported} %exclude %{rb_libdir}/multi-tk.rb %exclude %{rb_libdir}/remote-tk.rb %exclude %{rb_libdir}/tcltk.rb @@ -464,19 +438,8 @@ %{_mandir}/man1/erb*.1* %{_mandir}/man1/rake*.1* %{_mandir}/man1/ruby*.1* -%doc ChangeLog COPYING COPYING.ja GPL KNOWNBUGS.rb LEGAL NEWS README README.EXT README.EXT.ja README.ja +%doc ChangeLog COPYING COPYING.ja GPL KNOWNBUGS.rb LEGAL NEWS README* %config /etc/rpm/macros.suse-ruby2.1* -%if %{with ruby_intree_common} -# former ruby-common files -%config(noreplace) /etc/rpm/macros.ruby -%config /etc/rpm/macros.suse-ruby -%dir /usr/lib/rpm/fileattrs -/usr/lib/rpm/fileattrs/rubygems.attr -/usr/lib/rpm/rubygemsdeps.rb -/usr/lib/rpm/gem_install.sh -/usr/lib/rpm/gem_build_cleanup.sh -/usr/lib/rpm/generate_buildrequires.sh -%endif %files -n %{libname} %defattr(-,root,root,-) @@ -489,7 +452,7 @@ %files stdlib %defattr(-,root,root,-) %{_libdir}/ruby/ -%if 0%{?tk_version_supported} > 0 +%if %{with tk_version_supported} %exclude %{rb_libdir}/multi-tk.rb %exclude %{rb_libdir}/remote-tk.rb %exclude %{rb_libdir}/tcltk.rb @@ -514,7 +477,7 @@ %files devel-extra -f devel-extra-list -%if 0%{?tk_version_supported} > 0 +%if %{with tk_version_supported} %files tk %defattr(-,root,root,-) %{rb_libdir}/multi-tk.rb
