From 9f15f8231d9b4c78026357f6c87f66367fe0a6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 12 Jul 2016 13:50:14 +0200 Subject: [PATCH] Upgrade to Ruby 2.4.0 (r56029). Move gemified tcltk into subpackage. Move gemified openssl into subpackage. --- ruby-1.9.3-mkmf-verbose.patch | 2 +- ...-additional-preludes-by-configuratio.patch | 6 +- ...0-Enable-configuration-of-archlibdir.patch | 2 +- ...ed-paths-when-empty-version-string-i.patch | 2 +- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 8 +- ...2.3-Generate-preludes-using-miniruby.patch | 10 +- ruby-2.3.0-ruby_version.patch | 8 +- ...0-Revert-extmk.rb-makefiles-for-gems.patch | 71 ++++++++++ ruby.spec | 127 ++++++++++++++---- 10 files changed, 189 insertions(+), 49 deletions(-) create mode 100644 ruby-2.4.0-Revert-extmk.rb-makefiles-for-gems.patch diff --git a/ruby-1.9.3-mkmf-verbose.patch b/ruby-1.9.3-mkmf-verbose.patch index 360a586..d94ef7f 100644 --- a/ruby-1.9.3-mkmf-verbose.patch +++ b/ruby-1.9.3-mkmf-verbose.patch @@ -11,7 +11,7 @@ diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 682eb46..e6b1445 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb -@@ -1896,7 +1896,7 @@ def configuration(srcdir) +@@ -1897,7 +1897,7 @@ def configuration(srcdir) SHELL = /bin/sh # V=0 quiet, V=1 verbose. other values don't work. diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index 05406ef..28027c9 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -13,7 +13,7 @@ diff --git a/Makefile.in b/Makefile.in index 7e8ed82..7916993 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -117,6 +117,8 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ +@@ -116,6 +116,8 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ BOOTSTRAPRUBY = @BOOTSTRAPRUBY@ @@ -26,7 +26,7 @@ diff --git a/common.mk b/common.mk index 5cfbc3d..3f0a82e 100644 --- a/common.mk +++ b/common.mk -@@ -128,7 +128,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) +@@ -144,7 +144,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) DEFAULT_PRELUDES = $(GEM_PRELUDE) @@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in index 0e371e2..d4f1dcb 100644 --- a/configure.in +++ b/configure.in -@@ -4496,6 +4496,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4500,6 +4500,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 1030795..b51739c 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 37d9a62..553d4d0 100644 --- a/configure.in +++ b/configure.in -@@ -3756,6 +3756,11 @@ if test ${multiarch+set}; then +@@ -3760,6 +3760,11 @@ if test ${multiarch+set}; then fi archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index 3a2f55a..5bed145 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in index db37cd6..ce8d149 100644 --- a/configure.in +++ b/configure.in -@@ -4350,7 +4350,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4354,7 +4354,8 @@ AS_CASE(["$ruby_version_dir_name"], ruby_version_dir=/'${ruby_version_dir_name}' if test -z "${ruby_version_dir_name}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 5a8fd26..1a1dbb5 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 553d4d0..03a4152 100644 --- a/configure.in +++ b/configure.in -@@ -4414,6 +4414,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4418,6 +4418,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index 721335b..9b24ff2 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in index 03a4152..0e371e2 100644 --- a/configure.in +++ b/configure.in -@@ -4386,6 +4386,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4390,6 +4390,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644 if test "${LOAD_RELATIVE+set}"; then AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4410,6 +4414,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4414,6 +4418,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl @@ -67,7 +67,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index b47b6e1..0b99408 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb -@@ -327,6 +327,7 @@ def CONFIG.[](name, mandatory = false) +@@ -330,6 +330,7 @@ def CONFIG.[](name, mandatory = false) sitearchlibdir = CONFIG["sitearchdir"] vendorlibdir = CONFIG["vendorlibdir"] vendorarchlibdir = CONFIG["vendorarchdir"] @@ -75,7 +75,7 @@ index b47b6e1..0b99408 100755 mandir = CONFIG["mandir", true] docdir = CONFIG["docdir", true] configure_args = Shellwords.shellwords(CONFIG["configure_args"]) -@@ -505,7 +506,15 @@ def CONFIG.[](name, mandatory = false) +@@ -508,7 +509,15 @@ def CONFIG.[](name, mandatory = false) install?(:local, :comm, :lib) do prepare "library scripts", rubylibdir noinst = %w[README* *.txt *.rdoc *.gemspec] diff --git a/ruby-2.2.3-Generate-preludes-using-miniruby.patch b/ruby-2.2.3-Generate-preludes-using-miniruby.patch index 307eafd..e4dd06a 100644 --- a/ruby-2.2.3-Generate-preludes-using-miniruby.patch +++ b/ruby-2.2.3-Generate-preludes-using-miniruby.patch @@ -11,12 +11,12 @@ diff --git a/common.mk b/common.mk index 168dc52..20c218a 100644 --- a/common.mk +++ b/common.mk -@@ -852,9 +852,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) +@@ -869,9 +869,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) + $(srcdir)/template/prelude.c.tmpl + $(PRELUDE_C): $(COMPILE_PRELUDE) \ - {$(srcdir)}lib/rubygems/defaults.rb \ - {$(srcdir)}lib/rubygems/core_ext/kernel_gem.rb \ -- $(PRELUDE_SCRIPTS) $(LIB_SRCS) -+ $(PRELUDE_SCRIPTS) $(PREP) $(LIB_SRCS) +- $(PRELUDE_SCRIPTS) ++ $(PRELUDE_SCRIPTS) $(PREP) $(ECHO) generating $@ - $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ + $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index bea1a70..6e43a12 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -20,7 +20,7 @@ diff --git a/configure.in b/configure.in index db37cd6..6e73fae 100644 --- a/configure.in +++ b/configure.in -@@ -4301,9 +4301,6 @@ AS_CASE(["$target_os"], +@@ -4305,9 +4305,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -30,7 +30,7 @@ index db37cd6..6e73fae 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, AS_HELP_STRING([--with-rubyarchprefix=DIR], -@@ -4326,56 +4323,62 @@ AC_ARG_WITH(ridir, +@@ -4330,56 +4327,62 @@ AC_ARG_WITH(ridir, AC_SUBST(ridir) AC_SUBST(RI_BASE_NAME) @@ -120,7 +120,7 @@ index db37cd6..6e73fae 100644 if test "${LOAD_RELATIVE+set}"; then AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) -@@ -4392,6 +4395,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4396,6 +4399,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl @@ -171,7 +171,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index d4c110e..d39c9a6 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb -@@ -405,7 +405,7 @@ def CONFIG.[](name, mandatory = false) +@@ -408,7 +408,7 @@ def CONFIG.[](name, mandatory = false) install?(:doc, :rdoc) do if $rdocdir diff --git a/ruby-2.4.0-Revert-extmk.rb-makefiles-for-gems.patch b/ruby-2.4.0-Revert-extmk.rb-makefiles-for-gems.patch new file mode 100644 index 0000000..1023d8f --- /dev/null +++ b/ruby-2.4.0-Revert-extmk.rb-makefiles-for-gems.patch @@ -0,0 +1,71 @@ +From 1c1cda00940f882e4dda706c0c87645d7499b29d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Mon, 29 Aug 2016 16:01:36 +0200 +Subject: [PATCH] Revert "extmk.rb: makefiles for gems" + +This reverts commit 438f52d1a4aa03650a53911a66f7d81c4fc20d38. +--- + ext/extmk.rb | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/ext/extmk.rb b/ext/extmk.rb +index f75d2ea..a65a281 100755 +--- a/ext/extmk.rb ++++ b/ext/extmk.rb +@@ -131,7 +131,7 @@ def extract_makefile(makefile, keep = true) + true + end + +-def extmake(target, basedir = (maybestatic = 'ext'), &block) ++def extmake(target, basedir = (maybestatic = 'ext')) + unless $configure_only || verbose? + print "#{$message} #{target}\n" + $stdout.flush +@@ -225,7 +225,7 @@ def extmake(target, basedir = (maybestatic = 'ext'), &block) + load $0 = conf + end + else +- create_makefile(target, &block) ++ create_makefile(target) + end + $defs << "-DRUBY_EXPORT" if $static + ok = File.exist?(makefile) +@@ -241,11 +241,11 @@ def extmake(target, basedir = (maybestatic = 'ext'), &block) + end + end + ok &&= File.open(makefile){|f| s = f.gets and !s[DUMMY_SIGNATURE]} ++ ok = yield(ok) if block_given? + unless ok +- mf = ["# #{DUMMY_SIGNATURE}\n", *dummy_makefile(CONFIG["srcdir"])].join("") +- mf = yield mf if block + atomic_write_open(makefile) do |f| +- f.print(mf) ++ f.puts "# " + DUMMY_SIGNATURE ++ f.print(*dummy_makefile(CONFIG["srcdir"])) + end + + return true if !error and target.start_with?("-") +@@ -570,14 +570,18 @@ def $mflags.defined?(var) + extout = $extout + gems.each do |d| + $extout = extout.dup +- extmake(d, 'gems') do |mf| ++ extmake(d, 'gems') ++ open("#{d}/Makefile", "r+b") do |f| ++ mf = f.read ++ f.rewind + mf.sub!(/^RUBYARCHDIR *= *(\$\(extout\))\/(\$\(arch\))(.*)/) { + "TARGET_SO_DIR = #$1/gems/#$2/#{d[%r{\A[^/]+}]}#$3\n" \ + "TARGET_SO_TIME = .gems.-.arch.-.#{d[/\A[^\/]+/]}.time" + } + mf.gsub!(/\bRUBYARCHDIR\b/, 'TARGET_SO_DIR') + mf.gsub!(/\.TARGET_SO_DIR\.time/, '$(TARGET_SO_TIME)') +- mf ++ f.write(mf) ++ f.truncate(f.pos) + end + end + $extout = extout +-- +2.9.3 + diff --git a/ruby.spec b/ruby.spec index 0316cae..fde1928 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone preview1 # Keep the revision enabled for pre-releases from SVN. -%global revision 55513 +%global revision 56029 %global ruby_archive %{name}-%{ruby_version} @@ -37,16 +37,18 @@ %global irb_version %{ruby_version} %global bigdecimal_version 1.2.8 -%global did_you_mean_version 1.0.1 +%global did_you_mean_version 1.0.2 %global io_console_version 0.4.6 -%global json_version 1.8.3 +%global json_version 2.0.2 %global minitest_version 5.9.0 +%global openssl_version 2.0.0.beta.1 %global power_assert_version 0.3.0 %global psych_version 2.1.0 -%global rake_version 11.1.2 +%global rake_version 11.2.2 %global rdoc_version 4.2.1 %global net_telnet_version 0.1.1 -%global test_unit_version 3.1.9 +%global test_unit_version 3.2.1 +%global tk_version 0.1.1 %global xmlrpc_version 0.1.1 # Might not be needed in the future, if we are lucky enough. @@ -123,12 +125,16 @@ Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch # Use miniruby to regenerate prelude.c. # https://bugs.ruby-lang.org/issues/10554 Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch +# There are some issues with placement of binary extensions of bundled gems. +# https://bugs.ruby-lang.org/issues/12681 +Patch8: ruby-2.4.0-Revert-extmk.rb-makefiles-for-gems.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Suggests: rubypick Recommends: ruby(rubygems) >= %{rubygems_version} Recommends: rubygem(bigdecimal) >= %{bigdecimal_version} Recommends: rubygem(did_you_mean) >= %{did_you_mean_version} +Recommends: rubygem(openssl) >= %{openssl_version} BuildRequires: autoconf BuildRequires: gdbm-devel @@ -192,6 +198,7 @@ License: Ruby or MIT Requires: ruby(release) Recommends: rubygem(rdoc) >= %{rdoc_version} Recommends: rubygem(io-console) >= %{io_console_version} +Requires: rubygem(openssl) >= %{openssl_version} Requires: rubygem(psych) >= %{psych_version} Provides: gem = %{version}-%{release} Provides: ruby(rubygems) = %{version}-%{release} @@ -374,6 +381,20 @@ minitest/pride shows pride in testing and adds coloring to your test output. +%package -n rubygem-openssl +Summary: OpenSSL provides SSL, TLS and general purpose cryptography +Version: %{openssl_version} +Group: Development/Libraries +License: Ruby or BSD +Requires: ruby(release) +Requires: ruby(rubygems) >= %{rubygems_version} +Provides: rubygem(openssl) = %{version}-%{release} + +%description -n rubygem-openssl +OpenSSL provides SSL, TLS and general purpose cryptography. It wraps the +OpenSSL library. + + %package -n rubygem-power_assert Summary: Power Assert for Ruby Version: %{power_assert_version} @@ -460,13 +481,19 @@ XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP. -%package tcltk +%package -n rubygem-tk Summary: Tcl/Tk interface for scripting language Ruby +Version: %{tk_version} Group: Development/Languages -Requires: %{name}-libs%{?_isa} = %{ruby_version} +License: Ruby or BSD +Requires: ruby(release) +Requires: ruby(rubygems) >= %{rubygems_version} +Provides: rubygem(tk) = %{version}-%{release} +# This was renamed from ruby-tclkt to rubygem-tk at F26 timeframe. Provides: ruby(tcltk) = %{ruby_version}-%{release} +Obsoletes: ruby-tcltk < %{ruby_version}-%{release} -%description tcltk +%description -n rubygem-tk Tcl/Tk interface for the object-oriented scripting language Ruby. %prep @@ -484,6 +511,7 @@ rm -rf ext/fiddle/libffi* %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -604,6 +632,15 @@ ln -s %{gem_dir}/gems/json-%{json_version}/lib/json.rb %{buildroot}%{ruby_libdir ln -s %{gem_dir}/gems/json-%{json_version}/lib/json %{buildroot}%{ruby_libdir}/json ln -s %{_libdir}/gems/%{name}/json-%{json_version}/json/ %{buildroot}%{ruby_libarchdir}/json +mkdir -p %{buildroot}%{gem_dir}/gems/openssl-%{openssl_version}/lib +mkdir -p %{buildroot}%{_libdir}/gems/%{name}/openssl-%{openssl_version} +mv %{buildroot}%{ruby_libdir}/openssl* %{buildroot}%{gem_dir}/gems/openssl-%{openssl_version}/lib +mv %{buildroot}%{ruby_libarchdir}/openssl.so %{buildroot}%{_libdir}/gems/%{name}/openssl-%{openssl_version}/ +mv %{buildroot}%{gem_dir}/specifications/default/openssl-%{openssl_version}.gemspec %{buildroot}%{gem_dir}/specifications +ln -s %{gem_dir}/gems/openssl-%{openssl_version}/lib/openssl %{buildroot}%{ruby_libdir}/openssl +ln -s %{gem_dir}/gems/openssl-%{openssl_version}/lib/openssl.rb %{buildroot}%{ruby_libdir}/openssl.rb +ln -s %{_libdir}/gems/%{name}/openssl-%{openssl_version}/openssl.so %{buildroot}%{ruby_libarchdir}/openssl.so + mkdir -p %{buildroot}%{gem_dir}/gems/psych-%{psych_version}/lib mkdir -p %{buildroot}%{_libdir}/gems/%{name}/psych-%{psych_version} mv %{buildroot}%{ruby_libdir}/psych* %{buildroot}%{gem_dir}/gems/psych-%{psych_version}/lib @@ -613,6 +650,10 @@ ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych %{buildroot}%{ruby_libdir ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_libdir}/psych.rb ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/psych.so %{buildroot}%{ruby_libarchdir}/psych.so +# Move the binary extensions into proper place. +find %{buildroot}%{gem_dir}/extensions/*-%{_target_os}/%{ruby_version}/* -maxdepth 0 \ + -exec mv '{}' %{buildroot}%{_libdir}/gems/%{name}/ \; + # Adjust the gemspec files so that the gems will load properly sed -i '/^end$/ i\ s.extensions = ["json/ext/parser.so", "json/ext/generator.so"]' %{buildroot}%{gem_dir}/specifications/json-%{json_version}.gemspec @@ -668,6 +709,11 @@ DISABLE_TESTS="$DISABLE_TESTS -x test_fork.rb" DISABLE_TESTS="$DISABLE_TESTS -x test_case_comprehensive.rb" DISABLE_TESTS="$DISABLE_TESTS -x test_unicode_normalize.rb" +# This seems to be due to Linux 4.7+ regression. +# https://bugzilla.redhat.com/show_bug.cgi?id=1365940 +DISABLE_TESTS="$DISABLE_TESTS -n !/test_udp_recv_nonblock/" +DISABLE_TESTS="$DISABLE_TESTS -n !/test_udp_recvfrom_nonblock/" + make check TESTS="-v $DISABLE_TESTS" %post libs -p /sbin/ldconfig @@ -719,10 +765,7 @@ make check TESTS="-v $DISABLE_TESTS" # Platform independent libraries. %dir %{ruby_libdir} %{ruby_libdir}/*.rb -%exclude %{ruby_libdir}/*-tk.rb %exclude %{ruby_libdir}/irb.rb -%exclude %{ruby_libdir}/tcltk.rb -%exclude %{ruby_libdir}/tk*.rb %exclude %{ruby_libdir}/psych.rb %{ruby_libdir}/cgi %{ruby_libdir}/digest @@ -731,7 +774,6 @@ make check TESTS="-v $DISABLE_TESTS" %exclude %{ruby_libdir}/irb %{ruby_libdir}/matrix %{ruby_libdir}/net -%{ruby_libdir}/openssl %{ruby_libdir}/optparse %{ruby_libdir}/racc %{ruby_libdir}/rbconfig @@ -741,8 +783,6 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/rss %{ruby_libdir}/shell %{ruby_libdir}/syslog -%exclude %{ruby_libdir}/tk -%exclude %{ruby_libdir}/tkextlib %{ruby_libdir}/unicode_normalize %{ruby_libdir}/uri %{ruby_libdir}/webrick @@ -821,6 +861,9 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libarchdir}/enc/windows_1250.so %{ruby_libarchdir}/enc/windows_1251.so %{ruby_libarchdir}/enc/windows_1252.so +%{ruby_libarchdir}/enc/windows_1253.so +%{ruby_libarchdir}/enc/windows_1254.so +%{ruby_libarchdir}/enc/windows_1257.so %{ruby_libarchdir}/enc/windows_31j.so %{ruby_libarchdir}/etc.so %{ruby_libarchdir}/fcntl.so @@ -835,7 +878,6 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libarchdir}/mathn/rational.so %{ruby_libarchdir}/nkf.so %{ruby_libarchdir}/objspace.so -%{ruby_libarchdir}/openssl.so %{ruby_libarchdir}/pathname.so %{ruby_libarchdir}/pty.so %dir %{ruby_libarchdir}/racc @@ -850,8 +892,6 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libarchdir}/stringio.so %{ruby_libarchdir}/strscan.so %{ruby_libarchdir}/syslog.so -%exclude %{ruby_libarchdir}/tcltklib.so -%exclude %{ruby_libarchdir}/tkutil.so %{ruby_libarchdir}/zlib.so %{tapset_root} @@ -937,6 +977,14 @@ make check TESTS="-v $DISABLE_TESTS" %exclude %{gem_dir}/gems/minitest-%{minitest_version}/.* %{gem_dir}/specifications/minitest-%{minitest_version}.gemspec +%files -n rubygem-openssl +%{ruby_libdir}/openssl +%{ruby_libdir}/openssl.rb +%{ruby_libarchdir}/openssl.so +%{_libdir}/gems/%{name}/openssl-%{openssl_version} +%{gem_dir}/gems/openssl-%{openssl_version} +%{gem_dir}/specifications/openssl-%{openssl_version}.gemspec + %files -n rubygem-power_assert %{gem_dir}/gems/power_assert-%{power_assert_version} %exclude %{gem_dir}/gems/power_assert-%{power_assert_version}/.* @@ -961,22 +1009,43 @@ make check TESTS="-v $DISABLE_TESTS" %files -n rubygem-xmlrpc %license %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/LICENSE.txt -%{gem_dir}/gems/xmlrpc-%{xmlrpc_version} +%dir %{gem_dir}/gems/xmlrpc-%{xmlrpc_version} +%{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/Gemfile +%{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/Rakefile +%doc %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/README.md +%{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/bin +%{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/lib %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec -%files tcltk -%{ruby_libdir}/*-tk.rb -%{ruby_libdir}/tcltk.rb -%{ruby_libdir}/tk*.rb -%{ruby_libarchdir}/tcltklib.so -%{ruby_libarchdir}/tkutil.so -%{ruby_libdir}/tk -%{ruby_libdir}/tkextlib +%files -n rubygem-tk +%license %{gem_dir}/gems/tk-%{tk_version}/BSDL +%license %{gem_dir}/gems/tk-%{tk_version}/LICENSE.txt +%{gem_dir}/gems/tk-%{tk_version}/Gemfile +%doc %{gem_dir}/gems/tk-%{tk_version}/ChangeLog.tkextlib +%doc %{gem_dir}/gems/tk-%{tk_version}/MANUAL_tcltklib.eng +%lang(ja) %doc %{gem_dir}/gems/tk-%{tk_version}/MANUAL_tcltklib.ja +%lang(ja) %doc %{gem_dir}/gems/tk-%{tk_version}/old-README.tcltklib.ja +%{gem_dir}/gems/tk-%{tk_version}/Rakefile +%doc %{gem_dir}/gems/tk-%{tk_version}/README.1st +%doc %{gem_dir}/gems/tk-%{tk_version}/README.ActiveTcl +%doc %{gem_dir}/gems/tk-%{tk_version}/README.fork +%doc %{gem_dir}/gems/tk-%{tk_version}/README.macosx-aqua +%doc %{gem_dir}/gems/tk-%{tk_version}/README.md +%doc %{gem_dir}/gems/tk-%{tk_version}/README.tcltklib +%dir %{gem_dir}/gems/tk-%{tk_version} +%{gem_dir}/gems/tk-%{tk_version}/bin +%exclude %{gem_dir}/gems/tk-%{tk_version}/ext +%{gem_dir}/gems/tk-%{tk_version}/lib +%{gem_dir}/gems/tk-%{tk_version}/sample +%{_libdir}/gems/%{name}/tk-%{tk_version} +%{gem_dir}/specifications/tk-%{tk_version}.gemspec %changelog -* Fri May 27 2016 Vít Ondruch - 2.4.0-0.1.r55513 -- Upgrade to Ruby 2.4.0 (r55513). -- Add xmlrpc subpackage. +* Fri May 27 2016 Vít Ondruch - 2.4.0-0.1.r56029 +- Upgrade to Ruby 2.4.0 (r56029). +- Move gemified xmlrpc into subpackage. +- Move gemified tcltk into subpackage. +- Move gemified openssl into subpackage. - Make symlinks for json gem. * Mon May 23 2016 Vít Ondruch - 2.3.1-56