From 89aed510c5cc6729f67343a442094512252d16dfad05a5eae8db076dac6d7ff9 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Thu, 5 Sep 2024 22:41:28 +0000 Subject: [PATCH] - Update to 0.0.5 reenable conflicts support but only generate conflicts for "non-default" gems. the default gems are not actually installed into the gem path but their files reside in the normal ruby library search path. - Update to 0.0.4 disable conflicts for now OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby-bundled-gems-rpmhelper?expand=0&rev=4 --- ruby-bundled-gems-rpmhelper.changes | 15 +++++++++++++++ ruby-bundled-gems-rpmhelper.spec | 2 +- ruby_bundled_gems.pl | 8 ++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ruby-bundled-gems-rpmhelper.changes b/ruby-bundled-gems-rpmhelper.changes index feb8382..d1aba3d 100644 --- a/ruby-bundled-gems-rpmhelper.changes +++ b/ruby-bundled-gems-rpmhelper.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Sep 5 22:40:08 UTC 2024 - Marcus Rueckert + +- Update to 0.0.5 + reenable conflicts support but only generate conflicts for + "non-default" gems. the default gems are not actually installed + into the gem path but their files reside in the normal ruby + library search path. + +------------------------------------------------------------------- +Thu Sep 5 17:55:29 UTC 2024 - Marcus Rueckert + +- Update to 0.0.4 + disable conflicts for now + ------------------------------------------------------------------- Thu Sep 5 13:13:36 UTC 2024 - Marcus Rueckert diff --git a/ruby-bundled-gems-rpmhelper.spec b/ruby-bundled-gems-rpmhelper.spec index a65f266..579c48f 100644 --- a/ruby-bundled-gems-rpmhelper.spec +++ b/ruby-bundled-gems-rpmhelper.spec @@ -17,7 +17,7 @@ Name: ruby-bundled-gems-rpmhelper -Version: 0.0.3 +Version: 0.0.4 Release: 0 Summary: A little helper to add provides for intree gems during a ruby build License: MIT diff --git a/ruby_bundled_gems.pl b/ruby_bundled_gems.pl index c6f69c0..2814777 100644 --- a/ruby_bundled_gems.pl +++ b/ruby_bundled_gems.pl @@ -66,7 +66,11 @@ print(STDERR "Running $0 in $mode\n"); my $fh = *STDIN; while ( ! eof($fh) ) { defined( my $line = readline $fh ) or die "readline failed: $!"; - if ($line =~ /\/usr\/lib\d*\/ruby\/gems\/(?[^\/]+)\/specifications(\/default)?\/(?.+)-(?\d+\.[^-]+)\.gemspec\n\z/) { - handle_line($line, 'ruby', $+{ruby_abi_version}, $+{gem_name}, $+{gem_version}, $mode); + if ($line =~ /(?\/usr\/lib\d*\/ruby\/gems\/(?[^\/]+))\/specifications(?\/default)?\/(?.+)-(?\d+\.[^-]+)\.gemspec\n\z/) { + ## we only need need to conflict when we actually have conflicting files + if ( ("provides" eq $mode ) || ( not(defined($+{has_default})) && "conflicts" eq $mode) ) { + handle_line($line, 'ruby', $+{ruby_abi_version}, $+{gem_name}, $+{gem_version}, $mode); + } }; } +