[perl-qpid] QPID-5556: Fix top level Perl packages.

[Darryl L. Pierce]

commit 0955bec0d0b6a2c1b7c19f066ebcdb3adf6be481
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Tue Feb 25 10:21:29 2014 -0500

    QPID-5556: Fix top level Perl packages.

 ...ix-Ruby-Perl-bindings-when-built-with-Wer.patch |   12 ++++--
 ...rovide-the-right-Perl-packages-in-top-lev.patch |   39 ++++++++++++++++++++
 perl-qpid.spec                                     |    9 ++++-
 3 files changed, 54 insertions(+), 6 deletions(-)
---
diff --git a/01-QPID-5499-Perl-changes-for-format-security.patch b/0001-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch
similarity index 54%
rename from 01-QPID-5499-Perl-changes-for-format-security.patch
rename to 0001-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch
index 11d6a78..461073f 100644
--- a/01-QPID-5499-Perl-changes-for-format-security.patch
+++ b/0001-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch
@@ -1,8 +1,12 @@
-From 1b4e79b2f3c4e66082cee142a174aed222b01d92 Mon Sep 17 00:00:00 2001
-From: "Darryl L. Pierce" <dpierce at redhat.com>
-Date: Wed, 19 Feb 2014 08:10:57 -0500
-Subject: [PATCH] QPID-5499: Perl changes for format-security
+From cb5a8496cc29c106448a322af4ecbc25b1a6a828 Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <mcpierce at apache.org>
+Date: Fri, 7 Feb 2014 13:44:03 +0000
+Subject: [PATCH 1/2] QPID-5499: Fix Ruby/Perl bindings when built with
+ -Werror=format-security
 
+Changed the swig descriptors so that they use a constant format string.
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1565651 13f79535-47bb-0310-9956-ffa450edef68
 ---
  qpid/cpp/bindings/qpid/perl/perl.i | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/0002-QPID-5556-Provide-the-right-Perl-packages-in-top-lev.patch b/0002-QPID-5556-Provide-the-right-Perl-packages-in-top-lev.patch
new file mode 100644
index 0000000..6c53d16
--- /dev/null
+++ b/0002-QPID-5556-Provide-the-right-Perl-packages-in-top-lev.patch
@@ -0,0 +1,39 @@
+From 1f24fd65dce6c4ece34dad21d2d254a53a60ce84 Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <mcpierce at apache.org>
+Date: Mon, 17 Feb 2014 22:03:13 +0000
+Subject: [PATCH 2/2] QPID-5556: Provide the right Perl packages in top-level
+ modules.
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1569117 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/cpp/bindings/qpid/perl/lib/qpid.pm           | 2 ++
+ qpid/cpp/bindings/qpid/perl/lib/qpid_messaging.pm | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/qpid/cpp/bindings/qpid/perl/lib/qpid.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid.pm
+index 88b9835..1f8d967 100644
+--- a/qpid/cpp/bindings/qpid/perl/lib/qpid.pm
++++ b/qpid/cpp/bindings/qpid/perl/lib/qpid.pm
+@@ -19,4 +19,6 @@
+ 
+ use qpid_messaging;
+ 
++package qpid;
++
+ 1;
+diff --git a/qpid/cpp/bindings/qpid/perl/lib/qpid_messaging.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid_messaging.pm
+index 524bbaa..2948748 100644
+--- a/qpid/cpp/bindings/qpid/perl/lib/qpid_messaging.pm
++++ b/qpid/cpp/bindings/qpid/perl/lib/qpid_messaging.pm
+@@ -32,6 +32,8 @@ use qpid::messaging::Sender;
+ use qpid::messaging::Session;
+ use qpid::messaging::Connection;
+ 
++package qpid_messaging;
++
+ 1;
+ 
+ __END__
+-- 
+1.8.5.3
+
diff --git a/perl-qpid.spec b/perl-qpid.spec
index 5d50967..34b2b14 100644
--- a/perl-qpid.spec
+++ b/perl-qpid.spec
@@ -1,12 +1,13 @@
 Name:           perl-qpid
 Version:        0.26
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl bindings for the Qpid messaging framework
 
 License:        ASL 2.0
 URL:            http://qpid.apache.org/
 Source0:        http://www.apache.org/dist/qpid/%{version}/perl-qpid-%{version}.tar.gz
-Patch1:         01-QPID-5499-Perl-changes-for-format-security.patch
+Patch1:         0001-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch
+Patch2:         0002-QPID-5556-Provide-the-right-Perl-packages-in-top-lev.patch
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  qpid-cpp-client-devel = %{version}
@@ -29,6 +30,7 @@ ExcludeArch:    %{arm}
 %setup -q
 
 %patch1 -p6
+%patch2 -p6
 
 
 %build
@@ -59,6 +61,9 @@ make test
 
 
 %changelog
+* Tue Feb 25 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.26-2
+- QPID-5556: Fix top level Perl packages.
+
 * Mon Feb 24 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.26-1
 - Rebased on Qpid 0.26.
 - Re-enabled building on ARM.