[perl-RPM2] Partial adjustment to rpm 4.9.0
Petr Pisar
ppisar at fedoraproject.org
Fri Jan 21 13:48:19 UTC 2011
commit 217835f4a546264b7c0915762f4cf9143fce122a
Author: Petr Písař <ppisar at redhat.com>
Date: Fri Jan 21 14:16:59 2011 +0100
Partial adjustment to rpm 4.9.0
perl-RPM2-0.68-Adapt-to-rpm-4.9.0.patch | 32 +++++++++++++++++++++++++++++++
perl-RPM2.spec | 7 +++++-
2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/perl-RPM2-0.68-Adapt-to-rpm-4.9.0.patch b/perl-RPM2-0.68-Adapt-to-rpm-4.9.0.patch
new file mode 100644
index 0000000..660b96c
--- /dev/null
+++ b/perl-RPM2-0.68-Adapt-to-rpm-4.9.0.patch
@@ -0,0 +1,32 @@
+From c76dec85fd27fc631ece2356d25f171f7cd56fda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Fri, 21 Jan 2011 14:08:20 +0100
+Subject: [PATCH] Adapt to rpm-4.9.0
+
+---
+ RPM2.xs | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/RPM2.xs b/RPM2.xs
+index 375f8a5..ceedc2b 100644
+--- a/RPM2.xs
++++ b/RPM2.xs
+@@ -68,13 +68,13 @@ void * _null_callback(
+ fd = NULL;
+ }
+ } else
+- fd = fdLink(fd, "persist (showProgress)");
++ fd = fdLink(fd);
+ return (void *)fd;
+ break;
+
+ case RPMCALLBACK_INST_CLOSE_FILE:
+ /* FIX: still necessary? */
+- fd = fdFree(fd, "persist (showProgress)");
++ fd = fdFree(fd);
+ if (fd != NULL) {
+ xx = Fclose(fd);
+ fd = NULL;
+--
+1.7.3.5
+
diff --git a/perl-RPM2.spec b/perl-RPM2.spec
index 5106b8d..b9f7649 100644
--- a/perl-RPM2.spec
+++ b/perl-RPM2.spec
@@ -1,11 +1,12 @@
Name: perl-RPM2
Version: 0.68
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Perl bindings for the RPM Package Manager API
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/RPM2/
Source0: http://www.cpan.org/authors/id/L/LK/LKUNDRAK/RPM2-%{version}.tar.gz
+Patch0: perl-RPM2-0.68-Adapt-to-rpm-4.9.0.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: rpm-devel perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -20,6 +21,7 @@ bindings for the RPM Package Manager API.
%prep
%setup -q -n RPM2-%{version}
+%patch0 -p1 -b .adapt
%build
@@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jan 21 2011 Petr Pisar <ppisar at redhat.com> - 0.68-10
+- Partial adjustment to rpm-4.9.0. Can compile, cannot run (see bug #671389).
+
* Tue Dec 21 2010 Marcela Maslanova <mmaslano at redhat.com> - 0.68-9
- 661697 rebuild for fixing problems with vendorach/lib
More information about the perl-devel
mailing list