[packages/rpm] when providing ruby(abi), make sure it's versioned
glen
glen at pld-linux.org
Fri Apr 26 11:03:26 CEST 2013
commit e229e8ab6fe4a205099c7a1e1dbffd79f21cbef8
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Apr 26 12:03:05 2013 +0300
when providing ruby(abi), make sure it's versioned
rpm.spec | 4 +++-
rubyprov-abi-versioned.patch | 12 ++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index e8b549a..ae96ff8 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -52,7 +52,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 5.4.10
-Release: 48
+Release: 49
License: LGPL
Group: Base
# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -160,6 +160,7 @@ 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
+Patch69: rubyprov-abi-versioned.patch
# Patches imported from Mandriva
@@ -930,6 +931,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
%patch1041 -p1
%patch1042 -p1
%patch68 -p1
+%patch69 -p1
install %{SOURCE2} macros/pld.in
install %{SOURCE8} scripts/php.prov.in
diff --git a/rubyprov-abi-versioned.patch b/rubyprov-abi-versioned.patch
new file mode 100644
index 0000000..e446f74
--- /dev/null
+++ b/rubyprov-abi-versioned.patch
@@ -0,0 +1,12 @@
+--- rpm-5.4.10/scripts/rubygems.rb~ 2013-04-26 00:58:58.622064212 +0300
++++ rpm-5.4.10/scripts/rubygems.rb 2013-04-26 11:42:07.842839682 +0300
+@@ -39,8 +39,9 @@
+ # way fugly, but we make the assumption that if the package has
+ # this file, the package is the current ruby version, and should
+ # therefore provide ruby(abi) = version
+ if provides and path.match(RbConfig::CONFIG["archdir"] + "/rbconfig.rb")
+ abi_provide = true
++ ruby_versioned = true
+ elsif path.match(specpatt)
+ ruby_versioned = true
+ gems.push(path.chomp)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/e229e8ab6fe4a205099c7a1e1dbffd79f21cbef8
More information about the pld-cvs-commit
mailing list