[packages/ruby-rpm] rpm5 compat for headerNVR

glen glen at pld-linux.org
Sun Apr 28 03:36:59 CEST 2013


commit 082fff455727ac54b46376b504e713a79f41e89d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Apr 28 04:25:44 2013 +0300

    rpm5 compat for headerNVR
    
    jbj: eliminate headerNVR, use headerNEVRA instead

 rpm5.patch    | 21 +++++++++++++++++++++
 ruby-rpm.spec |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/ruby-rpm.spec b/ruby-rpm.spec
index 860ddd7..cef8ce7 100644
--- a/ruby-rpm.spec
+++ b/ruby-rpm.spec
@@ -2,7 +2,7 @@
 Summary:	An interface to access RPM database for Ruby
 Name:		ruby-%{pkgname}
 Version:	1.3.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/ruby-rpm-%{version}.gem
diff --git a/rpm5.patch b/rpm5.patch
index 23fa601..70892f5 100644
--- a/rpm5.patch
+++ b/rpm5.patch
@@ -9,3 +9,24 @@
  	DEFINE_DBI(LABEL);
  	DEFINE_DBI(ADDED);
  	DEFINE_DBI(REMOVED);
+--- rpm-1.3.1/ext/rpm/package.c	2013-04-28 04:27:31.537204007 +0300
++++ rpm-1.3.1/ext/rpm/package.c	2013-04-28 04:23:55.247324566 +0300
+@@ -683,7 +683,7 @@
+ {
+ 	VALUE name;
+ 	const char* n;
+-	headerNVR(RPM_HEADER(pkg), &n, NULL, NULL);
++	headerNEVRA(RPM_HEADER(pkg), &n, NULL, NULL, NULL, NULL);
+ 	name = n ? rb_str_new2(n) : Qnil;
+ 
+ 	return name;
+@@ -735,7 +735,8 @@
+ 	const char* r;
+ 	VALUE e;
+ 
+-	headerNVR(RPM_HEADER(pkg), NULL, &v, &r);
++	headerNEVRA(RPM_HEADER(pkg), NULL, NULL, &v, &r, NULL);
++
+ 	if (!v) {
+ 		ver = Qnil;
+ 	} else if (!r) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-rpm.git/commitdiff/082fff455727ac54b46376b504e713a79f41e89d



More information about the pld-cvs-commit mailing list