commit bf75682b38fea6a28ff3bb408799d7ffa83e5327 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Fri Feb 14 16:08:56 2020 +0100
- updated to 1.4.1 - removed obsolete avoid-cycle patch (fixed upstream) ruby-pkg-config-avoid-cycle.patch | 22 ---------------------- ruby-pkg-config.spec | 6 ++---- 2 files changed, 2 insertions(+), 26 deletions(-) --- diff --git a/ruby-pkg-config.spec b/ruby-pkg-config.spec index 9b2c35c..23232b4 100644 --- a/ruby-pkg-config.spec +++ b/ruby-pkg-config.spec @@ -6,15 +6,14 @@ Summary: pkg-config module for Ruby Summary(pl.UTF-8): Moduł pkg-config dla języka Ruby Name: ruby-%{pkgname} -Version: 1.4.0 +Version: 1.4.1 Release: 1 License: LGPL v2.1+ Group: Development/Languages # tarballs: https://github.com/ruby-gnome/pkg-config/releases # gems: https://rubygems.org/gems/pkg-config Source0: https://rubygems.org/downloads/%{pkgname}-%{version}.gem -# Source0-md5: 5227a5ca2914de038f9c399c95cf3de5 -Patch0: %{name}-avoid-cycle.patch +# Source0-md5: 1622d8b28b115e997cc5c4ffd20c0bd7 URL: https://github.com/ruby-gnome2/pkg-config BuildRequires: pkgconfig BuildRequires: rpm-rubyprov @@ -37,7 +36,6 @@ Moduł pkg-config dla języka Ruby. %prep %setup -q -n %{pkgname}-%{version} -%patch0 -p1 %build # write .gemspec diff --git a/ruby-pkg-config-avoid-cycle.patch b/ruby-pkg-config-avoid-cycle.patch deleted file mode 100644 index 59d65ce..0000000 --- a/ruby-pkg-config-avoid-cycle.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- pkg-config-1.4.0/lib/pkg-config.rb.orig 2020-02-05 17:56:08.247644168 +0100 -+++ pkg-config-1.4.0/lib/pkg-config.rb 2020-02-06 16:16:50.538517573 +0100 -@@ -249,13 +249,15 @@ - @path_position - end - -- def collect_requires(&block) -+ def collect_requires(seen=[], &block) - packages = [] - targets = yield(self) - targets.each do |name| -- package = self.class.new(name, @options) -- packages << package -- packages.concat(package.collect_requires(&block)) -+ if !seen.include?(name) -+ package = self.class.new(name, @options) -+ packages << package -+ packages.concat(package.collect_requires(seen + [name], &block)) -+ end - end - packages_without_self = packages.reject do |package| - package.name == @name ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ruby-pkg-config.git/commitdiff/bf75682b38fea6a28ff3bb408799d7ffa83e5327 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit