50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
From 45e477c179ff48c209c7b3210e285e6cddc22137 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Tue, 24 Jan 2017 12:16:38 -0500
|
|
Subject: [PATCH 1/5] WRS: spec-comments-for-ocf.patch
|
|
|
|
Conflicts:
|
|
SPECS/rabbitmq-server.spec
|
|
---
|
|
SPECS/rabbitmq-server.spec | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/SPECS/rabbitmq-server.spec b/SPECS/rabbitmq-server.spec
|
|
index 3a7d940..f1c3cab 100644
|
|
--- a/SPECS/rabbitmq-server.spec
|
|
+++ b/SPECS/rabbitmq-server.spec
|
|
@@ -2,10 +2,11 @@
|
|
# We want to install into /usr/lib, even on 64-bit platforms
|
|
%global _rabbit_libdir %{_exec_prefix}/lib/rabbitmq
|
|
|
|
+%define tis_version r1
|
|
|
|
Name: rabbitmq-server
|
|
Version: 3.6.5
|
|
-Release: 1%{?dist}
|
|
+Release: 1.%{tis_version}%{?dist}
|
|
License: MPLv1.1
|
|
Group: Development/Libraries
|
|
Source0: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.xz
|
|
@@ -15,6 +16,8 @@ Source0: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{
|
|
Source2: rabbitmq-script-wrapper
|
|
# curl -O https://raw.githubusercontent.com/lemenkov/rabbitmq-server/cdfc661/packaging/RPMS/Fedora/rabbitmq-server.logrotate
|
|
Source3: rabbitmq-server.logrotate
|
|
+# WRS modified ocf is located in wrs_patches
|
|
+Source4: rabbitmq-server.ocf
|
|
Source5: rabbitmq-server.tmpfiles
|
|
Patch1: rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch
|
|
Patch2: rabbitmq-server-0002-Add-systemd-notification-support.patch
|
|
@@ -106,7 +109,7 @@ for app in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-server rabbi
|
|
ln -s %{_rabbit_libdir}/lib/rabbitmq_server-%{version}/sbin/${app} %{buildroot}%{_rabbit_libdir}/bin/${app}
|
|
done
|
|
|
|
-install -p -D -m 0755 scripts/rabbitmq-server.ocf %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
|
|
+install -p -D -m 0755 %{S:4} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
|
|
install -p -D -m 0755 scripts/rabbitmq-server-ha.ocf %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha
|
|
|
|
install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
|
|
--
|
|
1.8.3.1
|
|
|