[packages/rpm] gem_helper: when writing .gemspec exit, otherwise code continues to compile ext
glen
glen at pld-linux.org
Sun Dec 22 19:14:27 CET 2013
commit 7fba62de89e8e256aa71058c56d625732b726e77
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Dec 22 20:13:57 2013 +0200
gem_helper: when writing .gemspec exit, otherwise code continues to compile ext
gem_helper-spec-arg.patch | 7 ++++---
rpm.spec | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 964fff7..103c88a 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -50,7 +50,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 5.4.14
-Release: 1
+Release: 2
License: LGPL v2.1
Group: Base
# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm
diff --git a/gem_helper-spec-arg.patch b/gem_helper-spec-arg.patch
index 6eb29bb..7ddb32f 100644
--- a/gem_helper-spec-arg.patch
+++ b/gem_helper-spec-arg.patch
@@ -1,5 +1,5 @@
---- rpm-5.4.10/scripts/gem_helper.rb~ 2013-06-21 09:44:47.273773411 +0300
-+++ rpm-5.4.10/scripts/gem_helper.rb 2013-06-21 09:45:34.619165559 +0300
+--- rpm-5.4.10/scripts/gem_helper.rb 2013-06-21 09:45:34.619165559 +0300
++++ rpm-5.4.14/scripts/gem_helper.rb 2013-12-21 19:05:33.801507110 +0200
@@ -6,8 +6,9 @@
#++
@@ -11,7 +11,7 @@
require 'yaml'
require 'zlib'
-@@ -65,9 +66,17 @@
+@@ -65,9 +66,18 @@
body[iv.to_s.gsub(/^@/,'')] = header.instance_variable_get(iv)
end
@@ -25,6 +25,7 @@
+ file.puts spec.to_ruby_for_cache
+ end
+ print "Wrote: %s\n" % file_name
++ exit(0)
+ end
+
if ARGV[0] == "install"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/7fba62de89e8e256aa71058c56d625732b726e77
More information about the pld-cvs-commit
mailing list