[openshift-origin-msg-common] mcollective conflict fix now works with F19+
tdawson
tdawson at fedoraproject.org
Tue May 14 13:46:54 UTC 2013
commit cb7217b164dc97104614d4b0c603e113ebc56d54
Author: Troy Dawson <tdawson at redhat.com>
Date: Tue May 14 08:46:51 2013 -0500
mcollective conflict fix now works with F19+
openshift-origin-msg-common.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/openshift-origin-msg-common.spec b/openshift-origin-msg-common.spec
index db38901..e35843d 100644
--- a/openshift-origin-msg-common.spec
+++ b/openshift-origin-msg-common.spec
@@ -7,7 +7,7 @@
Summary: Common msg components for OpenShift server and node
Name: openshift-origin-msg-common
Version: 1.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: ASL 2.0
URL: http://openshift.redhat.com
Source0: http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
@@ -28,18 +28,21 @@ mkdir -p %{buildroot}%{mco_root}agent
mkdir -p %{buildroot}%{mco_root}validator
cp -p agent/* %{buildroot}%{mco_root}agent/
chmod 644 %{buildroot}%{mco_root}agent/*
-%if 0%{?fedora} <= 19
+%if 0%{?fedora} <= 18
cp -p validator/* %{buildroot}%{mco_root}validator/
chmod 644 %{buildroot}%{mco_root}validator/*
%endif
%files
%{mco_root}agent/*
-%if 0%{?fedora} <= 19
+%if 0%{?fedora} <= 18
%{mco_root}validator/*
%endif
%changelog
+* Fri May 10 2013 Troy Dawson <tdawson at redhat.com> 1.4.1-4
+- mcollective conflict fix now works with F19+
+
* Fri May 10 2013 Troy Dawson <tdawson at redhat.com> 1.4.1-3
- Fix mcollective 2.2.3+ validator conflict
More information about the scm-commits
mailing list