[perl-qpid/f18] Rebased on Qpid 0.22.
Darryl L. Pierce
mcpierce at fedoraproject.org
Fri Jun 14 19:44:05 UTC 2013
commit 1b4889ac39d432c90f51e991ee406fd14de9ba67
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date: Wed May 1 14:57:20 2013 -0400
Rebased on Qpid 0.22.
- Added the perl(qpid) and perl(qpid_messaging) virtual packages.
- Resolves: BZ#964168
- Set the source URL to point to official releases.
.gitignore | 1 +
...D-4588-Updated-the-Perl-language-bindings.patch | 27 -----------
01-QPID-4843-Fixed-the-Perl-spout.pl-example.patch | 29 ++++++++++++
...4857-Fixed-passing-Perl-Message-to-C-code.patch | 47 ++++++++++++++++++++
perl-qpid.spec | 30 ++++++++++---
sources | 2 +-
6 files changed, 102 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1db1e26..77f2b4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/perl-qpid-0.16.tar.gz
/perl-qpid-0.18.tar.gz
/perl-qpid-0.20.tar.gz
+/perl-qpid-0.22.tar.gz
diff --git a/01-QPID-4843-Fixed-the-Perl-spout.pl-example.patch b/01-QPID-4843-Fixed-the-Perl-spout.pl-example.patch
new file mode 100644
index 0000000..a723247
--- /dev/null
+++ b/01-QPID-4843-Fixed-the-Perl-spout.pl-example.patch
@@ -0,0 +1,29 @@
+From f5c5701a22fcdff6d949a4cbb43d86b2e9fcd478 Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <mcpierce at apache.org>
+Date: Tue, 14 May 2013 21:26:37 +0000
+Subject: [PATCH 3/6] QPID-4843: Fixed the Perl spout.pl example.
+
+It still called the old setProperty method on Message rather than
+set_property.
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1482598 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/cpp/bindings/qpid/examples/perl/spout.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qpid/cpp/bindings/qpid/examples/perl/spout.pl b/qpid/cpp/bindings/qpid/examples/perl/spout.pl
+index d8ac860..74e589b 100755
+--- a/qpid/cpp/bindings/qpid/examples/perl/spout.pl
++++ b/qpid/cpp/bindings/qpid/examples/perl/spout.pl
+@@ -70,7 +70,7 @@ sub setProperties {
+
+ foreach (@properties) {
+ my ( $name, $value ) = split( "=", $_ );
+- $message->setProperty( $name, $value );
++ $message->set_property( $name, $value );
+ }
+ }
+
+--
+1.8.1.4
+
diff --git a/02-QPID-4857-Fixed-passing-Perl-Message-to-C-code.patch b/02-QPID-4857-Fixed-passing-Perl-Message-to-C-code.patch
new file mode 100644
index 0000000..9e9849f
--- /dev/null
+++ b/02-QPID-4857-Fixed-passing-Perl-Message-to-C-code.patch
@@ -0,0 +1,47 @@
+From 593c53d62c4bba0404389eee7a3bc41bba5c1fef Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <mcpierce at apache.org>
+Date: Fri, 17 May 2013 12:36:10 +0000
+Subject: [PATCH 4/6] QPID-4857: Fixed passing Perl Message to C++ code
+
+The Perl code mistakenly passed the Perl Message object, rather than the
+wrapped C+ Message object, to the release and reject methods.
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1483771 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm
+index af85731..316f1fa 100644
+--- a/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm
++++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm
+@@ -112,7 +112,7 @@ sub rollback {
+
+ =over
+
+-=item $session->acknowledge( msg )
++=item $session->acknowledge
+
+ Acknowledges that a specific message that has been received.
+
+@@ -149,7 +149,7 @@ sub reject {
+ my ($self) = @_;
+ my $impl = $self->{_impl};
+
+- $impl->reject($_[1]);
++ $impl->reject($_[1]->get_implementation);
+ }
+
+ =pod
+@@ -168,7 +168,7 @@ sub release {
+ my ($self) = @_;
+ my $impl = $self->{_impl};
+
+- $impl->release($_[1]);
++ $impl->release($_[1]->get_implementation);
+ }
+
+ =pod
+--
+1.8.1.4
+
diff --git a/perl-qpid.spec b/perl-qpid.spec
index b3809b7..b3a9158 100644
--- a/perl-qpid.spec
+++ b/perl-qpid.spec
@@ -1,11 +1,14 @@
Name: perl-qpid
-Version: 0.20
+Version: 0.22
Release: 1%{?dist}
Summary: Perl bindings for the Qpid messaging framework
License: ASL 2.0
-URL: http://qpid.apache.org
-Source0: http://mcpierce.fedorapeople.org/sources/perl-qpid-%{version}.tar.gz
+URL: http://qpid.apache.org/
+Source0: http://www.apache.org/dist/qpid/%{version}/perl-qpid-%{version}.tar.gz
+
+Provides: perl(qpid) = %{version}
+Provides: perl(qpid_messaging) = %{version}
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: qpid-cpp-client-devel = %{version}
@@ -17,8 +20,9 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi
Requires: qpid-cpp-client = %{version}
-# QPID-4588
-Patch1: 01-QPID-4588-Updated-the-Perl-language-bindings.patch
+Patch1: 01-QPID-4843-Fixed-the-Perl-spout.pl-example.patch
+# BZ#964168
+Patch2: 02-QPID-4857-Fixed-passing-Perl-Message-to-C-code.patch
%description
@@ -28,7 +32,14 @@ Patch1: 01-QPID-4588-Updated-the-Perl-language-bindings.patch
%prep
%setup -q
-%patch1 -p6
+echo "After setup we are in $PWD"
+
+%patch2 -p6
+
+pushd examples
+ls -l
+%patch1 -p7
+popd
# create the language bindings
swig -perl -c++ -I/usr/include -o cqpid_perl.cpp perl.i
@@ -58,9 +69,16 @@ make test
%doc LICENSE
%exclude %dir %{perl_vendorarch}/auto/
%doc examples
+%doc %{_mandir}/man3/*gz
%changelog
+* Fri Jun 14 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.22-1
+- Rebased on Qpid 0.22.
+- Added the perl(qpid) and perl(qpid_messaging) virtual packages.
+- Resolves: BZ#964168
+- Set the source URL to point to official releases.
+
* Mon Feb 18 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.20-1
- Rebased on Qpid 0.20.
diff --git a/sources b/sources
index 839d2cd..dfcc044 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46e0e4f27e33aadb31d387405260ce93 perl-qpid-0.20.tar.gz
+378fa091cddaa1bf0ba7b3baf2205a2b perl-qpid-0.22.tar.gz
More information about the scm-commits
mailing list