[qpid-dispatch] Fixed the path for the configuration file.

Darryl L. Pierce mcpierce at fedoraproject.org
Wed Jul 2 14:08:41 UTC 2014


commit b69dc797e1afffc183b2e6aeb794b2811969d693
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Wed Jul 2 10:02:22 2014 -0400

    Fixed the path for the configuration file.
    
    - Resolves: BZ#1115416

 ...O-JIRA-Systemd-control-file-for-qdrouterd.patch |    8 ++++----
 ...O-JIRA-SysVInit-script-for-qpid-dxrouterd.patch |    8 ++++----
 qpid-dispatch.spec                                 |    6 +++++-
 3 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/0001-NO-JIRA-Systemd-control-file-for-qdrouterd.patch b/0001-NO-JIRA-Systemd-control-file-for-qdrouterd.patch
index 13384a0..62b0ecf 100644
--- a/0001-NO-JIRA-Systemd-control-file-for-qdrouterd.patch
+++ b/0001-NO-JIRA-Systemd-control-file-for-qdrouterd.patch
@@ -1,4 +1,4 @@
-From 56b85ff76eede4d14bfe96427ba8d6bfc61765c8 Mon Sep 17 00:00:00 2001
+From c300b95c143763859f7fa12da1966fad18e19d45 Mon Sep 17 00:00:00 2001
 From: "Darryl L. Pierce" <mcpierce at gmail.com>
 Date: Fri, 8 Nov 2013 10:29:28 -0500
 Subject: [PATCH 1/2] NO-JIRA: Systemd control file for qdrouterd.
@@ -10,7 +10,7 @@ Subject: [PATCH 1/2] NO-JIRA: Systemd control file for qdrouterd.
 
 diff --git a/etc/qdrouterd.service b/etc/qdrouterd.service
 new file mode 100644
-index 0000000..e846bf9
+index 0000000..441461d
 --- /dev/null
 +++ b/etc/qdrouterd.service
 @@ -0,0 +1,12 @@
@@ -22,10 +22,10 @@ index 0000000..e846bf9
 +User=qpidd
 +Group=qpidd
 +Type=simple
-+ExecStart=/usr/sbin/qdrouterd -c /etc/qpid/qdrouterd.conf
++ExecStart=/usr/sbin/qdrouterd -c /etc/qpid-dispatch/qdrouterd.conf
 +
 +[Install]
 +WantedBy=multi-user.target
 -- 
-1.9.0
+1.9.3
 
diff --git a/0002-NO-JIRA-SysVInit-script-for-qpid-dxrouterd.patch b/0002-NO-JIRA-SysVInit-script-for-qpid-dxrouterd.patch
index 077d168..4000baa 100644
--- a/0002-NO-JIRA-SysVInit-script-for-qpid-dxrouterd.patch
+++ b/0002-NO-JIRA-SysVInit-script-for-qpid-dxrouterd.patch
@@ -1,4 +1,4 @@
-From c1b404cc54546a4de67f0113deccb4c047a38bfb Mon Sep 17 00:00:00 2001
+From 304dd5488f63b98411c5c6aa4368a474862a4022 Mon Sep 17 00:00:00 2001
 From: "Darryl L. Pierce" <mcpierce at gmail.com>
 Date: Thu, 30 Jan 2014 09:23:56 -0500
 Subject: [PATCH 2/2] NO-JIRA: SysVInit script for qpid-dxrouterd.
@@ -10,7 +10,7 @@ Subject: [PATCH 2/2] NO-JIRA: SysVInit script for qpid-dxrouterd.
 
 diff --git a/etc/qpid-dxrouterd b/etc/qpid-dxrouterd
 new file mode 100644
-index 0000000..4604dc2
+index 0000000..1364cb6
 --- /dev/null
 +++ b/etc/qpid-dxrouterd
 @@ -0,0 +1,81 @@
@@ -43,7 +43,7 @@ index 0000000..4604dc2
 +exe=/usr/sbin/$prog
 +lockfile=/var/lock/subsys/$prog
 +pidfile=/var/run/$prog.pid
-+config=/etc/qpid/qdrouterd.conf
++config=/etc/qpid-dispatch/qdrouterd.conf
 +
 +if [ -f /etc/sysconfig/$prog ]; then
 +    . /etc/sysconfig/$prog
@@ -96,5 +96,5 @@ index 0000000..4604dc2
 +
 +exit $RETVAL
 -- 
-1.9.0
+1.9.3
 
diff --git a/qpid-dispatch.spec b/qpid-dispatch.spec
index 278d144..e16a216 100644
--- a/qpid-dispatch.spec
+++ b/qpid-dispatch.spec
@@ -5,7 +5,7 @@
 
 Name:          qpid-dispatch
 Version:       0.2
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Dispatch router for Qpid
 License:       ASL 2.0
 URL:           http://qpid.apache.org/
@@ -227,6 +227,10 @@ install -pm 644 %{_builddir}/qpid-dispatch-%{version}/etc/qpid-dxrouterd \
 
 
 %changelog
+* Wed Jul  2 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.2-5
+- Fixed the path for the configuration file.
+- Resolves: BZ#1115416
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list