proxy/proxy/spacewalk-proxy.spec | 7 ++++++-
rel-eng/packages/spacewalk-proxy | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 +++++--
4 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 42a307d3ab1123d1439d22bc4f772df51e9e7a96
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 14:00:53 2013 +0200
Automatic commit of package [spacewalk-proxy] release [2.1.7-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index dde7429..d204031 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.1.6
+Version: 2.1.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,10 @@ fi
%changelog
+* Wed Aug 28 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.7-1
+- 1001997 - let spacewalk-proxy-management require spacewalk-base-minimal-
+ config
+
* Fri Aug 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.6-1
- 1000586 - fixing line lenth error
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 75f37fc..240a1ac 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-2.1.6-1 proxy/proxy/
+2.1.7-1 proxy/proxy/
commit b00edcea3b96367f95975006827a271cee95172b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 14:00:24 2013 +0200
Automatic commit of package [spacewalk-web] release [2.1.13-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 02b2c6e..357e762 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.12-1 web/
+2.1.13-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 0fa9bb4..6dd8b1b 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.12
+Version: 2.1.13
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk/
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -272,6 +272,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Aug 28 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.13-1
+- Revert "1001997 - let spacewalk-base-minimal require spacewalk-base-minimal-
+ config"
+
* Wed Aug 28 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.12-1
- 1001997 - let spacewalk-base-minimal require spacewalk-base-minimal-config
commit 33095300922667d7a5af99fbfcb011628a74b41d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 13:59:11 2013 +0200
1001997 - let spacewalk-proxy-management require spacewalk-base-minimal-config
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 917657f..dde7429 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -34,6 +34,7 @@ Requires: spacewalk-backend >= 1.7.24
# python-hashlib is optional for spacewalk-backend-libs
# but we need made it mandatory here
Requires: python-hashlib
+Requires: spacewalk-base-minimal-config
Requires: %{name}-broker = %{version}
Requires: %{name}-redirect = %{version}
Requires: %{name}-common >= %{version}
commit ec2ae9f0360a551fdb09b7c247de7a3d34f79a13
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 13:55:33 2013 +0200
Revert "1001997 - let spacewalk-base-minimal require
spacewalk-base-minimal-config"
This reverts commit 5ee39bbe486475d99943e8147259876d1035b913
we do not want spacewalk-base-minimal to require spacewalk-base-minimal-config due to
managed-db
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 7613603..0fa9bb4 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -57,7 +57,6 @@ Summary: Core of Perl modules for %{name} package
Group: Applications/Internet
Provides: spacewalk(spacewalk-base-minimal) = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
-Requires: spacewalk-base-minimal-config
Obsoletes: rhn-base-minimal < 5.3.0
Provides: rhn-base-minimal = 5.3.0