[qpid-cpp] Fixed path to qpid-ha in the systemd service descriptor.

Darryl L. Pierce mcpierce at fedoraproject.org
Fri Feb 20 21:36:40 UTC 2015 

commit e14ccb43056d1b06ad4ed0ec6cf952f7ae8a1fae
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Fri Feb 20 15:44:54 2015 -0500

    Fixed path to qpid-ha in the systemd service descriptor.

 0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch         | 6 +++---
 0002-NO-JIRA-Remove-dead-unused-code.patch                      | 2 +-
 0003-QPID-6128-Fix-compiling-SocketAddress-on-ARM.patch         | 2 +-
 0004-QPID-6150-Add-__init__.py-to-setup.py-for-linear-sto.patch | 2 +-
 0005-NO-JIRA-Change-python.i-to-qpid_messaging.i-in-extra.patch | 2 +-
 0006-QPID-6170-Adds-build-support-for-aarch64-and-ppc64le.patch | 2 +-
 0007-QPID-6310-ensure-session-is-attached-even-for-unsupp.patch | 2 +-
 0008-QPID-6310-handle-case-where-content-bearing-method-i.patch | 2 +-
 0009-QPID-6310-check-validity-of-ranges-when-decoding-seq.patch | 2 +-
 0010-txshift-switch-to-uint-for-workers.patch                   | 2 +-
 0011-QPID-6325-improve-0-10-connection-handling-logic.patch     | 2 +-
 0012-QPID-6325-further-improve-0-10-connection-handling-l.patch | 2 +-
 qpid-cpp.spec                                                   | 5 ++++-
 13 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch b/0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
index 1078fe0..de367ce 100644
--- a/0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
+++ b/0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
@@ -1,4 +1,4 @@
-From d377a75fc454bd329f9dc340dd13aaab080fcf3a Mon Sep 17 00:00:00 2001
+From d88de656433c6ec0326af56ff2a41a9ffaa9475b Mon Sep 17 00:00:00 2001
 From: "Darryl L. Pierce" <mcpierce at gmail.com>
 Date: Wed, 3 Apr 2013 10:07:37 -0400
 Subject: [PATCH 01/12] NO-JIRA: qpidd.service file for use on Fedora
@@ -14,7 +14,7 @@ as a service.
 
 diff --git a/qpid/cpp/etc/qpidd-primary.service b/qpid/cpp/etc/qpidd-primary.service
 new file mode 100644
-index 0000000..f15168c
+index 0000000..874d51a
 --- /dev/null
 +++ b/qpid/cpp/etc/qpidd-primary.service
 @@ -0,0 +1,15 @@
@@ -29,7 +29,7 @@ index 0000000..f15168c
 +Group=qpidd
 +Type=simple
 +EnvironmentFile=/etc/sysconfig/qpidd
-+ExecStart=/usr/sbin/qpid-ha -b localhost:$QPID_PORT promote
++ExecStart=/usr/bin/qpid-ha -b localhost:$QPID_PORT promote
 +
 +[Install]
 +WantedBy=multi-user.target
diff --git a/0002-NO-JIRA-Remove-dead-unused-code.patch b/0002-NO-JIRA-Remove-dead-unused-code.patch
index 758b6b9..38dd996 100644
--- a/0002-NO-JIRA-Remove-dead-unused-code.patch
+++ b/0002-NO-JIRA-Remove-dead-unused-code.patch
@@ -1,4 +1,4 @@
-From 49e0b769ce4a2f4bfc4a499adaedbf43a4cf7ffd Mon Sep 17 00:00:00 2001
+From 55116da4408d47d2e99f9468890df1161350bf2b Mon Sep 17 00:00:00 2001
 From: "Darryl L. Pierce" <dpierce at redhat.com>
 Date: Tue, 30 Sep 2014 10:27:54 -0400
 Subject: [PATCH 02/12] NO-JIRA: Remove dead/unused code
diff --git a/0003-QPID-6128-Fix-compiling-SocketAddress-on-ARM.patch b/0003-QPID-6128-Fix-compiling-SocketAddress-on-ARM.patch
index 3527c5c..2ce4990 100644
--- a/0003-QPID-6128-Fix-compiling-SocketAddress-on-ARM.patch
+++ b/0003-QPID-6128-Fix-compiling-SocketAddress-on-ARM.patch
@@ -1,4 +1,4 @@
-From 3e22a83f7247cd0c2b0da1e3a55de78952d99391 Mon Sep 17 00:00:00 2001
+From ce9a366f68b0c00247ef1b71d02a6eb2a08b5d86 Mon Sep 17 00:00:00 2001
 From: "Darryl L. Pierce" <dpierce at redhat.com>
 Date: Wed, 1 Oct 2014 11:12:49 -0400
 Subject: [PATCH 03/12] QPID-6128: Fix compiling SocketAddress on ARM
diff --git a/0004-QPID-6150-Add-__init__.py-to-setup.py-for-linear-sto.patch b/0004-QPID-6150-Add-__init__.py-to-setup.py-for-linear-sto.patch
index 45089cd..f2324c5 100644
--- a/0004-QPID-6150-Add-__init__.py-to-setup.py-for-linear-sto.patch
+++ b/0004-QPID-6150-Add-__init__.py-to-setup.py-for-linear-sto.patch
@@ -1,4 +1,4 @@
-From 6a980bbf9648e3529d2722de4aa6efd58e0f6206 Mon Sep 17 00:00:00 2001
+From 67b090057ce9b5845b18b1ff6bee046843b29299 Mon Sep 17 00:00:00 2001
 From: "Darryl L. Pierce" <mcpierce at apache.org>
 Date: Tue, 14 Oct 2014 17:08:53 +0000
 Subject: [PATCH 04/12] QPID-6150: Add __init__.py to setup.py for linear
diff --git a/0005-NO-JIRA-Change-python.i-to-qpid_messaging.i-in-extra.patch b/0005-NO-JIRA-Change-python.i-to-qpid_messaging.i-in-extra.patch
index b77b255..177f68b 100644
--- a/0005-NO-JIRA-Change-python.i-to-qpid_messaging.i-in-extra.patch
+++ b/0005-NO-JIRA-Change-python.i-to-qpid_messaging.i-in-extra.patch
@@ -1,4 +1,4 @@
-From 6c77d9085b00b265264a1bb6f508d0658c091c40 Mon Sep 17 00:00:00 2001
+From 00cd930b0e753c1ce555de825f4e57e998a3b6bf Mon Sep 17 00:00:00 2001
 From: "Darryl L. Pierce" <dpierce at redhat.com>
 Date: Mon, 6 Oct 2014 08:12:38 -0400
 Subject: [PATCH 05/12] NO-JIRA: Change python.i to qpid_messaging.i in extra
diff --git a/0006-QPID-6170-Adds-build-support-for-aarch64-and-ppc64le.patch b/0006-QPID-6170-Adds-build-support-for-aarch64-and-ppc64le.patch
index c4cd87a..55a9be6 100644
--- a/0006-QPID-6170-Adds-build-support-for-aarch64-and-ppc64le.patch
+++ b/0006-QPID-6170-Adds-build-support-for-aarch64-and-ppc64le.patch
@@ -1,4 +1,4 @@
-From d74c6441a1e4cb364337f338287b4790ca9c98fd Mon Sep 17 00:00:00 2001
+From cd23383d3c996c48de4ffcf435b66f534b0e7852 Mon Sep 17 00:00:00 2001
 From: "Darryl L. Pierce" <dpierce at redhat.com>
 Date: Wed, 29 Oct 2014 11:13:04 -0400
 Subject: [PATCH 06/12] QPID-6170: Adds build support for aarch64 and ppc64le
diff --git a/0007-QPID-6310-ensure-session-is-attached-even-for-unsupp.patch b/0007-QPID-6310-ensure-session-is-attached-even-for-unsupp.patch
index c11a36c..97a5242 100644
--- a/0007-QPID-6310-ensure-session-is-attached-even-for-unsupp.patch
+++ b/0007-QPID-6310-ensure-session-is-attached-even-for-unsupp.patch
@@ -1,4 +1,4 @@
-From 1d3f332d59c7571003ea4fe48b8cde0236f7f778 Mon Sep 17 00:00:00 2001
+From b284349e3bcd249e329c16061669278c3b804221 Mon Sep 17 00:00:00 2001
 From: Gordon Sim <gsim at apache.org>
 Date: Tue, 13 Jan 2015 10:25:02 +0000
 Subject: [PATCH 07/12] QPID-6310 ensure session is attached even for
diff --git a/0008-QPID-6310-handle-case-where-content-bearing-method-i.patch b/0008-QPID-6310-handle-case-where-content-bearing-method-i.patch
index b3dcb12..41d6dfc 100644
--- a/0008-QPID-6310-handle-case-where-content-bearing-method-i.patch
+++ b/0008-QPID-6310-handle-case-where-content-bearing-method-i.patch
@@ -1,4 +1,4 @@
-From 6e4a35b4de81556e768dc7a5b1a2c3a8983ef155 Mon Sep 17 00:00:00 2001
+From 1c846623e0fc4430252f74527b712c7a651843e0 Mon Sep 17 00:00:00 2001
 From: Gordon Sim <gsim at apache.org>
 Date: Tue, 13 Jan 2015 10:25:08 +0000
 Subject: [PATCH 08/12] QPID-6310: handle case where content bearing method is
diff --git a/0009-QPID-6310-check-validity-of-ranges-when-decoding-seq.patch b/0009-QPID-6310-check-validity-of-ranges-when-decoding-seq.patch
index 709fd31..573fd6f 100644
--- a/0009-QPID-6310-check-validity-of-ranges-when-decoding-seq.patch
+++ b/0009-QPID-6310-check-validity-of-ranges-when-decoding-seq.patch
@@ -1,4 +1,4 @@
-From aa2a9247305b4363f2f1bebec9dd6cc0a518496e Mon Sep 17 00:00:00 2001
+From ef28aaa39fa7c6ae6d0dcbbe87d28ee2d041b35a Mon Sep 17 00:00:00 2001
 From: Gordon Sim <gsim at apache.org>
 Date: Tue, 13 Jan 2015 10:25:15 +0000
 Subject: [PATCH 09/12] QPID-6310: check validity of ranges when decoding
diff --git a/0010-txshift-switch-to-uint-for-workers.patch b/0010-txshift-switch-to-uint-for-workers.patch
index 43bfbdb..5af8ddb 100644
--- a/0010-txshift-switch-to-uint-for-workers.patch
+++ b/0010-txshift-switch-to-uint-for-workers.patch
@@ -1,4 +1,4 @@
-From eaf900f854def9f33d6a1b1670443ed96a51c10c Mon Sep 17 00:00:00 2001
+From 437520da62eb53f3fea20ac2515f375341a26fb0 Mon Sep 17 00:00:00 2001
 From: "Darryl L. Pierce" <dpierce at redhat.com>
 Date: Wed, 21 Jan 2015 10:45:06 -0500
 Subject: [PATCH 10/12] txshift: switch to uint for workers
diff --git a/0011-QPID-6325-improve-0-10-connection-handling-logic.patch b/0011-QPID-6325-improve-0-10-connection-handling-logic.patch
index 7396795..77255da 100644
--- a/0011-QPID-6325-improve-0-10-connection-handling-logic.patch
+++ b/0011-QPID-6325-improve-0-10-connection-handling-logic.patch
@@ -1,4 +1,4 @@
-From 48137ff5bb743ceb6d504d912e4a73d461c21f6d Mon Sep 17 00:00:00 2001
+From 64c310ebfabd5979cc4e6e83e27964bd55d3c907 Mon Sep 17 00:00:00 2001
 From: Gordon Sim <gsim at apache.org>
 Date: Tue, 20 Jan 2015 10:00:17 +0000
 Subject: [PATCH 11/12] QPID-6325: improve 0-10 connection handling logic
diff --git a/0012-QPID-6325-further-improve-0-10-connection-handling-l.patch b/0012-QPID-6325-further-improve-0-10-connection-handling-l.patch
index 3f75d33..875ff02 100644
--- a/0012-QPID-6325-further-improve-0-10-connection-handling-l.patch
+++ b/0012-QPID-6325-further-improve-0-10-connection-handling-l.patch
@@ -1,4 +1,4 @@
-From 9ef192201bb786345da15d05d15cd2b7b7deb647 Mon Sep 17 00:00:00 2001
+From a5f20c6e3f9809073e311eb36c196cffc6ab21bb Mon Sep 17 00:00:00 2001
 From: Gordon Sim <gsim at apache.org>
 Date: Wed, 21 Jan 2015 14:50:52 +0000
 Subject: [PATCH 12/12] QPID-6325: further improve 0-10 connection handling
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index d546194..2c755bc 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:          qpid-cpp
 Version:       0.30
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       Libraries for Qpid C++ client applications
 License:       ASL 2.0
 URL:           http://qpid.apache.org
@@ -518,6 +518,9 @@ rm -rf %{buildroot}/usr/local/%{_lib}/ruby/site_ruby
 
 
 %changelog
+* Fri Feb 20 2015 Darryl L. Pierce <dpierce at redhat.com> - 0.30-11
+- Fixed path to qpid-ha in the systemd service descriptor.
+
 * Wed Feb 04 2015 Petr Machata <pmachata at redhat.com> - 0.30-10
 - Bump for rebuild.

More information about the scm-commits mailing list