commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2019-10-10 11:51:59
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.2352 (New)
Package is "ruby-common"
Thu Oct 10 11:51:59 2019 rev:16 rq:736057 version:2.6
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2019-06-30
10:14:22.450955766 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.2352/ruby-common.changes
2019-10-10 11:52:01.995546090 +0200
@@ -1,0 +2,6 @@
+Mon Sep 9 11:51:22 UTC 2019 - ch...@computersalat.de
+
+- fix build for SLE 12 / Leap 42
+ * add define _rpmmacrodir /etc/rpm
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.i6kVEy/_old 2019-10-10 11:52:02.783543998 +0200
+++ /var/tmp/diff_new_pack.i6kVEy/_new 2019-10-10 11:52:02.787543988 +0200
@@ -12,10 +12,15 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+### seems that %{_rpmmacrodir} is not known on SLE 12 / Leap 42
+%if 0%{?suse_version} == 1315
+%define _rpmmacrodir /etc/rpm
+%endif
+
Name: ruby-common
Version:2.6
Release:0
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2019-06-30 10:14:21
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.4615 (New)
Package is "ruby-common"
Sun Jun 30 10:14:21 2019 rev:15 rq:711680 version:2.6
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2019-03-01
20:29:35.698008831 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.4615/ruby-common.changes
2019-06-30 10:14:22.450955766 +0200
@@ -1,0 +2,5 @@
+Fri May 10 09:26:26 UTC 2019 - Dominique Leuenberger
+
+- Move RPM macros to %_rpmmacrodir.
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.njlN9K/_old 2019-06-30 10:14:24.074958302 +0200
+++ /var/tmp/diff_new_pack.njlN9K/_new 2019-06-30 10:14:24.078958308 +0200
@@ -84,8 +84,8 @@
%if %{with ship_gemrc}
install -D -m 0644 %{S:2} %{buildroot}/etc/gemrc
%endif
-install -D -m 0644 %{S:8} %{buildroot}/etc/rpm/macros.ruby-common
-install -D -m 0644 %{S:9} %{buildroot}/etc/rpm/macros.suse-ruby
+install -D -m 0644 %{S:8} %{buildroot}%{_rpmmacrodir}/macros.ruby-common
+install -D -m 0644 %{S:9} %{buildroot}%{_rpmmacrodir}/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
@@ -96,7 +96,7 @@
install -D -m 0755 %{S:12} %{buildroot}%{_bindir}/ruby-find-versioned
install -D -m 0644 %{S:13} %{buildroot}/usr/lib/rpm/fileattrs/gemfile.attr
install -D -m 0755 %{S:14} %{buildroot}/usr/lib/rpm/gemfile.rb
-install -D -m 0644 %{S:15} %{buildroot}/etc/rpm/macros.rails
+install -D -m 0644 %{S:15} %{buildroot}%{_rpmmacrodir}/macros.rails
install -D -m 0755 %{S:16} %{buildroot}%{_bindir}/g2r
install -D -m 0644 %{S:17}
%{buildroot}/usr/lib/rpm/fileattrs/rubygems_bundled.attr
@@ -105,7 +105,7 @@
%if %{with ship_gemrc}
%config /etc/gemrc
%endif
-%config /etc/rpm/macros.*ruby*
+%{_rpmmacrodir}/macros.*ruby*
%dir /usr/lib/rpm/fileattrs
/usr/lib/rpm/fileattrs/rubygems.attr
/usr/lib/rpm/fileattrs/rubygems_bundled.attr
@@ -119,7 +119,7 @@
%files rails
%defattr(-,root,root)
-%config /etc/rpm/macros.rails
+%{_rpmmacrodir}/macros.rails
/usr/lib/rpm/fileattrs/gemfile.attr
/usr/lib/rpm/gemfile.rb
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2019-03-01 20:29:34
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new.28833 (New)
Package is "ruby-common"
Fri Mar 1 20:29:34 2019 rev:14 rq:679513 version:2.6
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2018-07-13
10:13:33.301900856 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new.28833/ruby-common.changes
2019-03-01 20:29:35.698008831 +0100
@@ -1,0 +2,21 @@
+Thu Feb 7 20:30:00 UTC 2019 - Marcus Rueckert
+
+- rails.macros: add macro to fix ruby shebang line
+
+---
+Thu Feb 7 20:00:55 UTC 2019 - Marcus Rueckert
+
+- rails.macros: always use ./bin/* stubs for calling binaries
+
+---
+Wed Jan 30 14:54:03 UTC 2019 - Marcus Rueckert
+
+- do not try to delete git files in the rails macros
+
+---
+Fri Dec 21 16:44:00 UTC 2018 - Marcus Rueckert
+
+- --no-rdoc/--no-ri are obsolete in, if we get it passed in convert
+ them to --no-document
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.umUOKE/_old 2019-03-01 20:29:36.286008688 +0100
+++ /var/tmp/diff_new_pack.umUOKE/_new 2019-03-01 20:29:36.286008688 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ruby-common
#
-# 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
@@ -17,7 +17,7 @@
Name: ruby-common
-Version:2.1
+Version:2.6
Release:0
# ruby-macros and ruby-common version
%define rpm_macros_version 5
@@ -26,7 +26,6 @@
%else
%bcond_without ship_gemrc
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source1:gem_build_cleanup
Source2:gemrc
Source4:rubygems.attr
@@ -48,10 +47,8 @@
Group: Development/Languages/Ruby
Url:https://github.com/openSUSE/ruby-packaging/
Requires: /usr/bin/getopt
-#Requires: ruby-devel
Requires: rubygem(gem2rpm)
Recommends: rubygem(%{rb_default_ruby_abi}:gem2rpm)
-#Requires: rubygems > 1.8
Requires: fdupes
BuildArch: noarch
Provides: ruby-macros = %{rpm_macros_version}
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.umUOKE/_old 2019-03-01 20:29:36.322008680 +0100
+++ /var/tmp/diff_new_pack.umUOKE/_new 2019-03-01 20:29:36.322008680 +0100
@@ -42,6 +42,7 @@
options.gemversion=nil
options.gemsuffix=nil
options.otheropts=[]
+options.skipped_docs=[]
options.ua_dir='/etc/alternatives'
options.docdir='/usr/share/doc/packages'
# once we start fixing packages set this to true
@@ -139,10 +140,10 @@
options.otheropts << '-E'
end
opts.on('--no-ri', 'Forwarded to gem install') do |v|
-options.otheropts << '--no-ri'
+options.skipped_docs << 'ri'
end
opts.on('--no-rdoc', 'Forwarded to gem install') do |v|
-options.otheropts << '--no-rdoc'
+options.skipped_docs << 'rdoc'
end
opts.separator ""
opts.separator "Common options:"
@@ -203,6 +204,9 @@
cmdline = [gembinary, 'install', '--verbose', '--local', '--build-root',
options.buildroot]
cmdline += options.otheropts
+unless options.skipped_docs.empty?
+ cmdline << '--no-document'
+end
cmdline << options.gemfile
unless options.extconfopts.nil?
cmdline << '--'
++ rails.macros ++
--- /var/tmp/diff_new_pack.umUOKE/_old 2019-03-01 20:29:36.374008668 +0100
+++ /var/tmp/diff_new_pack.umUOKE/_new 2019-03-01 20:29:36.374008668 +0100
@@ -4,8 +4,7 @@
%{nil}
%rails_regen_gemfile_lock() \
- find -type f -name .gitkeep -print -delete \
- bundle exec rails --version \
+ ./bin/bundle exec ./bin/rails --version \
diff -urN Gemfile.lock{.upstream,} ||: \
%{nil}
@@ -13,6 +12,16 @@
echo -e "---\\\n:ruby_abi: %{rb_build_abi}\\\n" > .appinfo.yml \
%{nil}
+%rails_fix_ruby_shebang() \
+ for S in $(grep -l '#!.*ruby' %* ) ; do \
+SB="${S}.backup" \
+cp ${S} ${SB} \
+perl -p -i -e 's|#!/usr/bin/env ruby|#!%{_bindir}/ruby.%{rb_suffix}|g' $S \
+diff -urN ${SB} ${S} || : \
+rm ${SB} \
+ done \
+%{nil}
+
%rails_fix_ruby_suffix() \
for S in $(grep -r -l '@RUBY_SUFFIX@' ${RPM_SOURCE_DIR}/ | grep -v
'\.spec$') ; do \
SB="${S}.backup" \
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2018-07-13 10:13:27
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is "ruby-common"
Fri Jul 13 10:13:27 2018 rev:13 rq:620969 version:2.1
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2018-02-12
10:08:36.639785557 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2018-07-13 10:13:33.301900856 +0200
@@ -1,0 +2,11 @@
+Wed Jun 6 15:11:27 UTC 2018 - mrueck...@suse.de
+
+- rename the gem_packages template from opensuse.spec.erb to
+ gem_packages.spec.erb
+- add support for binary_map flag in gem2rpm.yml
+ - This can be used to rename the _unversioned_ symlink of the
+binaries in /usr/bin/ to avoid conflicts with other packages
+- gem_packages.spec.erb: sync with file in gem2rpm
+
+
+---
Old:
opensuse.spec.erb
New:
gem_packages.spec.erb
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.ygvQ03/_old 2018-07-13 10:13:33.869901523 +0200
+++ /var/tmp/diff_new_pack.ygvQ03/_new 2018-07-13 10:13:33.869901523 +0200
@@ -36,7 +36,7 @@
Source8:ruby-common.macros
Source9:ruby.rpm-macros
Source10: gem_packages.sh
-Source11: opensuse.spec.erb
+Source11: gem_packages.spec.erb
Source12: ruby-find-versioned
Source13: gemfile.attr
Source14: gemfile.rb
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.ygvQ03/_old 2018-07-13 10:13:33.897901556 +0200
+++ /var/tmp/diff_new_pack.ygvQ03/_new 2018-07-13 10:13:33.897901556 +0200
@@ -22,6 +22,7 @@
require 'logger'
require 'rubygems'
require 'rubygems/package'
+require 'yaml'
begin
require 'rubygems/format'
rescue LoadError => ex
@@ -48,6 +49,7 @@
options.verbose = false
options.rpmsourcedir = ENV['RPM_SOURCE_DIR'] || '/home/abuild/rpmbuild/SOURCES'
options.rpmbuildroot = ENV['RPM_BUILD_ROOT'] ||
'/home/abuild/rpmbuild/BUILDROOT/just-testing'
+options.parsed_config = nil
GILogger = Logger.new(STDERR)
GILogger.level=Logger::DEBUG
@@ -75,6 +77,20 @@
end
end
+def map_executable(options, executable)
+ if not(options.parsed_config.nil? or
+ options.parsed_config[:binary_map].nil? or
+ options.parsed_config[:binary_map][executable].nil?)
+executable=options.parsed_config[:binary_map][executable]
+ end
+ executable
+end
+
+def initialized_gem2rpm_config(options, name)
+ options.config = name
+ options.parsed_config = YAML.load_file(name)
+end
+
opt_parser = OptionParser.new do |opts|
opts.banner = "Usage: gem_install.rb [options]"
@@ -82,7 +98,7 @@
opts.separator "Specific options:"
opts.on('--config [FILENAME]', 'path to gem2rpm.yml') do |name|
-options.config = name
+initialized_gem2rpm_config(options, name)
end
opts.on('--default-gem [FILENAME]', 'Which filename to use when we dont find
another gem file.') do |fname|
@@ -152,6 +168,13 @@
GILogger.info "Found gem #{options.gemfile}"
end
+if options.config.nil?
+ name = File.join(options.rpmsourcedir, 'gem2rpm.yml')
+ if File.exist?(name)
+initialized_gem2rpm_config(options, name)
+ end
+end
+
package = Gem::Package.new(options.gemfile) rescue
Gem::Format.from_file_by_path(options.gemfile)
spec = package.spec
gemdir= File.join(Gem.dir, 'gems',
"#{options.gemname}-#{options.gemversion}")
@@ -212,6 +235,7 @@
full_versioned = "#{unversioned}#{options.rubysuffix}-#{spec.version}"
ruby_versioned = "#{unversioned}#{options.rubysuffix}"
gem_versioned = "#{unversioned}-#{spec.version}"
+ unversioned = map_executable(options, unversioned)
File.rename(default_path, full_versioned)
patchfile(full_versioned, />= 0(\.a)?/, "= #{options.gemversion}")
# unversioned
++ gem_packages.spec.erb ++
<%
begin
require 'rbconfigpackagingsupport'
rescue LoadError => ex
end
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
end
def self.get_extension_doc_dir(gem_spec)
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])
end
return nil
end
def self.get_mod_weight(spec)
versions=spec.version.to_s.split('.')
begin v1=Integer(versions[0])
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2018-02-12 10:08:32
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is "ruby-common"
Mon Feb 12 10:08:32 2018 rev:12 rq:574040 version:2.1
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2017-12-21
11:27:30.272929556 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2018-02-12 10:08:36.639785557 +0100
@@ -1,0 +2,6 @@
+Wed Jan 24 16:13:42 UTC 2018 - lnus...@suse.de
+
+- generate bundled(rubygem($name)) = $version provides for bundled
+ gems in the vendor directory.
+
+---
New:
rubygems_bundled.attr
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.VFwOuZ/_old 2018-02-12 10:08:39.171694308 +0100
+++ /var/tmp/diff_new_pack.VFwOuZ/_new 2018-02-12 10:08:39.175694163 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ruby-common
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -42,6 +42,7 @@
Source14: gemfile.rb
Source15: rails.macros
Source16: g2r
+Source17: rubygems_bundled.attr
Summary:Collection of scripts and macros for ruby packaging
License:MIT
Group: Development/Languages/Ruby
@@ -100,6 +101,7 @@
install -D -m 0755 %{S:14} %{buildroot}/usr/lib/rpm/gemfile.rb
install -D -m 0644 %{S:15} %{buildroot}/etc/rpm/macros.rails
install -D -m 0755 %{S:16} %{buildroot}%{_bindir}/g2r
+install -D -m 0644 %{S:17}
%{buildroot}/usr/lib/rpm/fileattrs/rubygems_bundled.attr
%files
%defattr(-,root,root)
@@ -109,6 +111,7 @@
%config /etc/rpm/macros.*ruby*
%dir /usr/lib/rpm/fileattrs
/usr/lib/rpm/fileattrs/rubygems.attr
+/usr/lib/rpm/fileattrs/rubygems_bundled.attr
/usr/lib/rpm/rubygemsdeps.rb
/usr/lib/rpm/gem_install.sh
/usr/lib/rpm/gem_build_cleanup.sh
++ rubygems_bundled.attr ++
%__rubygems_bundled_provides%{_rpmconfigdir}/rubygemsdeps.rb --provides
--bundled
%__rubygems_bundled_path.*/vendor/bundle/.*/specifications/.*\.gemspec$
++ rubygemsdeps.rb ++
--- /var/tmp/diff_new_pack.VFwOuZ/_old 2018-02-12 10:08:39.375686956 +0100
+++ /var/tmp/diff_new_pack.VFwOuZ/_new 2018-02-12 10:08:39.379686811 +0100
@@ -47,7 +47,12 @@
opts.on("-R", "--requires", "Output the requires of the package") do |val|
requires=true
end
-file_match=".*/gems/[^/]*/specifications/.*\.gemspec$"
+bundled=false
+opts.on("-b", "--bundled", "Output provides as bundled ones") do |val|
+ bundled=true
+end
+
+file_match=nil
opts.on("-m", "--file-match REGEX", String,
"Override the regex against which the input file names",
"matched with the supplied regex") do |val|
@@ -65,6 +70,19 @@
exit(0)
end
+if file_match.nil?
+ if bundled
+file_match = ".*/vendor/bundle/[^/]*/[^/]*/specifications/.*\.gemspec$"
+ else
+file_match = ".*/gems/[^/]*/specifications/.*\.gemspec$"
+ end
+end
+
+$rubyapi_re = %r{.*/([^/]*)/gems/([^/]*)/.*}
+if bundled
+ $rubyapi_re = %r{.*/vendor/bundle/([^/]*)/([^/]*)/.*}
+end
+
def fatal(msg)
$stderr.puts msg
exit 1
@@ -89,7 +107,7 @@
end
def rubyabi_from_path(path)
- m = path.match(%r{.*/([^/]*)/gems/([^/]*)/.*})
+ m = path.match($rubyapi_re)
# return m ? m[1] : RbConfig::CONFIG["ruby_version"]
return { :interpreter => m[1], :version => m[2], :abi => "#{m[1]}:#{m[2]}",
:requires => "#{m[1]}(abi) = #{m[2]}" }
end
@@ -124,12 +142,16 @@
# puts "rubygem-#{spec.name}-#{versions[0]}_#{versions[1]}_#{versions[2]}
= #{spec.version}" if versions.length > 2
# version without ruby version - asking for trouble
-puts "rubygem(#{spec.name}) = #{spec.version}"
-if rubyabi
- puts "rubygem(#{rubyabi}:#{spec.name}) = #{spec.version}"
- puts "rubygem(#{rubyabi}:#{spec.name}:#{versions[0]}) = #{spec.version}"
if versions.length > 0
- puts "rubygem(#{rubyabi}:#{spec.name}:#{versions[0]}.#{versions[1]}) =
#{spec.version}" if versions.length > 1
- puts
"rubygem(#{rubyabi}:#{spec.name}:#{versions[0]}.#{versions[1]}.#{versions[2]})
= #{spec.version}" if versions.length > 2
+if bundled
+ puts "bundled(rubygem(#{spec.name})) = #{spec.version}"
+else
+ puts "rubygem(#{spec.name}) = #{spec.version}"
+ if rubyabi
+ puts "rubygem(#{rubyabi}:#{spec.name}) = #{spec.version}"
+ puts
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2017-12-21 11:27:18
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is "ruby-common"
Thu Dec 21 11:27:18 2017 rev:11 rq:558540 version:2.1
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2017-06-20
10:59:21.192363392 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2017-12-21 11:27:30.272929556 +0100
@@ -1,0 +2,29 @@
+Tue Dec 12 13:30:27 UTC 2017 - mrueck...@suse.de
+
+- switch requires of the autogenerated subpackages from
+ rb_suffix-rubygem-gemname = version to
+ rubygem(rb_abi:gemname) = version
+
+---
+Thu Nov 30 03:40:08 UTC 2017 - mrueck...@suse.de
+
+- split our the rails part
+
+---
+Thu Nov 30 03:25:39 UTC 2017 - mrueck...@suse.de
+
+- we need bundler now. given ruby 2.5 will have it intree anyway,
+ this soon wont be a big burden.
+
+---
+Thu Nov 30 02:40:03 UTC 2017 - mrueck...@suse.de
+
+- add support to generate requires from Gemfile.lock
+
+---
+Mon Aug 7 10:20:07 UTC 2017 - mrueck...@suse.de
+
+- package the buildinfo dir
+- allow passing options to extconf.rb
+
+---
New:
g2r
gemfile.attr
gemfile.rb
rails.macros
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.Zxfq2p/_old 2017-12-21 11:27:31.976846474 +0100
+++ /var/tmp/diff_new_pack.Zxfq2p/_new 2017-12-21 11:27:31.980846279 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ruby-common
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -38,6 +38,10 @@
Source10: gem_packages.sh
Source11: opensuse.spec.erb
Source12: ruby-find-versioned
+Source13: gemfile.attr
+Source14: gemfile.rb
+Source15: rails.macros
+Source16: g2r
Summary:Collection of scripts and macros for ruby packaging
License:MIT
Group: Development/Languages/Ruby
@@ -59,6 +63,20 @@
This package is needed for (generated) ruby gems. It provides hooks for
automatic rpm provides and requires and macros that gem2rpm uses.
+%package rails
+Requires: rubygem(bundler)
+Recommends: rubygem(%{rb_default_ruby_abi}:bundler)
+Requires: %{name} = %{version}-%{release}
+
+Summary:Rails packaging support
+Group: Development/Languages/Ruby
+
+%description rails
+This package is needed for (generated) ruby gems. It provides hooks for
+automatic rpm provides and requires and macros that gem2rpm uses.
+
+Rails packaging support files.
+
%prep
%build
@@ -78,13 +96,17 @@
install -D -m 0755 %{S:10} %{buildroot}/usr/lib/rpm/gem_packages.sh
install -D -m 0644 %{S:11} %{buildroot}/usr/lib/rpm/gem_packages.template
install -D -m 0755 %{S:12} %{buildroot}%{_bindir}/ruby-find-versioned
+install -D -m 0644 %{S:13} %{buildroot}/usr/lib/rpm/fileattrs/gemfile.attr
+install -D -m 0755 %{S:14} %{buildroot}/usr/lib/rpm/gemfile.rb
+install -D -m 0644 %{S:15} %{buildroot}/etc/rpm/macros.rails
+install -D -m 0755 %{S:16} %{buildroot}%{_bindir}/g2r
%files
%defattr(-,root,root)
%if %{with ship_gemrc}
%config /etc/gemrc
%endif
-%config /etc/rpm/macros.*
+%config /etc/rpm/macros.*ruby*
%dir /usr/lib/rpm/fileattrs
/usr/lib/rpm/fileattrs/rubygems.attr
/usr/lib/rpm/rubygemsdeps.rb
@@ -93,5 +115,12 @@
/usr/lib/rpm/generate_buildrequires.sh
/usr/lib/rpm/gem_packages.*
%{_bindir}/ruby-find-versioned
+%{_bindir}/g2r
+
+%files rails
+%defattr(-,root,root)
+%config /etc/rpm/macros.rails
+/usr/lib/rpm/fileattrs/gemfile.attr
+/usr/lib/rpm/gemfile.rb
%changelog
++ g2r ++
#!/bin/sh
if [ -e gem2rpm.yml ] ; then
cfg="--config gem2rpm.yml"
fi
exec gem2rpm $cfg -o *spec *gem
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.Zxfq2p/_old 2017-12-21 11:27:32.024844134 +0100
+++ /var/tmp/diff_new_pack.Zxfq2p/_new 2017-12-21 11:27:32.024844134 +0100
@@ -88,6 +88,9 @@
opts.on('--default-gem [FILENAME]', 'Which filename to use when we dont find
another gem file.') do |fname|
options.defaultgem=fname
end
+ opts.on('--extconf-opts [EXTOPTS]', 'which options to pass to extconf') do
|extopts|
+
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2017-06-20 10:58:26
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is "ruby-common"
Tue Jun 20 10:58:26 2017 rev:10 rq:503701 version:2.1
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2016-03-11
09:46:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2017-06-20 10:59:21.192363392 +0200
@@ -1,0 +2,6 @@
+Tue Jun 13 21:11:20 UTC 2017 - bwiedem...@suse.com
+
+- Call fdupes -o name to make sure we always create symlinks
+ in the same direction to make builds reproducible
+
+---
Other differences:
--
++ ruby.rpm-macros ++
--- /var/tmp/diff_new_pack.Ej3zSm/_old 2017-06-20 10:59:21.948256845 +0200
+++ /var/tmp/diff_new_pack.Ej3zSm/_new 2017-06-20 10:59:21.948256845 +0200
@@ -68,7 +68,7 @@
for gem in $(/usr/bin/ruby-find-versioned gem) ; do \
gem_base="$($gem env gemdir)" \
/usr/lib/rpm/gem_build_cleanup.sh %{buildroot}${gem_base} \
- fdupes -q -p -n -r %{buildroot}${gem_base} | \
+ fdupes -q -p -n -r -o name %{buildroot}${gem_base} | \
while read _file; do \
if test -z "$_target" ; then \
_target="$_file"; \
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2016-03-11 09:46:58
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is "ruby-common"
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2015-07-05
17:56:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2016-03-11 09:46:59.0 +0100
@@ -1,0 +2,10 @@
+Tue Mar 1 01:01:56 UTC 2016 - mrueck...@suse.de
+
+- Since rubygems 2.5.0 the default version in the gem bin stub
+ changed from '>= 0' to '>= 0.a'. This was done to allow
+ prerelease versions. Our patching script didn't take the '.a'
+ into account and generated version fields like '= 0.10.1.a'
+ instead of the expected '= 0.10.1'. This fix accounts for the
+ '.a'.
+
+---
Other differences:
--
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.y3CP7q/_old 2016-03-11 09:47:02.0 +0100
+++ /var/tmp/diff_new_pack.y3CP7q/_new 2016-03-11 09:47:02.0 +0100
@@ -206,7 +206,7 @@
ruby_versioned = "#{unversioned}#{options.rubysuffix}"
gem_versioned = "#{unversioned}-#{spec.version}"
File.rename(default_path, full_versioned)
- patchfile(full_versioned, />= 0/, "= #{options.gemversion}")
+ patchfile(full_versioned, />= 0(\.a)?/, "= #{options.gemversion}")
# unversioned
[unversioned, ruby_versioned, gem_versioned].each do |linkname|
full_path = File.join(br_ua_dir, linkname)
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2015-07-05 17:56:06
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2015-05-07
08:28:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2015-07-05 17:56:07.0 +0200
@@ -1,0 +2,6 @@
+Thu Jun 11 14:33:37 UTC 2015 - lnus...@suse.de
+
+- help the solver to pick the right gem2rpm for the default ruby
+ version (bnc#934328)
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.5OHxOo/_old 2015-07-05 17:56:08.0 +0200
+++ /var/tmp/diff_new_pack.5OHxOo/_new 2015-07-05 17:56:08.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ruby-common
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -45,6 +45,7 @@
Requires: /usr/bin/getopt
#Requires: ruby-devel
Requires: rubygem(gem2rpm)
+Recommends: rubygem(%{rb_default_ruby_abi}:gem2rpm)
#Requires: rubygems 1.8
Requires: fdupes
BuildArch: noarch
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2015-05-07 08:28:03
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2015-01-23
15:46:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2015-05-07 08:28:04.0 +0200
@@ -1,0 +2,81 @@
+Sat May 2 11:55:31 UTC 2015 - mrueck...@suse.de
+
+- Fix patching of the shebang line
+
+---
+Thu Apr 16 21:45:29 UTC 2015 - mrueck...@suse.de
+
+- The script sometimes returned from gem install already although
+ the install wasn't finished yet. This broke e.g. the binary
+ rename part.
+
+---
+Fri Mar 13 18:20:33 UTC 2015 - mrueck...@suse.de
+
+- Fail early if gem install fails
+ This avoids confusing error messages at the end of the build.
+
+---
+Fri Mar 13 14:56:55 UTC 2015 - mrueck...@suse.de
+
+- More fixes for ruby 1.8
+
+---
+Fri Mar 13 14:06:32 UTC 2015 - mrueck...@suse.de
+
+- Ruby 1.8 insists on the () for the parameter
+
+---
+Fri Mar 13 13:55:20 UTC 2015 - mrueck...@suse.de
+
+- Cleaner solution for the extensions doc dir
+ The other solution was also failing on 1.8
+
+---
+Fri Mar 13 13:28:52 UTC 2015 - mrueck...@suse.de
+
+- Forgot another option for forwarding
+
+---
+Fri Mar 13 09:19:52 UTC 2015 - mrueck...@suse.de
+
+- Do not overwrite options.otheropts
+
+---
+Fri Mar 13 02:48:50 UTC 2015 - mrueck...@suse.de
+
+- Fixed forwarding of options to gem install
+
+---
+Fri Mar 13 02:26:12 UTC 2015 - mrueck...@suse.de
+
+- Only use the extensions doc dir on MRI 2.1.x
+
+---
+Fri Mar 13 01:58:02 UTC 2015 - mrueck...@suse.de
+
+- Fix the ruby suffix for distributions before 13.2
+- Do not fail with --gem-binary
+
+---
+Fri Mar 13 01:28:08 UTC 2015 - mrueck...@suse.de
+
+- switch to ruby version of gem_install.sh
+- added ruby-find-versioned to make it easier to find versioned
+ binaries.
+ - all for loops in the shell scripts and macros are now using
+this script
+
+---
+Thu Mar 12 16:17:20 UTC 2015 - mrueck...@suse.de
+
+- call ruby with -x from shell wrappers otherwise we run into an
+ endless loop
+
+---
+Thu Jan 15 10:59:59 UTC 2015 - dmuel...@suse.com
+
+- rubygemsdeps.rb: add shell-launcher to avoid dependency on
+ a fixed ruby version
+
+---
New:
ruby-find-versioned
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.IfFIdi/_old 2015-05-07 08:28:05.0 +0200
+++ /var/tmp/diff_new_pack.IfFIdi/_new 2015-05-07 08:28:05.0 +0200
@@ -37,9 +37,11 @@
Source9:ruby.rpm-macros
Source10: gem_packages.sh
Source11: opensuse.spec.erb
+Source12: ruby-find-versioned
Summary:Collection of scripts and macros for ruby packaging
License:MIT
Group: Development/Languages/Ruby
+Url:https://github.com/openSUSE/ruby-packaging/
Requires: /usr/bin/getopt
#Requires: ruby-devel
Requires: rubygem(gem2rpm)
@@ -74,6 +76,7 @@
install -D -m 0755 %{S:7} %{buildroot}/usr/lib/rpm/generate_buildrequires.sh
install -D -m 0755 %{S:10} %{buildroot}/usr/lib/rpm/gem_packages.sh
install -D -m 0644 %{S:11} %{buildroot}/usr/lib/rpm/gem_packages.template
+install -D -m 0755 %{S:12} %{buildroot}%{_bindir}/ruby-find-versioned
%files
%defattr(-,root,root)
@@ -88,5 +91,6 @@
/usr/lib/rpm/gem_build_cleanup.sh
/usr/lib/rpm/generate_buildrequires.sh
/usr/lib/rpm/gem_packages.*
+%{_bindir}/ruby-find-versioned
%changelog
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.IfFIdi/_old 2015-05-07 08:28:05.0 +0200
+++ /var/tmp/diff_new_pack.IfFIdi/_new 2015-05-07 08:28:05.0 +0200
@@ -1,129 +1,249 @@
-#! /bin/bash
-
-set -e
+#!/bin/sh
+# vim:
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2015-01-23 15:46:04
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2014-12-23
11:50:48.0 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2015-01-23 15:46:07.0 +0100
@@ -1,0 +2,5 @@
+Tue Jan 13 17:01:02 UTC 2015 - dmuel...@suse.com
+
+- gem_install.sh: fix ruby shebang patching
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.SDpysS/_old 2015-01-23 15:46:08.0 +0100
+++ /var/tmp/diff_new_pack.SDpysS/_new 2015-01-23 15:46:08.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ruby-common
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.SDpysS/_old 2015-01-23 15:46:08.0 +0100
+++ /var/tmp/diff_new_pack.SDpysS/_new 2015-01-23 15:46:08.0 +0100
@@ -119,7 +119,7 @@
if [ -d $buildroot ]; then
find ${buildroot}${gemdir} -type f -perm /u+x | while read file; do
# TODO: scripts in ruby/1.9.1 should call ruby1.9 for consistency
- perl -p -i -e s,^#!/usr/bin/env ruby,#!/usr/bin/ruby,; s,^#! *[^
]*/ruby\S\+,#!/usr/bin/ruby$ruby, $file
+ perl -p -i -e s,^#!/usr/bin/env ruby,#!/usr/bin/ruby,; s,^#! *[^
]*/ruby\S*,#!/usr/bin/ruby$ruby, $file
done
# some windows made gems are broken
find $buildroot -ls
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2014-12-23 11:52:18
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2014-11-05
16:26:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2014-12-23 11:50:48.0 +0100
@@ -1,0 +2,5 @@
+Sat Nov 15 23:46:00 UTC 2014 - Led led...@gmail.com
+
+- fix bashisms in generate_buildrequires.sh script
+
+---
Other differences:
--
++ generate_buildrequires.sh ++
--- /var/tmp/diff_new_pack.8uNhY8/_old 2014-12-23 11:50:49.0 +0100
+++ /var/tmp/diff_new_pack.8uNhY8/_new 2014-12-23 11:50:49.0 +0100
@@ -94,11 +94,15 @@
usage () {
# Call as: usage [EXITCODE] [USAGE MESSAGE]
-exit_code=1
-if [[ $1 == [0-9] ]]; then
-exit_code=$1
-shift
-fi
+case $1 in
+[0-9])
+exit_code=$1
+shift
+;;
+*)
+exit_code=1
+;;
+esac
if [ -n $1 ]; then
echo $* 2
echo
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2014-11-05 16:26:25
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2014-10-20
07:27:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2014-11-05 16:26:27.0 +0100
@@ -1,0 +2,9 @@
+Tue Oct 21 15:50:45 UTC 2014 - mrueck...@suse.de
+
+- restore changes lost by the previous change
+ - load rbconfigpackagingsupport if available and fail gracefully
+if not.
+ - dont use not() it breaks the build on 1.8
+ - remove requires onto the ruby version
+
+---
@@ -4,0 +14,6 @@
+
+---
+Mon Sep 29 21:11:08 UTC 2014 - mrueck...@suse.de
+
+- ignore any files we find in */.gem/*. in some versions of
+ rubygems, gems that are installed are also copied to ~/.gem/.
Other differences:
--
++ gem_packages.sh ++
--- /var/tmp/diff_new_pack.8xoQAu/_old 2014-11-05 16:26:28.0 +0100
+++ /var/tmp/diff_new_pack.8xoQAu/_new 2014-11-05 16:26:28.0 +0100
@@ -44,7 +44,7 @@
fi
if [ x$gemfile = x ] ; then
- gemfile=$(find . -maxdepth 2 -type f -name $defaultgem)
+ gemfile=$(find . -maxdepth 2 -type f -name $defaultgem -not -path
\*/.gem/\* | head -n 1)
# if still empty, we pick the sources
if [ x$gemfile = x ] ; then
gemfile=$(find $RPM_SOURCE_DIR -name $defaultgem)
++ opensuse.spec.erb ++
--- /var/tmp/diff_new_pack.8xoQAu/_old 2014-11-05 16:26:28.0 +0100
+++ /var/tmp/diff_new_pack.8xoQAu/_new 2014-11-05 16:26:28.0 +0100
@@ -1,4 +1,9 @@
%
+
+ begin
+require 'rbconfigpackagingsupport'
+ rescue LoadError = ex
+ end
def self.patch_mod_full_name(path, mod_full_name)
path.gsub(/\/-/, /#{mod_full_name})
end
@@ -77,11 +82,6 @@
#/ruby2.1
%
%package -n %= pkg_basename %%= config[:version_suffix] %
-% for req in spec.required_ruby_version -%
-% unless req.empty? -%
-Requires: %= rb_pkgname % %= req %
-% end -%
-% end -%
# MANUAL
% if config[:main] config[:main][:preamble] -%
%= config[:main][:preamble] %
@@ -96,7 +96,7 @@
%description -n %= pkg_basename %%= config[:version_suffix] %
%= config[:description] or spec.description -%
-% if spec.has_rdoc not(config[:disable_docs]) -%
+% if spec.has_rdoc !(config[:disable_docs]) -%
%package -n %= pkg_basename %-doc%= config[:version_suffix] %
Summary:RDoc documentation for %= spec.name %
Group: Development/Languages/Ruby
@@ -191,7 +191,7 @@
% end -%
%= gem_spec_dir %/%= mod_full_name -%.gemspec
-% if spec.has_rdoc not(config[:disable_docs]) -%
+% if spec.has_rdoc !(config[:disable_docs]) -%
%files -n %= pkg_basename %-doc%= config[:version_suffix] %
%defattr(-,root,root,-)
%doc %= gem_doc_dir %
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community, here is the log from the commit of package ruby-common for openSUSE:Factory checked in at 2014-10-20 07:27:08 Comparing /work/SRC/openSUSE:Factory/ruby-common (Old) and /work/SRC/openSUSE:Factory/.ruby-common.new (New) Package is ruby-common Changes: --- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2014-09-20 15:51:11.0 +0200 +++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes 2014-10-20 07:27:09.0 +0200 @@ -1,0 +2,109 @@ +Sat Oct 18 05:37:19 UTC 2014 - co...@suse.com + +- update gem_packages template from git + +--- +Fri Sep 26 21:53:30 UTC 2014 - mrueck...@suse.de + +- we dont always have /usr/bin/ruby, use perl for patching the + version in the bin wrapper. also replaced the sed for patching + the shebang line. +- fixed a bad bug in the shebang line. we had an additional . + there. + +--- +Fri Sep 26 21:22:24 UTC 2014 - mrueck...@suse.de + +- install gemrc on all distros + +--- +Fri Sep 26 10:30:56 UTC 2014 - mrueck...@suse.de + +- dont delete .a files. there are actually gems where we need them + like rubygem-libv8 for rubygem-therubyracer + +--- +Tue Sep 23 15:31:56 UTC 2014 - mrueck...@suse.de + +- fix the case where we dont symlink the binaries. + +--- +Fri Sep 19 15:10:30 UTC 2014 - mrueck...@suse.de + +- gem_cleanup macro was missed when updating for old ruby versions. + +--- +Fri Sep 19 14:46:08 UTC 2014 - mrueck...@suse.de + +- switch from ruby -rrubygems -e + 'print Gem::Specification.new.base_dir' + to gem env gemdir + +--- +Fri Sep 19 10:35:57 UTC 2014 - mrueck...@suse.de + +- gem_build_cleanup: also delete static library files + +--- +Wed Sep 17 16:33:06 UTC 2014 - mrueck...@suse.de + +- ruby 1.8 support: + - gem_packages.sh: change to /usr/src/packages when +/home/abuild/rpmbuild doesn't exist. + - gem_packages template: +- require rbconfigpackagingsupport to fix the ruby_install_name + dependent variables. we do that for all distros but catch the + LoadError and continue. +- and dont use not(), we need to use ! instead. + +--- +Wed Sep 17 16:07:09 UTC 2014 - mrueck...@suse.de + +- our sle 11 sp3 rpm does provide the support for the automatic + rubygems dependency but does not provide + rpm-with-ruby-provide-hook. guard the requires with 1110 + +--- +Wed Sep 17 15:56:49 UTC 2014 - mrueck...@suse.de + +- remove the handling of spec.required_ruby_version here. this + should be handled in rubygemsdeps.rb if at all. we already guard + for this in the buildrequires and then have a requires via the + $interpreter(abi) requires onto the newer version. + +--- +Wed Sep 17 15:32:46 UTC 2014 - mrueck...@suse.de + +- invert the logic. only stop shipping /etc/gemrc on 12.3 and 13.1 + +--- +Wed Sep 17 15:02:38 UTC 2014 - mrueck...@suse.de + +- gem_packages template: + Dont allow an suffix with just a plain number. prefix it with + ruby. + +--- +Wed Sep 17 14:30:49 UTC 2014 - mrueck...@suse.de + +- gem_packages also need the rewrite that rewrites a number only + suffix into .rubynumbersuffix + +--- +Wed Sep 17 13:53:09 UTC 2014 - mrueck...@suse.de + +- made the matcher for older versions more strict so we dont pick + up gem2rpm. + +--- +Wed Sep 17 13:48:54 UTC 2014 - mrueck...@suse.de + +- also add support for older versioning in gem_packages.sh + +--- +Wed Sep 17 13:28:15 UTC 2014 - mrueck...@suse.de + +- added support for the versioning scheme in 13.1 and older +- dont ship gemrc on 13.1 + +--- Other differences: -- ++ ruby-common.spec ++ --- /var/tmp/diff_new_pack.y4FEUQ/_old 2014-10-20 07:27:09.0 +0200 +++ /var/tmp/diff_new_pack.y4FEUQ/_new 2014-10-20
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2014-09-20 15:51:10
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2014-09-12
12:22:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2014-09-20 15:51:11.0 +0200
@@ -1,0 +2,11 @@
+Mon Sep 15 14:31:22 UTC 2014 - mrueck...@suse.de
+
+- the ruby(abi) = $interpreter:$abiversion was not a good idea. rpm
+ treats the $interpreter part as epoch. instead we use now:
+ $interpreter(abi) = $abiversion
+
+ For MRI it means we are basically back to ruby(abi).
+ Examples for alternative ruby interpreters are rubinius(abi) and
+ jruby(abi) (bnc#896658)
+
+---
Other differences:
--
++ rubygemsdeps.rb ++
--- /var/tmp/diff_new_pack.BOusYg/_old 2014-09-20 15:51:12.0 +0200
+++ /var/tmp/diff_new_pack.BOusYg/_new 2014-09-20 15:51:12.0 +0200
@@ -80,7 +80,7 @@
def rubyabi_from_path(path)
m = path.match(%r{.*/([^/]*)/gems/([^/]*)/.*})
# return m ? m[1] : RbConfig::CONFIG[ruby_version]
- return { :interpreter = m[1], :version = m[2], :abi = #{m[1]}:#{m[2]} }
+ return { :interpreter = m[1], :version = m[2], :abi = #{m[1]}:#{m[2]},
:requires = #{m[1]}(abi) = #{m[2]} }
end
gemspecs = Array.new
@@ -103,6 +103,7 @@
gemspecs.each do |rubyabi_hash, spec|
rubyabi = rubyabi_hash[:abi]
+ rubyabi_requires = rubyabi_hash[:requires]
if provides
versions = spec.version.to_s.split('.')
# old forms
@@ -122,7 +123,7 @@
end
if requires
-puts ruby(abi) = #{rubyabi} if rubyabi
+puts rubyabi_requires if rubyabi_requires
puts rubygems if rubyabi_hash[:version].to_f 1.9
spec.runtime_dependencies.each do |dep|
dep.requirement.requirements.each do |r|
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2013-09-27 18:05:42
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2013-06-06
16:42:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2013-09-27 18:05:43.0 +0200
@@ -1,0 +2,6 @@
+Sat Sep 7 20:27:22 UTC 2013 - co...@suse.com
+
+- do no longer buildrequire rubygems_with_buildroot_patch, that's
+ history long enough - ruby-devel will do
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.fQxBL2/_old 2013-09-27 18:05:44.0 +0200
+++ /var/tmp/diff_new_pack.fQxBL2/_new 2013-09-27 18:05:44.0 +0200
@@ -30,8 +30,8 @@
License:MIT
Group: Development/Languages/Ruby
Requires: /usr/bin/getopt
+Requires: ruby-devel
Requires: rubygems 1.8
-Requires: rubygems_with_buildroot_patch
BuildArch: noarch
Provides: ruby-macros = %{version}
%if 0%{?suse_version} 1140
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2013-06-06 16:42:27
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2013-05-07
07:34:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2013-06-06 16:42:28.0 +0200
@@ -1,0 +2,5 @@
+Thu Jun 6 14:41:53 UTC 2013 - co...@suse.com
+
+- fixed ~ 3.4 to actually require 3
+
+---
Other differences:
--
++ rubygemsdeps.rb ++
--- /var/tmp/diff_new_pack.PLKO0u/_old 2013-06-06 16:42:28.0 +0200
+++ /var/tmp/diff_new_pack.PLKO0u/_new 2013-06-06 16:42:28.0 +0200
@@ -128,7 +128,7 @@
minversion = r.last.to_s.split('.')
versions = minversion[0,minversion.length-1]
# ~ 2 is pretty nonsense, so avoid being tricked
- if versions.length 1
+ if versions.length 0
if minversion[minversion.length-1] == '0'
# ~ 1.2.0 is the same as = 1.2 for rpm and it avoids problems
when 1.2 is followed by 1.2.1
minversion = versions
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2013-05-07 07:34:48
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2013-04-15
11:17:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2013-05-07 07:34:50.0 +0200
@@ -1,0 +2,5 @@
+Mon Apr 29 07:59:35 UTC 2013 - co...@suse.com
+
+- switch to ruby 2.0 as default
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.NSSQ50/_old 2013-05-07 07:34:51.0 +0200
+++ /var/tmp/diff_new_pack.NSSQ50/_new 2013-05-07 07:34:51.0 +0200
@@ -17,7 +17,7 @@
Name: ruby-common
-Version:2.0
+Version:2.1
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source1:gem_build_cleanup
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.NSSQ50/_old 2013-05-07 07:34:51.0 +0200
+++ /var/tmp/diff_new_pack.NSSQ50/_new 2013-05-07 07:34:51.0 +0200
@@ -42,10 +42,10 @@
$gem_binary install --verbose --local $otheropts
if test -d $RPM_BUILD_ROOT/usr/bin; then
cd $RPM_BUILD_ROOT/usr/bin
- bins=`ls -1 *1.9 2 /dev/null` || true
+ bins=`ls -1 *2.0 2 /dev/null` || true
if test -n $bins; then
for bin in $bins; do
- mv -v $bin $(echo $bin | sed -e 's,1.9$,,')
+ mv -v $bin $(echo $bin | sed -e 's,2.0$,,')
done
fi
fi
++ ruby.common-macros ++
--- /var/tmp/diff_new_pack.NSSQ50/_old 2013-05-07 07:34:51.0 +0200
+++ /var/tmp/diff_new_pack.NSSQ50/_new 2013-05-07 07:34:51.0 +0200
@@ -10,7 +10,7 @@
%{?gem_binary}%{!?gem_binary:/usr/bin/gem} unpack --verbose $source \
cd %{mod_name}-%{version} \
chmod og-w -R . \
- %{?gem_binary}%{!?gem_binary:/usr/bin/gem} unpack --spec $source \
+ %{?gem_binary}%{!?gem_binary:/usr/bin/gem} specification --ruby $source
%{mod_name}-%{version}.gemspec \
%{nil}
# %%gem_build macro ...
++ rubygemsdeps.rb ++
--- /var/tmp/diff_new_pack.NSSQ50/_old 2013-05-07 07:34:51.0 +0200
+++ /var/tmp/diff_new_pack.NSSQ50/_new 2013-05-07 07:34:51.0 +0200
@@ -23,7 +23,7 @@
require 'optparse'
require 'rubygems'
-require 'rubygems/format'
+#require 'rubygems/format'
require 'rubygems/specification'
opts = OptionParser.new(Usage: #{$0})
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2013-04-15 11:17:50
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common, Maintainer is r...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2013-03-24
22:00:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2013-04-15 11:17:51.0 +0200
@@ -1,0 +2,11 @@
+Sun Apr 14 08:30:10 UTC 2013 - co...@suse.com
+
+- fix permissions
+
+---
+Tue Apr 9 09:23:00 UTC 2013 - co...@suse.com
+
+- do not remove ext completely, e.g. passenger extensions require
+ some files from there
+
+---
Other differences:
--
++ gem_build_cleanup ++
--- /var/tmp/diff_new_pack.V5OH3M/_old 2013-04-15 11:17:52.0 +0200
+++ /var/tmp/diff_new_pack.V5OH3M/_new 2013-04-15 11:17:52.0 +0200
@@ -2,8 +2,10 @@
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 -o -name ext \) \
+\( -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 \) \
-print0 | xargs -r0 rm -rv || :
+ # remove more strict in the docu
+find $1/doc \( -name Makefile.ri -o -name ext \) -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.V5OH3M/_old 2013-04-15 11:17:52.0 +0200
+++ /var/tmp/diff_new_pack.V5OH3M/_new 2013-04-15 11:17:52.0 +0200
@@ -55,4 +55,6 @@
# TODO: scripts in ruby/1.9.1 should call ruby1.9 for consistency
sed -i -e 's,^#!/usr/bin/env ruby,#!/usr/bin/ruby,; s,^#! *[^
]*/ruby,#!/usr/bin/ruby,' $file
done
+ # some windows made gems are broken
+ chmod -R o-w $buildroot
fi
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2013-03-24 21:57:24
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common, Maintainer is r...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2013-03-22
12:07:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2013-03-24 22:00:47.0 +0100
@@ -1,0 +2,5 @@
+Sat Mar 23 13:32:13 UTC 2013 - co...@suse.com
+
+- remove ext too, it only causes problems - as far as I can see
+
+---
Other differences:
--
++ gem_build_cleanup ++
--- /var/tmp/diff_new_pack.p3xCjY/_old 2013-03-24 22:00:52.0 +0100
+++ /var/tmp/diff_new_pack.p3xCjY/_new 2013-03-24 22:00:52.0 +0100
@@ -2,7 +2,7 @@
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 \) \
+\( -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 -o -name ext \) \
-print0 | xargs -r0 rm -rv || :
else
echo '$1' does not exists or is not a directory! Exiting. 2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2013-03-22 12:07:46
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common, Maintainer is r...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2013-01-22
17:52:09.0 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2013-03-22 12:07:47.0 +0100
@@ -1,0 +2,12 @@
+Fri Mar 8 16:22:44 UTC 2013 - rha...@suse.com
+
+- Some enhancements to rubygemsdeps.rb:
+ - Add --file-match option to rubygemsdeps.rb to allow
+specifying and alternate regex to match the input files
+against. This is useful to generate dependencies from gemspec
+files which do not endup being installed in the default
+locations
+ - Default rubyabi to a non-nil value (basically the version of
+of the ruby interpreter that runs the script)
+
+---
Other differences:
--
++ rubygemsdeps.rb ++
--- /var/tmp/diff_new_pack.kv8s8N/_old 2013-03-22 12:07:48.0 +0100
+++ /var/tmp/diff_new_pack.kv8s8N/_new 2013-03-22 12:07:48.0 +0100
@@ -36,6 +36,12 @@
opts.on(-R, --requires, Output the requires of the package) do |val|
requires=true
end
+file_match=.*/gems/[^/]*/specifications/.*\.gemspec$
+opts.on(-m, --file-match REGEX, String,
+ Override the regex against which the input file names,
+matched with the supplied regex) do |val|
+ file_match=val
+end
in_file=nil
opts.on(-g, --gemspec FILE, String,
Take gemspec from FILE, not filename in STDIN,
@@ -73,7 +79,7 @@
def rubyabi_from_path(path)
m = path.match(%r{.*/gems/([^/]*)/.*})
- return m ? m[1] : nil
+ return m ? m[1] : RbConfig::CONFIG[ruby_version]
end
gemspecs = Array.new
@@ -87,7 +93,7 @@
else
$stdin.each_line do |line|
line.chomp!
-m = line.match(%r{.*/gems/[^/]*/specifications/.*\.gemspec$})
+m = line.match(%r{#{file_match}$})
if m
register_gemspec_from_file(gemspecs, rubyabi_from_path(line), line)
end
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2013-01-10 22:34:49
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common, Maintainer is r...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2013-01-03
13:54:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2013-01-10 22:34:51.0 +0100
@@ -1,0 +2,6 @@
+Tue Jan 8 11:00:24 UTC 2013 - idon...@suse.com
+
+- Bump version to 2.0 so we don't get a version downgrade when
+ updating from 12.2
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.jIkw6q/_old 2013-01-10 22:34:52.0 +0100
+++ /var/tmp/diff_new_pack.jIkw6q/_new 2013-01-10 22:34:52.0 +0100
@@ -17,7 +17,7 @@
Name: ruby-common
-Version:1.0
+Version:2.0
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source1:gem_build_cleanup
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2013-01-03 13:47:47
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common, Maintainer is r...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2012-12-05
14:06:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2013-01-03 13:47:49.0 +0100
@@ -1,0 +2,16 @@
+Fri Dec 28 13:38:59 UTC 2012 - co...@suse.com
+
+- always provide the full version string as people use
+ ~ 1.2 even if the version is 1.2
+ The old logic assumed people would always require one digit
+ less than the actual version
+
+---
+Wed Dec 19 19:17:46 GMT 2012 - aspi...@suse.com
+
+- Import an enhanced version of d:l:r:e/all-good/update-sources.sh
+ which can be reused for any project, and allows more thorough
+ handling of BuildRequires from different repository / arch
+ combinations.
+
+---
New:
generate_buildrequires.sh
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.xUb8mk/_old 2013-01-03 13:47:50.0 +0100
+++ /var/tmp/diff_new_pack.xUb8mk/_new 2013-01-03 13:47:50.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ruby-common
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products 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,6 +25,7 @@
Source4:rubygems.attr
Source5:rubygemsdeps.rb
Source6:gem_install.sh
+Source7:generate_buildrequires.sh
Summary:Collection of scripts and macros for ruby packaging
License:MIT
Group: Development/Languages/Ruby
@@ -53,6 +54,7 @@
install -D -m 0755 %{S:5} $RPM_BUILD_ROOT/usr/lib/rpm/rubygemsdeps.rb
install -D -m 0755 %{S:6} $RPM_BUILD_ROOT/usr/lib/rpm/gem_install.sh
install -D -m 0755 %{S:1} $RPM_BUILD_ROOT/usr/lib/rpm/gem_build_cleanup.sh
+install -D -m 0755 %{S:7} $RPM_BUILD_ROOT/usr/lib/rpm/generate_buildrequires.sh
%files
%defattr(-,root,root)
@@ -62,5 +64,6 @@
/usr/lib/rpm/rubygemsdeps.rb
/usr/lib/rpm/gem_install.sh
/usr/lib/rpm/gem_build_cleanup.sh
+/usr/lib/rpm/generate_buildrequires.sh
%changelog
++ generate_buildrequires.sh ++
#!/bin/sh
#
# In the current package's specfile, updates a block delimited
# by # BEGIN / # END lines to contain BuildRequires: lines
# for each rubygem rpm (or rpm matching a given pattern) which
# has been built by the project.
#
# This gives us project-build-time dependency checking without the
# performance impact that specifying BuildRequires lines within
# each gem would cause. For more information, see:
#
#
http://en.opensuse.org/openSUSE:Packaging_Ruby#Compensating_for_lack_of_BuildRequires
#
# Usage:
# --
#
# 1. Ensure you have an all-rubygems-good package or similar
#in your project. If in doubt, copy the one from
#devel:languages:ruby:extensions.
#
# 2. cd to a working copy
#
# If you're feeling lazy, you are probably fine skipping the next two
# steps.
#
# 3. Run this script with the -l option and make sure you understand
#any differences between each repository/arch combination in the
#numbers of matching gems found.
#
# 4. If you don't, run with -l REPO ARCH to compare individual lists
#of matching gems.
#
# 5. If you want a BuildRequires: list of matching gems from *all*
#repo/arch combinations, run again with no arguments.
#
# OR
#
#If you want a BuildRequires: list of matching gems from a specific
#repo/arch combinations, run again with REPO ARCH as arguments.
#
# 6. osc diff to review the changes to the spec file, then osc commit.
me=`basename $0`
DEFAULT_PATTERN=rubygem-
main () {
parse_opts $@
project=$( osc info | sed -ne '/^Project name: / { s///; p }' )
if [ -z $project ]; then
echo Couldn't establish build service project name. 2
echo Are you inside a package working directory? 2
exit 1
fi
echo Project: $project
specfile=$( ls -1 *.spec )
if ! [ -f $specfile ]; then
echo Couldn't find spec file. 2
echo Are you inside a package working directory? 2
exit 1
fi
if [ -n $list ]; then
if [ -n $repo ]; then
get_buildrequires_lines $repo $arch
else
list_matches
fi
else
if [ -n $repo ]; then
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2012-12-05 14:06:48
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common, Maintainer is r...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2012-11-10
16:55:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2012-12-05 14:06:49.0 +0100
@@ -1,0 +2,24 @@
+Tue Dec 4 10:57:13 UTC 2012 - nkrin...@suse.com
+
+- Bring back fix from submit request 140568 (Revision 23):
+ Fix gemspec filtering on SLE_11_SP2:
++ Only gemspec files resulting of the built gem matter, not other
+ gemspec found in-tree
++ Newer RPM uses rubygem.attr, which filters correctly
+
+---
+Fri Nov 30 16:24:19 UTC 2012 - co...@suse.com
+
+- require rubygems for old ruby versions
+- strip trailing .0 for ~ operator
+
+---
+Fri Nov 23 12:36:58 GMT 2012 - aspi...@suse.com
+
+- Add -g option to rubygemsdeps.rb to allow preview / review
+ of automatically generated dependencies from:
++ gemspecs in packages which have already been installed
++ gems/gemspecs which have not yet been packaged
+ This is useful for learning / debugging the dependency generator.
+
+---
Other differences:
--
++ rubygemsdeps.rb ++
--- /var/tmp/diff_new_pack.yfpM8J/_old 2012-12-05 14:06:49.0 +0100
+++ /var/tmp/diff_new_pack.yfpM8J/_new 2012-12-05 14:06:49.0 +0100
@@ -23,17 +23,24 @@
require 'optparse'
require 'rubygems'
+require 'rubygems/format'
require 'rubygems/specification'
opts = OptionParser.new(Usage: #{$0})
provides=false
opts.on(-P, --provides, Output the provides of the package) do |val|
-provides=true
+ provides=true
end
requires=false
opts.on(-R, --requires, Output the requires of the package) do |val|
-requires=true
+ requires=true
+end
+in_file=nil
+opts.on(-g, --gemspec FILE, String,
+Take gemspec from FILE, not filename in STDIN,
+Can be a .gem file or a .gemspec file) do |file|
+ in_file=file
end
rest = opts.permute(ARGV)
@@ -41,17 +48,53 @@
exit(0)
end
-gemspecs=Array.new
+def fatal(msg)
+ $stderr.puts msg
+ exit 1
+end
+
+def register_gemspec_from_file(gemspecs, rubyabi, file)
+ fatal Couldn't read '#{file}' unless File.readable? file
+
+ case file
+ when /\.gem$/
+gem = Gem::Format.from_file_by_path(file)
+fatal Failed to load gem from '#{file}' unless gem
+spec = gem.spec
+ when /\.gemspec$/
+spec = Gem::Specification.load(file)
+fatal Failed to load gem spec from '#{file}' unless spec
+ else
+fatal '#{file}' must be a .gem or .gemspec file
+ end
+
+ gemspecs [ rubyabi, spec ]
+end
-$stdin.each_line do |line|
- m = line.match(%r{.*/gems/[^/]*/specifications/.*\.gemspec$})
- gemspecs [m[0], Gem::Specification.load(m[0])] if m
+def rubyabi_from_path(path)
+ m = path.match(%r{.*/gems/([^/]*)/.*})
+ return m ? m[1] : nil
+end
+
+gemspecs = Array.new
+
+if in_file
+ # This mode will not be used during actual rpm builds, but only by
+ # gem packagers for debugging / diagnostics, so that they can
+ # predict in advance what the dependencies will look like.
+ rubyabi = rubyabi_from_path(in_file) || '$RUBYABI'
+ register_gemspec_from_file(gemspecs, rubyabi, in_file)
+else
+ $stdin.each_line do |line|
+line.chomp!
+m = line.match(%r{.*/gems/[^/]*/specifications/.*\.gemspec$})
+if m
+ register_gemspec_from_file(gemspecs, rubyabi_from_path(line), line)
+end
+ end
end
-gemspecs.each do |file, spec|
- rubyabi=nil
- m = file.match(%r{.*/gems/([^/]*)/.*})
- rubyabi=m[1] if m
+gemspecs.each do |rubyabi, spec|
if provides
# old forms
puts rubygem-#{spec.name} = #{spec.version}
@@ -72,16 +115,21 @@
if requires
puts ruby(abi) = #{rubyabi} if rubyabi
+puts rubygems if rubyabi.to_f 1.9
spec.runtime_dependencies.each do |dep|
dep.requirement.requirements.each do |r|
if r.first == '~'
- versions = r.last.to_s.split('.')
- versions = versions[0,versions.length-1]
+ minversion = r.last.to_s.split('.')
+ versions = minversion[0,minversion.length-1]
# ~ 2 is pretty nonsense, so avoid being tricked
if versions.length 1
-puts rubygem(#{rubyabi}:#{dep.name}:#{versions.join('.')}) =
#{r.last}
+ if minversion[minversion.length-1] == '0'
+ # ~ 1.2.0 is the same as =
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2012-11-10 16:55:29
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common, Maintainer is r...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2012-11-06
16:32:21.0 +0100
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2012-11-10 16:55:31.0 +0100
@@ -1,0 +2,8 @@
+Wed Nov 7 14:46:27 UTC 2012 - sasc...@suse.de
+
+- Fix gemspec filtering on SLE_11_SP2:
+ + Only gemspec files resulting of the built gem matter, not other
+gemspec found in-tree
+ + Newer RPM uses rubygem.attr, which filters correctly
+
+---
Other differences:
--
++ rubygemsdeps.rb ++
--- /var/tmp/diff_new_pack.x0cxVN/_old 2012-11-10 16:55:32.0 +0100
+++ /var/tmp/diff_new_pack.x0cxVN/_new 2012-11-10 16:55:32.0 +0100
@@ -44,7 +44,7 @@
gemspecs=Array.new
$stdin.each_line do |line|
- m = line.match(%r{.*/specifications/.*\.gemspec$})
+ m = line.match(%r{.*/gems/[^/]*/specifications/.*\.gemspec$})
gemspecs [m[0], Gem::Specification.load(m[0])] if m
end
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2012-11-06 16:32:19
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common, Maintainer is r...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2012-09-17
14:09:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2012-11-06 16:32:21.0 +0100
@@ -1,0 +2,5 @@
+Mon Nov 5 11:08:05 UTC 2012 - co...@suse.com
+
+- fix build on fedora
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.8NOzhG/_old 2012-11-06 16:32:22.0 +0100
+++ /var/tmp/diff_new_pack.8NOzhG/_new 2012-11-06 16:32:22.0 +0100
@@ -33,7 +33,7 @@
Requires: rubygems_with_buildroot_patch
BuildArch: noarch
Provides: ruby-macros = %{version}
-%if %suse_version 1140
+%if 0%{?suse_version} 1140
# we need a patched rpm
Requires: rpm-with-ruby-provide-hook
%endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2012-09-17 14:09:19
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common, Maintainer is r...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2012-08-04
09:34:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2012-09-17 14:09:20.0 +0200
@@ -1,0 +2,5 @@
+Thu Aug 2 05:23:31 UTC 2012 - co...@suse.com
+
+- ~ 2 doesn't have any meaning, but we still need to handle it
+
+---
Other differences:
--
++ rubygemsdeps.rb ++
--- /var/tmp/diff_new_pack.z9pgt5/_old 2012-09-17 14:09:21.0 +0200
+++ /var/tmp/diff_new_pack.z9pgt5/_new 2012-09-17 14:09:21.0 +0200
@@ -77,8 +77,12 @@
if r.first == '~'
versions = r.last.to_s.split('.')
versions = versions[0,versions.length-1]
- version = versions.join('.')
- puts rubygem(#{rubyabi}:#{dep.name}:#{version}) = #{r.last}
+ # ~ 2 is pretty nonsense, so avoid being tricked
+ if versions.length 1
+puts rubygem(#{rubyabi}:#{dep.name}:#{versions.join('.')}) =
#{r.last}
+ else
+puts rubygem(#{rubyabi}:#{dep.name}) = #{r.last}
+ end
elsif r.first == '!='
# this is purely guessing, but we can't generate conflicts here ;(
puts rubygem(#{rubyabi}:#{dep.name}) #{r.last}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ruby-common for openSUSE:Factory
Hello community,
here is the log from the commit of package ruby-common for openSUSE:Factory
checked in at 2012-08-04 09:33:54
Comparing /work/SRC/openSUSE:Factory/ruby-common (Old)
and /work/SRC/openSUSE:Factory/.ruby-common.new (New)
Package is ruby-common, Maintainer is r...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2012-07-30
20:40:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes
2012-08-04 09:34:00.0 +0200
@@ -1,0 +2,10 @@
+Wed Aug 1 10:20:32 UTC 2012 - co...@suse.com
+
+- fixing the pessimistic operator
+
+---
+Mon Jul 30 10:39:16 UTC 2012 - co...@suse.com
+
+- replace all */ruby with /usr/bin/ruby
+
+---
Other differences:
--
++ ruby-common.spec ++
--- /var/tmp/diff_new_pack.UX9j1Y/_old 2012-08-04 09:34:01.0 +0200
+++ /var/tmp/diff_new_pack.UX9j1Y/_new 2012-08-04 09:34:01.0 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ruby
+# spec file for package ruby-common
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -28,9 +28,9 @@
Summary:Collection of scripts and macros for ruby packaging
License:MIT
Group: Development/Languages/Ruby
-Requires: rubygems_with_buildroot_patch
-Requires: rubygems 1.8
Requires: /usr/bin/getopt
+Requires: rubygems 1.8
+Requires: rubygems_with_buildroot_patch
BuildArch: noarch
Provides: ruby-macros = %{version}
%if %suse_version 1140
++ gem_install.sh ++
--- /var/tmp/diff_new_pack.UX9j1Y/_old 2012-08-04 09:34:01.0 +0200
+++ /var/tmp/diff_new_pack.UX9j1Y/_new 2012-08-04 09:34:01.0 +0200
@@ -1,5 +1,7 @@
#! /bin/bash
+set -e
+
# options may be followed by one colon to indicate they have a required
argument
if ! options=$(getopt -o dEf -l
ignore-dependencies,force,no-rdoc,rdoc,no-ri,ri,env-shebang,no-env-shebang,default-gem:,build-root:,gem-binary:
-- $@)
then
@@ -40,7 +42,7 @@
$gem_binary install --verbose --local $otheropts
if test -d $RPM_BUILD_ROOT/usr/bin; then
cd $RPM_BUILD_ROOT/usr/bin
- bins=`ls -1 *1.9 2 /dev/null`
+ bins=`ls -1 *1.9 2 /dev/null` || true
if test -n $bins; then
for bin in $bins; do
mv -v $bin $(echo $bin | sed -e 's,1.9$,,')
@@ -50,6 +52,7 @@
if [ -d $buildroot ]; then
find $buildroot -type f -perm /u+x | while read file; do
-sed -i -e 's,#!/usr/local/bin/ruby,#!/usr/bin/ruby,' $file
+# TODO: scripts in ruby/1.9.1 should call ruby1.9 for consistency
+sed -i -e 's,^#!/usr/bin/env ruby,#!/usr/bin/ruby,; s,^#! *[^
]*/ruby,#!/usr/bin/ruby,' $file
done
fi
++ rubygemsdeps.rb ++
--- /var/tmp/diff_new_pack.UX9j1Y/_old 2012-08-04 09:34:01.0 +0200
+++ /var/tmp/diff_new_pack.UX9j1Y/_new 2012-08-04 09:34:01.0 +0200
@@ -56,13 +56,18 @@
# old forms
puts rubygem-#{spec.name} = #{spec.version}
versions = spec.version.to_s.split('.')
-puts rubygem-#{spec.name}-#{versions[0]} = #{spec.version} if
versions.length 0
-puts rubygem-#{spec.name}-#{versions[0]}_#{versions[1]} =
#{spec.version} if versions.length 1
-puts rubygem-#{spec.name}-#{versions[0]}_#{versions[1]}_#{versions[2]} =
#{spec.version} if versions.length 2
+puts rubygem-#{spec.name}-#{versions[0]} = #{spec.version} if
versions.length 1
+puts rubygem-#{spec.name}-#{versions[0]}_#{versions[1]} =
#{spec.version} if versions.length 2
+puts rubygem-#{spec.name}-#{versions[0]}_#{versions[1]}_#{versions[2]} =
#{spec.version} if versions.length 3
# version without ruby version - asking for trouble
puts rubygem(#{spec.name}) = #{spec.version}
-puts rubygem(#{rubyabi}:#{spec.name}) = #{spec.version} if rubyabi
+if rubyabi
+ puts rubygem(#{rubyabi}:#{spec.name}) = #{spec.version}
+ puts rubygem(#{rubyabi}:#{spec.name}:#{versions[0]}) = #{spec.version}
if versions.length 1
+ puts rubygem(#{rubyabi}:#{spec.name}:#{versions[0]}.#{versions[1]}) =
#{spec.version} if versions.length 2
+ puts
rubygem(#{rubyabi}:#{spec.name}:#{versions[0]}.#{versions[1]}.#{versions[2]})
= #{spec.version} if versions.length 3
+end
end
if requires
@@ -70,9 +75,10 @@
spec.runtime_dependencies.each do |dep|
dep.requirement.requirements.each do |r|
if r.first == '~'
- next_version = Gem::Version.create(r.last).bump
- puts rubygem(#{rubyabi}:#{dep.name}) = #{r.last}
- puts rubygem(#{rubyabi}:#{dep.name}) #{next_version}
+ versions = r.last.to_s.split('.')
+ versions =
