monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec | 4 ++++
proxy/installer/configure-proxy.sh | 7 +++++++
proxy/proxy/spacewalk-proxy.spec | 8 ++++++++
3 files changed, 19 insertions(+)
New commits:
commit f615f8bd43445d045a33f810c0c909db09cc47cf
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Aug 12 15:34:39 2009 +0200
516624 - allow upgrade proxy using CLI to 5.3 from 5.0
diff --git a/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec
b/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec
index 677a239..1643e09 100644
--- a/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec
+++ b/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec
@@ -52,6 +52,10 @@ Requires: mod_perl
Requires: spacewalk-monitoring-selinux
%endif
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Obsoletes: np-config < 2.111.0
+Provides: np-config = %{version}
+Obsoletes: rhn-modperl < 1.30
+Provides: rhn-modperl = %{version}
%description
NOCpulse provides application, network, systems and transaction monitoring,
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index 824d0d2..f9c4efd 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -277,6 +277,13 @@ default_or_input "Email" SSL_EMAIL
"$TRACEBACK_EMAIL"
--non-interactive
config_error $? "Proxy activation failed!"
+rpm -q rhn-apache >/dev/null
+if [ $? -eq 0 ]; then
+ echo "Package rhn-apache present - assuming upgrade:"
+ echo "Force removal of /etc/httpd/conf/httpd.conf - backed up to
/etc/httpd/conf/httpd.conf.rpmsave"
+ mv /etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf.rpmsave
+fi
+
$YUM_OR_UPDATE spacewalk-proxy-management
# check if package install successfully
rpm -q spacewalk-proxy-management >/dev/null
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 520aa47..ff56e9c 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -45,6 +45,14 @@ Obsoletes: rhns-proxy-tools < 5.3.0
Provides: rhns-proxy-tools = 5.3.0
Obsoletes: spacewalk-proxy-tools < 0.5.3
Provides: spacewalk-proxy-tools = %{version}
+Obsoletes: rhns-auth-daemon < 5.2.0
+Provides: rhns-auth-daemon = %{version}
+Obsoletes: rhn-modssl < 2.9.0
+Provides: rhn-modssl = %{version}
+Obsoletes: rhn-modpython < 2.8.0
+Provides: rhn-modpython = %{version}
+Obsoletes: rhn-apache < 1.4.0
+Provides: rhn-apache = %{version}
%description management
Spacewalk Management Proxy components.
Show replies by date