java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 0d178e67fd610d635b3c5ba550872ed7c9a0982d
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Feb 16 14:26:36 2010 -0500
Automatic commit of package [spacewalk-java] release [0.9.7-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ae0fa84..9d1317a 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.9.6
+Version: 0.9.7
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -308,6 +308,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Feb 16 2010 Justin Sherrill <jsherril(a)redhat.com> 0.9.7-1
+- fixing issue with conflict between javamail package and classpathx-mail
+ (which provides javamail as a provides). The fedora 12 build was building
+ against the javamail package which broke the deployment when it wasnt
+ installed (jsherril(a)redhat.com)
+
* Mon Feb 15 2010 Justin Sherrill <jsherril(a)redhat.com> 0.9.6-1
- changing new rev number to be one more than latest, not one more than current
(jsherril(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6bf7d15..7839944 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.9.6-1 java/
+0.9.7-1 java/
commit 155ac8b6ccb2523c48e5c3b7fbebda8d5fd45be7
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Feb 16 14:26:28 2010 -0500
fixing issue with conflict between javamail package and classpathx-mail (which
provides javamail as a provides). The fedora 12 build was building against the javamail
package which broke the deployment when it wasnt installed
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8e9d1f7..ae0fa84 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -74,7 +74,11 @@ BuildRequires: ant-nodeps
BuildRequires: antlr >= 0:2.7.6
BuildRequires: jpam
BuildRequires: tanukiwrapper
+%if 0%{?rhel} && 0%{?rhel} < 5
BuildRequires: javamail
+%else
+BuildRequires: classpathx-mail
+%endif
BuildRequires: jsp
# Sadly I need these to symlink the jars properly.