client/tools/osad/osad.spec | 7 +++++--
rel-eng/packages/osad | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 71706e6f350e61c4fe71e2de04d2e1149796469a
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Mar 27 11:25:20 2013 -0400
Automatic commit of package [osad] release [5.11.21-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 97216b3..4650544 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -17,7 +17,7 @@ Group: System Environment/Daemons
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.11.20
+Version: 5.11.21
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -359,6 +359,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Wed Mar 27 2013 Stephen Herr <sherr(a)redhat.com> 5.11.21-1
+- 860937 - correct requires on RHEL 5
+
* Tue Mar 26 2013 Stephen Herr <sherr(a)redhat.com> 5.11.20-1
- 860937 - update osad requires versions for rhel 5 and 6
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 60f7d5c..15eede5 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.20-1 client/tools/osad/
+5.11.21-1 client/tools/osad/
commit bd01bd8f9f05bcb36034ad6caa2fd4cc85e40670
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Mar 27 11:15:42 2013 -0400
860937 - correct requires on RHEL 5
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index af36822..97216b3 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -25,7 +25,7 @@ BuildRequires: python-devel
Requires: python
Requires: rhnlib >= 1.8-3
Requires: jabberpy
-%if 0%{?el5}
+%if 0%{?rhel} && 0%{?rhel} < 6
Requires: rhn-client-tools >= 0.4.20-48
%else
%if 0%{?el6}