commit ruby-common for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2024-06-09 20:19:02
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.19518 (New)
Package is "ruby-common"
Sun Jun 9 20:19:02 2024 rev:28 rq:1179322 version:3.2.1
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2023-11-23
21:38:44.135264468 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.19518/ruby-common.changes
2024-06-09 20:19:20.687666994 +0200
@@ -1,0 +2,7 @@
+Fri Jun 7 13:52:41 UTC 2024 - Marcus Rueckert
+
+- refactor the jemalloc requires code so that it can accomodate
+ more feature flags
+- add requires for yjit enabled ruby
+
+---
Other differences:
--
++ gem_packages.spec.erb ++
--- /var/tmp/diff_new_pack.PsJBwX/_old 2024-06-09 20:19:21.371690856 +0200
+++ /var/tmp/diff_new_pack.PsJBwX/_new 2024-06-09 20:19:21.375690995 +0200
@@ -13,28 +13,29 @@
path
end
- def self.rpm_jemalloc_prefix
-jemalloc_prefix = nil
+
+ def self.rpm_suffix_for_feature(feature)
+rpm_prefix = nil
package_name = RbConfig::CONFIG['RUBY_SO_NAME']
IO.popen("rpm -q --provides #{package_name}") {|rpm_io|
rpm_provides = rpm_io.read
- mo = /(?with(out)?-jemalloc)/.match(rpm_provides)
+ mo = /(?with(out)?-#{feature})/.match(rpm_provides)
if mo
-jemalloc_prefix = mo[:jemalloc_prefix]
+rpm_prefix = mo[:rpm_prefix]
end
}
-jemalloc_prefix
+rpm_prefix
end
- def self.jemalloc_requires
-jemalloc_prefix = rpm_jemalloc_prefix
+ def self.requires_for_feature(feature)
+found_rpm_prefix = rpm_suffix_for_feature(feature)
-if jemalloc_prefix
- return "Requires:
#{RbConfig::CONFIG['RUBY_SO_NAME']}-#{jemalloc_prefix} >=
#{RbConfig::CONFIG['RUBY_PROGRAM_VERSION']}"
+if found_rpm_prefix
+ return "Requires:
#{RbConfig::CONFIG['RUBY_SO_NAME']}-#{found_rpm_prefix} >=
#{RbConfig::CONFIG['RUBY_PROGRAM_VERSION']}"
end
#
return ""
@@ -149,7 +150,8 @@
<% end -%>
# /MANUAL
<% unless spec.extensions.empty? -%>
-<%= jemalloc_requires %>
+<%= requires_for_feature('jemalloc') %>
+<%= requires_for_feature('yjit') %>
<% end -%>
Summary:<%= config[:summary] or spec.summary %>
Group: Development/Languages/Ruby
commit ruby-common for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2023-08-22 08:55:12
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.1766 (New)
Package is "ruby-common"
Tue Aug 22 08:55:12 2023 rev:26 rq:1104976 version:3.2.1
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2023-05-14
16:33:56.911843213 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.1766/ruby-common.changes
2023-08-22 08:55:18.906464033 +0200
@@ -24,0 +25,5 @@
+Sun May 7 10:28:13 UTC 2023 - Jan Engelhardt
+
+- Remove old specfile constructs
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.mPkOXI/_old 2023-08-22 08:55:19.606465363 +0200
+++ /var/tmp/diff_new_pack.mPkOXI/_new 2023-08-22 08:55:19.610465370 +0200
@@ -124,7 +124,6 @@
install -D -m 0644 %{S:17}
%{buildroot}/usr/lib/rpm/fileattrs/rubygems_bundled.attr
%files
-%defattr(-,root,root)
%if %{with ship_gemrc}
%config /etc/gemrc
%endif
@@ -141,12 +140,10 @@
%{_bindir}/g2r
%files -n ruby-packaging-helpers
-%defattr(-,root,root)
%{_bindir}/irp
%{_bindir}/bundler-dumpdeps
%files rails
-%defattr(-,root,root)
%{_rpmmacrodir}/macros.rails
/usr/lib/rpm/fileattrs/gemfile.attr
/usr/lib/rpm/gemfile.rb
commit ruby-common for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2023-05-14 16:31:32
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.1533 (New)
Package is "ruby-common"
Sun May 14 16:31:32 2023 rev:25 rq:1086831 version:3.2.1
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2023-05-08
17:23:48.888528815 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.1533/ruby-common.changes
2023-05-14 16:33:56.911843213 +0200
@@ -1,0 +2,23 @@
+Fri May 12 21:28:54 UTC 2023 - Marcus Rueckert
+
+- bump the version so we can require the new version to make it
+ easier to depend on the new functionality
+
+---
+Fri May 12 14:21:14 UTC 2023 - Marcus Rueckert
+
+- Support runtime dependencies for the generated subpackages:
+ syntax:
+
+ Requires: rubygem(gemname)
+ Recommends: rubygem(gemname:x) >= x.y
+
+ This will be transformed into
+
+ Requires: rubygem(ruby::gemname)
+ Recommends: rubygem(ruby::gemname:x) >= x.y
+
+ That way we ensure that every package only requires rubygems for
+ the current ruby version.
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.eZKD3k/_old 2023-05-14 16:33:57.515846133 +0200
+++ /var/tmp/diff_new_pack.eZKD3k/_new 2023-05-14 16:33:57.523846172 +0200
@@ -22,7 +22,7 @@
%endif
Name: ruby-common
-Version:3.2
+Version:3.2.1
Release:0
# ruby-macros and ruby-common version
%define rpm_macros_version 5
++ gem_packages.spec.erb ++
--- /var/tmp/diff_new_pack.eZKD3k/_old 2023-05-14 16:33:57.631846694 +0200
+++ /var/tmp/diff_new_pack.eZKD3k/_new 2023-05-14 16:33:57.639846733 +0200
@@ -61,7 +61,21 @@
custom_pkgs
end
- rb_pkg_abi = "#{RUBY_ENGINE}:#{RUBY_ENGINE_VERSION}:#{spec.name}"
+ def self.fix_up_rubygem_requires_with_rb_api(rb_api, preamble_text)
+STDERR.puts(preamble_text)
+preamble_text.lines.map do |line|
+ if mo =
/^(?\s*\S+\s*:\s+rubygem\()(?[^\)]+)(?\).*)?$/.match(line)
+if not(mo[:pkg_info] =~ /^ruby:\d\.\d\.\d/)
+ line = "#{mo[:pre_text]}#{rb_api}:#{mo[:pkg_info]}#{mo[:post_text]}"
+end
+ end
+ line
+end.join("\n")
+ end
+
+ rb_api = "#{RUBY_ENGINE}:#{RbConfig::CONFIG['ruby_version']}"
+
+ rb_pkg_abi = "#{rb_api}:#{spec.name}"
rb_suffix = RbConfig::CONFIG['ruby_install_name'].gsub(/^ruby/, '')
rb_pkgname = RbConfig::CONFIG['ruby_install_name'].gsub(/^ruby\./,
'')
@@ -104,7 +118,7 @@
%package -n <%= pkg_basename %><%= config[:version_suffix] %>
# MANUAL
<% if config[:main] && config[:main][:preamble] -%>
-<%= config[:main][:preamble] %>
+<%= fix_up_rubygem_requires_with_rb_api(rb_api, config[:main][:preamble]) %>
<% end -%>
# /MANUAL
Summary:<%= config[:summary] or spec.summary %>
commit ruby-common for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2023-05-08 17:23:46
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.1533 (New)
Package is "ruby-common"
Mon May 8 17:23:46 2023 rev:24 rq:1085263 version:3.2
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2023-02-18
17:10:16.570694486 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.1533/ruby-common.changes
2023-05-08 17:23:48.888528815 +0200
@@ -1,0 +2,24 @@
+Sun May 7 00:35:06 UTC 2023 - Marcus Rueckert
+
+- cleanup irp code
+ - unify error handling using the exit_with_error function
+ - ensure we add generated files
+ - checkin the newly created package
+
+---
+Tue Mar 21 22:42:33 UTC 2023 - Marcus Rueckert
+
+- move new tools into a subpackage ruby-packaging-helpers to avoid
+ dependency to /usr/bin/ruby
+
+---
+Tue Mar 21 18:35:40 UTC 2023 - Marcus Rueckert
+
+- Add 2 new utilities
+ - irp aka initialize ruby package
+does exactly what the name says. does all the work to
+initialize a new ruby package
+ - bundler-dumpdeps: script to generate BR/Requires based on a
+Gemfile.
+
+---
New:
bundler-dumpdeps
irp.rb
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.TyprR9/_old 2023-05-08 17:23:49.444532103 +0200
+++ /var/tmp/diff_new_pack.TyprR9/_new 2023-05-08 17:23:49.444532103 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ruby-common
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -47,6 +47,8 @@
Source15: rails.macros
Source16: g2r
Source17: rubygems_bundled.attr
+Source18: irp.rb
+Source19: bundler-dumpdeps
Summary:Collection of scripts and macros for ruby packaging
License:MIT
Group: Development/Languages/Ruby
@@ -82,6 +84,18 @@
Rails packaging support files.
+%package -n ruby-packaging-helpers
+Requires: %{name} = %{version}-%{release}
+
+Summary:Ruby packaging helpers
+Group: Development/Languages/Ruby
+
+%description -n ruby-packaging-helpers
+This package is needed for (generated) ruby gems. It provides hooks for
+automatic rpm provides and requires and macros that gem2rpm uses.
+
+Some helper tools for packaging rubygems and rails apps.
+
%prep
%build
@@ -105,6 +119,8 @@
install -D -m 0755 %{S:14} %{buildroot}/usr/lib/rpm/gemfile.rb
install -D -m 0644 %{S:15} %{buildroot}%{_rpmmacrodir}/macros.rails
install -D -m 0755 %{S:16} %{buildroot}%{_bindir}/g2r
+install -D -m 0755 %{S:18} %{buildroot}%{_bindir}/irp
+install -D -m 0755 %{S:19} %{buildroot}%{_bindir}/bundler-dumpdeps
install -D -m 0644 %{S:17}
%{buildroot}/usr/lib/rpm/fileattrs/rubygems_bundled.attr
%files
@@ -124,6 +140,11 @@
%{_bindir}/ruby-find-versioned
%{_bindir}/g2r
+%files -n ruby-packaging-helpers
+%defattr(-,root,root)
+%{_bindir}/irp
+%{_bindir}/bundler-dumpdeps
+
%files rails
%defattr(-,root,root)
%{_rpmmacrodir}/macros.rails
++ bundler-dumpdeps ++
#!/usr/bin/ruby
# vim: set sw=2 sts=2 et tw=80 :
require 'bundler'
require 'optparse'
require 'optparse/time'
require 'logger'
class BundlerDumpRpmDeps
def initialize
@requires_text = "BuildRequires: "
parse_options
process_bundler
end
def process_bundler
#
# TODO: have a commaldine option to specify those.
# e.g. in mastodon you also want to skip the no_docker and heroku group
#
bad_groups = [:test, :development]
bd=Bundler::Dsl.evaluate('Gemfile', 'Gemfile.lock', {})
bd.dependencies.each do |dep|
next if (dep.groups - bad_groups).empty?
# this skips local deps
next if dep.source and not(dep.source.path.nil?)
dep.requirement.requirements.each do |req|
req_str = rpmify(dep.name, *req)
puts "#{@requires_text}%{rubygem #{dep.name}#{req_str}}"
end
end
end
def parse_options
opt_parser = OptionParser.new do |opts|
opts.banner = "Usage: bundlerdumpdeps [options]"
opts.separator ""
opts.separator "Specific options:"
opts.on('-b', "Buildtime Requires (default)") do
@requires_text = "BuildRequires: "
end
opts.on('-r', "Runtime Requires") do |args|
@requires_text = "Requires: "
end
end
commit ruby-common for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2023-02-18 17:10:12
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.22824 (New)
Package is "ruby-common"
Sat Feb 18 17:10:12 2023 rev:23 rq:1064060 version:3.2
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2022-11-25
13:11:29.043788718 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.22824/ruby-common.changes
2023-02-18 17:10:16.570694486 +0100
@@ -1,0 +2,5 @@
+Thu Feb 9 16:50:32 UTC 2023 - Marcus Rueckert
+
+- do not rely on file dependencies for getopt
+
+---
@@ -11,0 +17,6 @@
+
+---
+Sat Aug 20 11:19:16 UTC 2022 - Marcus Rueckert
+
+- in the dependency generator for Gemfile.lock we now skip vendored
+ deps
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.pYW9G6/_old 2023-02-18 17:10:17.034697416 +0100
+++ /var/tmp/diff_new_pack.pYW9G6/_new 2023-02-18 17:10:17.038697441 +0100
@@ -61,6 +61,8 @@
# we need a patched rpm
Requires: rpm-with-ruby-provide-hook
%endif
+# for getopt
+Requires: util-linux
%description
This package is needed for (generated) ruby gems. It provides hooks for
++ gemfile.rb ++
--- /var/tmp/diff_new_pack.pYW9G6/_old 2023-02-18 17:10:17.118697947 +0100
+++ /var/tmp/diff_new_pack.pYW9G6/_new 2023-02-18 17:10:17.122697972 +0100
@@ -38,6 +38,8 @@
end
Bundler.definition.specs.each do |dep|
+ # this skips local deps
+ next if dep.source and dep.source.path?
puts "rubygem(#{ruby_abi}:#{dep.name}) = #{dep.version}"
end
commit ruby-common for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2022-11-25 13:11:20
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.1597 (New)
Package is "ruby-common"
Fri Nov 25 13:11:20 2022 rev:22 rq:1037867 version:3.2
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2022-06-21
17:15:27.318348295 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.1597/ruby-common.changes
2022-11-25 13:11:29.043788718 +0100
@@ -1,0 +2,12 @@
+Thu Nov 17 12:01:35 UTC 2022 - Marcus Rueckert
+
+- actually bump the version so we can require the newer version for
+ ruby3.2
+
+---
+Thu Nov 17 11:49:44 UTC 2022 - Marcus Rueckert
+
+- replace `File.exists?` with `File.exist?` as the `File.exists?`
+ is no longer supported in 3.2
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.ldlVJo/_old 2022-11-25 13:11:29.803792963 +0100
+++ /var/tmp/diff_new_pack.ldlVJo/_new 2022-11-25 13:11:29.807792985 +0100
@@ -22,7 +22,7 @@
%endif
Name: ruby-common
-Version:2.6
+Version:3.2
Release:0
# ruby-macros and ruby-common version
%define rpm_macros_version 5
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.ldlVJo/_old 2022-11-25 13:11:29.879793388 +0100
+++ /var/tmp/diff_new_pack.ldlVJo/_new 2022-11-25 13:11:29.879793388 +0100
@@ -231,7 +231,7 @@
pwd = Dir.pwd
bindir = File.join(options.rpmbuildroot, Gem.bindir)
GILogger.info "bindir: #{bindir}"
-if options.symlinkbinaries && File.exists?(bindir)
+if options.symlinkbinaries && File.exist?(bindir)
br_ua_dir = File.join(options.rpmbuildroot, options.ua_dir)
GILogger.info "Creating upate-alternatives dir: #{br_ua_dir}"
FileUtils.mkdir_p(br_ua_dir)
++ gemfile.rb ++
--- /var/tmp/diff_new_pack.ldlVJo/_old 2022-11-25 13:11:29.931793678 +0100
+++ /var/tmp/diff_new_pack.ldlVJo/_new 2022-11-25 13:11:29.935793701 +0100
@@ -24,7 +24,7 @@
appdir = File.dirname(gemfile_lock)
Dir.chdir(appdir)
-unless File.exists? app_info_file then
+unless File.exist? app_info_file then
STDERR.puts "Warning: Skipping Gemfile.lock without appinfo.yaml file"
exit 0
end
commit ruby-common for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2022-06-21 17:15:23
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.1548 (New)
Package is "ruby-common"
Tue Jun 21 17:15:23 2022 rev:21 rq:983973 version:2.6
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2022-02-26
17:01:43.095532430 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.1548/ruby-common.changes
2022-06-21 17:15:27.318348295 +0200
@@ -1,0 +2,10 @@
+Mon Jun 13 11:43:30 UTC 2022 - Marcus Rueckert
+
+- make %gem_unpack and %gem_build work when the default system ruby
+ is not installed:
+
+ both macros now use the %{gem_binary} define and we have a common
+ macro %{set_gem_binary} to set this variable. the set macro will
+ use the ruby-find-versioned to find a versioned version of gem.
+
+---
Other differences:
--
++ ruby.rpm-macros ++
--- /var/tmp/diff_new_pack.3o9J6Z/_old 2022-06-21 17:15:28.222349216 +0200
+++ /var/tmp/diff_new_pack.3o9J6Z/_new 2022-06-21 17:15:28.226349220 +0200
@@ -33,6 +33,17 @@
%rb_vendorlib %{rb_vendorlibdir}
%rb_vendorarch%{rb_vendorarchdir}
+%set_gem_binary() \
+ %if "%{?gem_binary}" == "" \
+ %global gem_binary %(/usr/bin/ruby-find-versioned gem|head -n1) \
+ %endif \
+ %if "%{?gem_binary}" == "" \
+ echo "no gem binary found. Exiting." \
+ exit 1 \
+ %endif \
+%{nil}
+
+
# %%gem_unpack macro unpacks a gem file into %%{_builddir}
#
# example:
@@ -42,17 +53,19 @@
#
%gem_unpack(s:) \
source=%{-s:%{-s*}}%{!-s:%{SOURCE0}} \
- %{?gem_binary}%{!?gem_binary:/usr/bin/gem} unpack --verbose $source \
+ %{set_gem_binary} \
+ %{gem_binary} unpack --verbose $source \
cd %{mod_name}-%{version} \
chmod og-w -R . \
- %{?gem_binary}%{!?gem_binary:/usr/bin/gem} specification --ruby $source >
%{mod_name}-%{version}.gemspec \
+ %{gem_binary} specification --ruby $source > %{mod_name}-%{version}.gemspec \
%{nil}
# %%gem_build macro ...
#
%gem_build() \
GEMSPEC_SOURCE_DIR=`find . -maxdepth 2 -type f -name
%{mod_name}-%{version}.gemspec | xargs dirname` \
-cd $GEMSPEC_SOURCE_DIR && %{?gem_binary}%{!?gem_binary:/usr/bin/gem} build
--verbose %{mod_name}-%{version}.gemspec \
+%{set_gem_binary} \
+cd $GEMSPEC_SOURCE_DIR && %{gem_binary} build --verbose
%{mod_name}-%{version}.gemspec \
%{nil}
# %%gem_install macro ...
commit ruby-common for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2022-02-26 17:01:41
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.1958 (New)
Package is "ruby-common"
Sat Feb 26 17:01:41 2022 rev:20 rq:957504 version:2.6
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2021-08-26
23:14:27.964265268 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.1958/ruby-common.changes
2022-02-26 17:01:43.095532430 +0100
@@ -1,0 +2,5 @@
+Wed Feb 23 22:30:46 UTC 2022 - Dirk M??ller
+
+- avoid bashism in gem_build_cleanup
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.nUfxJ8/_old 2022-02-26 17:01:43.683532523 +0100
+++ /var/tmp/diff_new_pack.nUfxJ8/_new 2022-02-26 17:01:43.691532525 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ruby-common
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++ gem_build_cleanup ++
--- /var/tmp/diff_new_pack.nUfxJ8/_old 2022-02-26 17:01:43.727532531 +0100
+++ /var/tmp/diff_new_pack.nUfxJ8/_new 2022-02-26 17:01:43.731532531 +0100
@@ -1,5 +1,5 @@
#!/bin/sh
-if [ ${#*} = 1 ] ; then
+if [ $# = 1 ] ; then
if [ -d "$1" ] ; then
find $1 \
\( -name \*.o -o -name Makefile -o -name config.log -o -name
config.status -o -name Makefile.html -o -name gem_make.out -o -name mkmf.log -o
-name \*.bak -o -name .deps -o -name .libs -o -name CVS \) \
commit ruby-common for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2021-08-26 23:14:16
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.1899 (New)
Package is "ruby-common"
Thu Aug 26 23:14:16 2021 rev:19 rq:913949 version:2.6
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2021-07-20
15:38:55.461414457 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.1899/ruby-common.changes
2021-08-26 23:14:27.964265268 +0200
@@ -1,0 +2,10 @@
+Tue Aug 24 06:46:07 UTC 2021 - Stephan Kulow
+
+- Do not create links in /etc/alternatives at all - they are ghosts
+ and rpm database will only be confused if we have some wrong
+ information about them (the link target is defined at runtime)
+
+ This aligns with ruby2.7 package to avoid file conflicts about
+ bundler and other built in gems
+
+---
Other differences:
--
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.Kztn7p/_old 2021-08-26 23:14:28.652264659 +0200
+++ /var/tmp/diff_new_pack.Kztn7p/_new 2021-08-26 23:14:28.652264659 +0200
@@ -246,13 +246,9 @@
unversioned = map_executable(options, unversioned)
File.rename(default_path, full_versioned)
patchfile(full_versioned, />= 0(\.a)?/, "= #{options.gemversion}")
- link_target = File.join(Gem.bindir, full_versioned)
# unversioned
[unversioned, ruby_versioned, gem_versioned].each do |linkname|
-full_path = File.join(br_ua_dir, linkname)
ua_path = File.join(options.ua_dir, linkname)
-GILogger.info "Symlinking '#{full_path} -> '#{linkname}'"
-File.symlink(link_target, full_path) unless File.symlink? full_path
GILogger.info "Symlinking '#{linkname}' -> '#{ua_path}'"
File.symlink(ua_path, linkname) unless File.symlink? linkname
end
commit ruby-common for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2021-07-20 15:38:43
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.2632 (New)
Package is "ruby-common"
Tue Jul 20 15:38:43 2021 rev:18 rq:904758 version:2.6
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2021-01-30
13:56:00.605990180 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.2632/ruby-common.changes
2021-07-20 15:38:55.461414457 +0200
@@ -1,0 +2,5 @@
+Thu Jul 8 12:10:25 UTC 2021 - Stephan Kulow
+
+- Fix the links in /etc/alternatives not to point to themselves
+
+---
Other differences:
--
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.fUDwVo/_old 2021-07-20 15:38:56.057415524 +0200
+++ /var/tmp/diff_new_pack.fUDwVo/_new 2021-07-20 15:38:56.057415524 +0200
@@ -246,13 +246,14 @@
unversioned = map_executable(options, unversioned)
File.rename(default_path, full_versioned)
patchfile(full_versioned, />= 0(\.a)?/, "= #{options.gemversion}")
+ link_target = File.join(Gem.bindir, full_versioned)
# unversioned
[unversioned, ruby_versioned, gem_versioned].each do |linkname|
full_path = File.join(br_ua_dir, linkname)
ua_path = File.join(options.ua_dir, linkname)
-GILogger.info "Linking '#{linkname}' to '#{full_path}'"
-File.symlink(linkname, full_path) unless File.symlink? full_path
-GILogger.info "Linking '#{ua_path}' to '#{linkname}'"
+GILogger.info "Symlinking '#{full_path} -> '#{linkname}'"
+File.symlink(link_target, full_path) unless File.symlink? full_path
+GILogger.info "Symlinking '#{linkname}' -> '#{ua_path}'"
File.symlink(ua_path, linkname) unless File.symlink? linkname
end
end
commit ruby-common for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2021-01-30 13:55:59
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.28504 (New)
Package is "ruby-common"
Sat Jan 30 13:55:59 2021 rev:17 rq:866992 version:2.6
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2019-10-10
11:52:01.995546090 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.28504/ruby-common.changes
2021-01-30 13:56:00.605990180 +0100
@@ -1,0 +2,14 @@
+Tue Jan 26 01:46:30 UTC 2021 - Marcus Rueckert
+
+- cleanup the .gem.* dirs that rubygems creates on 3.0
+ (boo#1180528)
+
+---
+Mon Jan 25 18:39:35 UTC 2021 - Marcus Rueckert
+
+- add support to package rubygems plugin dirs
+ as the file is conflicting you can only have one version of the
+ same gem installed if it provides a rubygems plugin. at least for
+ now
+
+---
@@ -10,0 +25,6 @@
+
+---
+Sun May 5 00:09:49 UTC 2019 - Marcus Rueckert
+
+- disable docs and testsuite packaging by default
+- support --no-document option
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.0SamDA/_old 2021-01-30 13:56:01.261991477 +0100
+++ /var/tmp/diff_new_pack.0SamDA/_new 2021-01-30 13:56:01.265991485 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ruby-common
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -50,7 +50,7 @@
Summary:Collection of scripts and macros for ruby packaging
License:MIT
Group: Development/Languages/Ruby
-Url:https://github.com/openSUSE/ruby-packaging/
+URL:https://github.com/openSUSE/ruby-packaging/
Requires: /usr/bin/getopt
Requires: rubygem(gem2rpm)
Recommends: rubygem(%{rb_default_ruby_abi}:gem2rpm)
++ gem_build_cleanup ++
--- /var/tmp/diff_new_pack.0SamDA/_old 2021-01-30 13:56:01.321991595 +0100
+++ /var/tmp/diff_new_pack.0SamDA/_new 2021-01-30 13:56:01.321991595 +0100
@@ -6,6 +6,7 @@
-print0 | xargs -r0 rm -rv || :
# remove more strict in the docu
find $1/doc \( -name Makefile.ri -o -name ext -o -name page\*.ri \)
-print0 | xargs -r0 rm -rv || :
+find $1 -type d -name '.gem.*' -print0 | xargs -r0 rm -rv || :
else
echo "'$1' does not exists or is not a directory! Exiting." >&2
exit 1
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.0SamDA/_old 2021-01-30 13:56:01.337991627 +0100
+++ /var/tmp/diff_new_pack.0SamDA/_new 2021-01-30 13:56:01.337991627 +0100
@@ -42,7 +42,7 @@
options.gemversion=nil
options.gemsuffix=nil
options.otheropts=[]
-options.skipped_docs=[]
+options.skipped_docs=['always']
options.ua_dir='/etc/alternatives'
options.docdir='/usr/share/doc/packages'
# once we start fixing packages set this to true
@@ -142,6 +142,10 @@
opts.on('--no-ri', 'Forwarded to gem install') do |v|
options.skipped_docs << 'ri'
end
+ opts.on('-N', '--no-document', 'Forwarded to gem install') do |v|
+options.skipped_docs << 'ri'
+options.skipped_docs << 'rdoc'
+ end
opts.on('--no-rdoc', 'Forwarded to gem install') do |v|
options.skipped_docs << 'rdoc'
end
++ gem_packages.spec.erb ++
--- /var/tmp/diff_new_pack.0SamDA/_old 2021-01-30 13:56:01.357991666 +0100
+++ /var/tmp/diff_new_pack.0SamDA/_new 2021-01-30 13:56:01.357991666 +0100
@@ -7,7 +7,7 @@
def self.patch_mod_full_name(path, mod_full_name)
path.gsub(/\/-/, "/#{mod_full_name}")
end
-
+
def self.patch_libdir(path)
# path ? path.gsub(/\/usr\/lib(64)?/, '%{_libdir}') : path
path
@@ -17,7 +17,7 @@
return nil unless Gem.ruby_engine == 'ruby' && Gem::Requirement.new("~>
2.1.0").satisfied_by?(Gem.ruby_version)
if gem_spec.respond_to?(:extensions_dir)
rp = gem_spec.extensions_dir.rpartition(gem_spec.base_dir)
- return File.join(rp[1], 'doc', rp[2])
+ return File.join(rp[1], 'doc', rp[2])
end
return nil
end
@@ -26,7 +26,7 @@
versions=spec.version.to_s.split('.')
begin v1=Integer(versions[0]) rescue v1=1 end
begin v2=Integer(versions[1]) rescue v2=0 end
-begin v3=Integer(versions[2]) rescue v3=0 end
+begin v3=Integer(versions[2]) rescue v3=0 end
weight=v1*1+v2*100+v3
end
@@ -60,7 +60,9
