branding/spacewalk-branding.spec | 8 ++++++--
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit c5e6653af5e9cff979146acdcd4019241cf5f3ca
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Feb 11 14:28:56 2010 -0500
Automatic commit of package [spacewalk-branding] release [0.9.2-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index a4e97d1..f7d65db 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 0.9.1
+Version: 0.9.2
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -80,7 +80,7 @@ rm -rf %{buildroot}
%changelog
-* Thu Feb 11 2010 Justin Sherrill <jsherril(a)redhat.com> 0.9.1-1
+* Thu Feb 11 2010 Justin Sherrill <jsherril(a)redhat.com> 0.9.2-1
- updating branding package for tomcat6 (jsherril(a)redhat.com)
- let's start Spacewalk 0.9 (michael.mraka(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index cf007f6..cec9e76 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-0.9.1-1 branding/
+0.9.2-1 branding/
commit be8b9127ee5c293f30cc332f5282ecd943c486ae
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Feb 11 14:28:54 2010 -0500
forgot one mention of tomcat5 in the branding spec file
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 99d315f..a4e97d1 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -71,7 +71,11 @@ rm -rf %{buildroot}
/%{_var}/www/html/nav/styles/*
%{_datadir}/spacewalk/
%{_datadir}/rhn/lib/java-branding.jar
+%if 0%{?rhel} && 0%{?rhel} < 6
%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/java-branding.jar
+%else
+%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar
+%endif
%{_sysconfdir}/rhn/default/rhn_docs.conf
Show replies by date