java/spacewalk-java.spec | 15 ++++++++++++---
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 5f8f5ea96c84a270091647accaf62d0953f8d2fc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 22 11:43:38 2011 +0100
Automatic commit of package [spacewalk-java] release [1.4.8-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 19bbdcf..03b1908 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.4.7
+Version: 1.4.8
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -536,6 +536,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Feb 22 2011 Tomas Lestach <tlestach(a)redhat.com> 1.4.8-1
+- replace jasper5 with tomcat6-lib for tomcat6 (tlestach(a)redhat.com)
+- removing dead code (tlestach(a)redhat.com)
+- selectedChannel is always null at this place (tlestach(a)redhat.com)
+- fix CreateCommandTest.testVerifyChannelName test (tlestach(a)redhat.com)
+- fix SystemHandlerTest.testGetSubscribedBaseChannel test (tlestach(a)redhat.com)
+
* Mon Feb 21 2011 Jan Pazdziora 1.4.7-1
- Typo in the log message (luc(a)delouw.ch)
- fix testGetSubscribedBaseChannel test (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 13c4c75..3ed44a1 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.4.7-1 java/
+1.4.8-1 java/
commit 25189cb14c5e5f6141a4dc16df73c58967a9a694
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 21 18:37:01 2011 +0100
replace jasper5 with tomcat6-lib for tomcat6
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7f265af..19bbdcf 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -53,7 +53,6 @@ Requires: jakarta-commons-cli
Requires: jakarta-commons-el
Requires: jakarta-commons-io
Requires: jakarta-taglibs-standard
-Requires: jasper5
Requires: jcommon
Requires: jpam
Requires: jta
@@ -64,9 +63,11 @@ Requires: servletapi5
# EL5/F12 = Struts 1.2 and Tomcat 5, EL6+/F13+ = 1.3 and 6
%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} <
13)
Requires: tomcat5
+Requires: jasper5
Requires: struts >= 0:1.2.9
%else
Requires: tomcat6
+Requires: tomcat6-lib
Requires: struts >= 0:1.3.0
Requires: struts-taglib >= 0:1.3.0
%endif
@@ -120,7 +121,6 @@ BuildRequires: jakarta-commons-fileupload
BuildRequires: jakarta-commons-io
BuildRequires: jakarta-commons-validator
BuildRequires: jakarta-taglibs-standard
-BuildRequires: jasper5
BuildRequires: jcommon
BuildRequires: jdom
BuildRequires: jfreechart >= 0:1.0.9
@@ -134,10 +134,12 @@ BuildRequires: stringtree-json
%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} <
13)
BuildRequires: struts >= 0:1.2.9
BuildRequires: jsp
+BuildRequires: jasper5
%else
BuildRequires: struts >= 0:1.3.0
BuildRequires: struts-taglib >= 0:1.3.0
BuildRequires: tomcat6
+BuildRequires: tomcat6-lib
%endif
BuildRequires: sitemesh
BuildRequires: postgresql-jdbc