client/tools/osad/osad.spec | 13 ++++++++++++-
rel-eng/packages/osad | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit d7e37e152504a7a9854b07d4b4d091fca21921b0
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Mar 26 16:10:13 2013 -0400
Automatic commit of package [osad] release [5.11.20-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index a370945..af36822 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.19
+Version: 5.11.20
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
+* Tue Mar 26 2013 Stephen Herr <sherr(a)redhat.com> 5.11.20-1
+- 860937 - update osad requires versions for rhel 5 and 6
+
* Fri Mar 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.11.19-1
- 919468 - fixed path in file based Requires
- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 78a61a1..60f7d5c 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.19-1 client/tools/osad/
+5.11.20-1 client/tools/osad/
commit 4adba1ba35f7586f88e84486b6842586d326144e
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Mar 26 16:10:08 2013 -0400
860937 - update osad requires versions for rhel 5 and 6
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 4c30459..a370945 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -25,7 +25,15 @@ BuildRequires: python-devel
Requires: python
Requires: rhnlib >= 1.8-3
Requires: jabberpy
+%if 0%{?el5}
+Requires: rhn-client-tools >= 0.4.20-48
+%else
+%if 0%{?el6}
+Requires: rhn-client-tools >= 1.0.0-44
+%else
Requires: rhn-client-tools >= 1.3.7
+%endif
+%endif
%if 0%{?rhel} && 0%{?rhel} <= 5
Requires: python-hashlib
%endif