[qpid-cpp/f19] Fixed how qpid-cpp-server was depending on -store.
Darryl L. Pierce
mcpierce at fedoraproject.org
Thu Dec 5 21:23:29 UTC 2013
commit 6ef25794277418ef4197dba48b60f60cc4b9cf4a
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date: Thu Dec 5 13:16:59 2013 -0500
Fixed how qpid-cpp-server was depending on -store.
- qpidd.service now starts after network.service
- Resolves: BZ#1038674
- Resolves: BZ#1038094
...JIRA-qpidd.service-file-for-use-on-Fedora.patch | 13 +++++++------
qpid-cpp.spec | 17 ++++++++++++-----
2 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/01-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch b/01-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
index bee46ca..e71d027 100644
--- a/01-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
+++ b/01-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
@@ -1,25 +1,26 @@
-From b83805f5da4fe8566c3107617b262fdc745b9798 Mon Sep 17 00:00:00 2001
+From c77f3a1fd1d93260d57b5e1e9b0792ccc2beb6bb 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 1/2] NO-JIRA: qpidd.service file for use on Fedora
+Subject: [PATCH] NO-JIRA: qpidd.service file for use on Fedora
This patch provides the needed systemd file for running the Qpid broker
as a service.
---
- qpid/cpp/etc/qpidd.service | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
+ qpid/cpp/etc/qpidd.service | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
create mode 100644 qpid/cpp/etc/qpidd.service
diff --git a/qpid/cpp/etc/qpidd.service b/qpid/cpp/etc/qpidd.service
new file mode 100644
-index 0000000..d5e36da
+index 0000000..10a99d1
--- /dev/null
+++ b/qpid/cpp/etc/qpidd.service
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,14 @@
+[Unit]
+Description=An AMQP message broker daemon.
+Documentation=man:qpidd(1) http://qpid.apache.org/
+Requires=network.target
++After=network.target
+
+[Service]
+User=qpidd
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index b86f8c0..a0358dd 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -25,7 +25,7 @@
Name: qpid-cpp
Version: 0.24
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Libraries for Qpid C++ client applications
License: ASL 2.0
URL: http://qpid.apache.org
@@ -219,8 +219,8 @@ the open AMQP messaging protocol.
%ghost %config %{_sysconfdir}/qpidd.conf
%config(noreplace) %{_sysconfdir}/qpid/qpidd.conf
%config(noreplace) %{_sysconfdir}/sasl2/qpidd.conf
-%{_libdir}/qpid/daemon/*
-%exclude %{_libdir}/qpid/daemon/rdma.so
+%dir %{_libdir}/qpid/daemon
+%{_libdir}/qpid/daemon/amqp.so
%attr(755, qpidd, qpidd) %{_localstatedir}/lib/qpidd
%ghost %attr(755, qpidd, qpidd) /var/run/qpidd
#%attr(600, qpidd, qpidd) %config(noreplace) %{_localstatedir}/lib/qpidd/qpidd.sasldb
@@ -474,7 +474,7 @@ messages.
Summary: Red Hat persistence extension to the Qpid messaging system
License: LGPLv2+
-Requires: qpid-cpp-server%{?_isa} = %{version}
+Requires: qpid-cpp-server%{?_isa} = %{version}-%{release}
Requires: db4
Requires: libaio
@@ -485,7 +485,7 @@ with Berkeley DB.
%files -n qpid-cpp-server-store
%defattr(-,root,root,-)
-%{_libdir}/qpid/daemon/store.so
+%{_libdir}/qpid/daemon/legacystore.so
%post -n qpid-cpp-server-store -p /sbin/ldconfig
@@ -591,6 +591,7 @@ rm -f %{buildroot}/%{_libdir}/ruby/cqpid.so
rm -f %{buildroot}/%{_libdir}/ruby/qmfengine.so
rm -f %{buildroot}/%{ruby_sitelib}
rm -rf %{buildroot}/%{_libdir}/perl5
+rm -rf %{buildroot}/%{_libdir}/qpid/daemon/store.so*
# install systemd files
mkdir -p %{buildroot}/%{_unitdir}
@@ -639,6 +640,12 @@ rm -rf %{buildroot}
%changelog
+* Thu Dec 5 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.24-5
+- Fixed how qpid-cpp-server was depending on -store.
+- qpidd.service now starts after network.service
+- Resolves: BZ#1038674
+- Resolves: BZ#1038094
+
* Sat Nov 30 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.24-4
- Removed rdma.so from the -server subpackage.
- Removed rdmaconnector.so from the -client subpackage.
More information about the scm-commits
mailing list