[jakarta-taglibs-standard] Remove test classes that fail to build(non impl methods) with servlet 3/jsp 2.2.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Feb 8 09:17:11 UTC 2012
commit fa2fb41280395c258e8259ca14bf70ef7925bbbd
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Feb 8 11:17:00 2012 +0200
Remove test classes that fail to build(non impl methods) with servlet
3/jsp 2.2.
jakarta-taglibs-standard.spec | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/jakarta-taglibs-standard.spec b/jakarta-taglibs-standard.spec
index 94e3faf..bd5ef41 100644
--- a/jakarta-taglibs-standard.spec
+++ b/jakarta-taglibs-standard.spec
@@ -33,11 +33,11 @@
Name: jakarta-taglibs-standard
Version: 1.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
Summary: An open-source implementation of the JSP Standard Tag Library
License: ASL 2.0
-Group: Development/Libraries/Java
+Group: Development/Libraries
URL: http://jakarta.apache.org/taglibs/
Source: http://archive.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-%{version}-src.tar.gz
Patch0: jakarta-taglibs-standard-1.1.1-build.patch
@@ -47,13 +47,13 @@ Patch2: %{name}-jdbc-4.1.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.5.30
BuildRequires: ant
-BuildRequires: servletapi5 >= 0:5.0.16
-BuildRequires: tomcat5-jsp-2.0-api >= 0:5.0.16
+BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: tomcat-jsp-2.2-api
BuildRequires: java-devel
BuildRequires: java-javadoc
BuildRequires: xalan-j2 >= 2.6.0
-Requires: servletapi5 >= 0:5.0.16
-Requires: tomcat5-jsp-2.0-api >= 0:5.0.16
+Requires: tomcat-servlet-3.0-api
+Requires: tomcat-jsp-2.2-api
Requires: xalan-j2 >= 2.6.0
%description
@@ -63,7 +63,7 @@ Java Community Process.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
%description javadoc
Javadoc for %{name}.
@@ -74,11 +74,14 @@ Javadoc for %{name}.
%patch0 -b .orig
%patch1
%patch2
+#
+rm -fr standard/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
+rm -fr standard/src/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java
cat > build.properties <<EOBP
build.dir=build
dist.dir=dist
-servlet24.jar=$(build-classpath servletapi5)
-jsp20.jar=$(build-classpath jspapi)
+servlet24.jar=$(build-classpath servlet)
+jsp20.jar=$(build-classpath jsp)
jaxp-api.jar=$(build-classpath xalan-j2)
EOBP
@@ -110,6 +113,9 @@ cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog
+* Wed Feb 8 2012 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.2-4
+- Remove test classes that fail to build(non impl methods) with servlet 3/jsp 2.2.
+
* Tue Jan 24 2012 Deepak Bhole <dbhole at redhat.com> - 0:1.1.2-3
- Added patch to build with JDBC 4.1/Java 7
More information about the scm-commits
mailing list