[packages/rpm] ruby: generate abi deps also for ruby *.so files

glen glen at pld-linux.org
Fri Apr 26 00:12:35 CEST 2013


commit 281a8c30532ba4538844e644375dfc8e13a09c28
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Apr 26 01:12:08 2013 +0300

    ruby: generate abi deps also for ruby *.so files

 rpm.spec                |  2 ++
 rubyprov-archdirs.patch | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index f307ceb..7047191 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -159,6 +159,7 @@ Patch64:	%{name}-fix-compress-doc.patch
 Patch65:	%{name}-parseSpec-skip-empty-tags.patch
 Patch66:	%{name}-payload-use-hashed-inode.patch
 Patch67:	rpm-repackage-dont-force-max-compression.patch
+Patch68:	rubyprov-archdirs.patch
 
 # Patches imported from Mandriva
 
@@ -928,6 +929,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch1040 -p1
 %patch1041 -p1
 %patch1042 -p1
+%patch68 -p1
 
 install %{SOURCE2} macros/pld.in
 install %{SOURCE8} scripts/php.prov.in
diff --git a/rubyprov-archdirs.patch b/rubyprov-archdirs.patch
new file mode 100644
index 0000000..1e0036b
--- /dev/null
+++ b/rubyprov-archdirs.patch
@@ -0,0 +1,19 @@
+--- rpm-5.4.10/scripts/rubygems.rb~	2013-04-26 00:28:59.955288629 +0300
++++ rpm-5.4.10/scripts/rubygems.rb	2013-04-26 00:43:35.122569376 +0300
+@@ -51,10 +51,16 @@
+   elsif not ruby_versioned
+     if path.match(RbConfig::CONFIG["rubylibdir"])
+       ruby_versioned = true
++    elsif path.match(RbConfig::CONFIG["archdir"])
++      ruby_versioned = true
+     elsif path.match(RbConfig::CONFIG["sitelibdir"])
+       ruby_versioned = true
++    elsif path.match(RbConfig::CONFIG["sitearchdir"])
++      ruby_versioned = true
+     elsif path.match(RbConfig::CONFIG["vendorlibdir"])
+       ruby_versioned = true
++    elsif path.match(RbConfig::CONFIG["vendorarchdir"])
++      ruby_versioned = true
+     end
+   end
+ end
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/281a8c30532ba4538844e644375dfc8e13a09c28



More information about the pld-cvs-commit mailing list