diff --git a/.jakarta-taglibs-standard.metadata b/.jakarta-taglibs-standard.metadata new file mode 100644 index 0000000..4a140e0 --- /dev/null +++ b/.jakarta-taglibs-standard.metadata @@ -0,0 +1 @@ +1d24c9e5019b57f298a40a77bac3f863ecf8a033 SOURCES/jakarta-taglibs-standard-1.1.2-src.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/fix-1.6.0-build.patch b/SOURCES/fix-1.6.0-build.patch new file mode 100644 index 0000000..7befacc --- /dev/null +++ b/SOURCES/fix-1.6.0-build.patch @@ -0,0 +1,14 @@ +--- standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java.sav 2004-07-20 00:06:07.000000000 +0300 ++++ standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2011-07-19 14:19:40.689712335 +0300 +@@ -111,5 +111,11 @@ public class DataSourceWrapper implement + throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); + } + ++ public boolean isWrapperFor(Class iface) throws SQLException { ++ throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); ++ } ++ public Object unwrap(Class iface) throws SQLException { ++ throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); ++ } + + } diff --git a/SOURCES/jakarta-taglibs-standard-1.1.1-build.patch b/SOURCES/jakarta-taglibs-standard-1.1.1-build.patch new file mode 100644 index 0000000..d0637b6 --- /dev/null +++ b/SOURCES/jakarta-taglibs-standard-1.1.1-build.patch @@ -0,0 +1,35 @@ +--- standard/build.xml.orig 2004-07-19 17:06:08.000000000 -0400 ++++ standard/build.xml 2007-04-16 17:56:48.000000000 -0400 +@@ -164,18 +164,16 @@ + + + +- ++ + ++ optimize="${compile.optimize}" ++ source="1.4"/> + + + +@@ -277,7 +275,8 @@ + classpath="${servlet24.jar}:${jsp20.jar}:${build.library}/classes" + debug="${compile.debug}" + deprecation="${compile.deprecation}" +- optimize="${compile.optimize}"/> ++ optimize="${compile.optimize}" ++ source="1.4"/> + + + diff --git a/SOURCES/jakarta-taglibs-standard-1.1.2-jstl-pom.patch b/SOURCES/jakarta-taglibs-standard-1.1.2-jstl-pom.patch new file mode 100644 index 0000000..f3f8e8d --- /dev/null +++ b/SOURCES/jakarta-taglibs-standard-1.1.2-jstl-pom.patch @@ -0,0 +1,26 @@ +--- jstl-1.1.2.pom 2012-06-19 17:05:52.059382074 +0800 ++++ jstl-1.1.2.pom-gil 2012-06-19 17:04:58.289054295 +0800 +@@ -10,10 +10,17 @@ + http://java.sun.com/products/jsp/jstl/ + + http://java.sun.com/products/jsp/jstl/downloads/ +- +- javax.servlet +- jstl +- 1.1.2 +- + ++ ++ ++ org.apache.tomcat ++ tomcat-servlet-api ++ 7.0.27 ++ ++ ++ org.apache.tomcat ++ tomcat-jsp-api ++ 7.0.27 ++ ++ + +\ No newline at end of file diff --git a/SOURCES/jakarta-taglibs-standard-1.1.2-standard-pom.patch b/SOURCES/jakarta-taglibs-standard-1.1.2-standard-pom.patch new file mode 100644 index 0000000..75d36cb --- /dev/null +++ b/SOURCES/jakarta-taglibs-standard-1.1.2-standard-pom.patch @@ -0,0 +1,25 @@ +--- standard-1.1.2.pom 2012-06-19 16:43:36.251081977 +0800 ++++ standard-1.1.2.pom-gil 2012-06-19 17:06:55.267591862 +0800 +@@ -3,4 +3,21 @@ + taglibs + standard + 1.1.2 ++ ++ ++ jstl ++ jstl ++ 1.1.2 ++ ++ ++ org.apache.tomcat ++ tomcat-el-api ++ 7.0.27 ++ ++ ++ xalan ++ xalan ++ 2.7.1 ++ ++ + +\ No newline at end of file diff --git a/SOURCES/jakarta-taglibs-standard-jdbc-4.1.patch b/SOURCES/jakarta-taglibs-standard-jdbc-4.1.patch new file mode 100644 index 0000000..b57fd03 --- /dev/null +++ b/SOURCES/jakarta-taglibs-standard-jdbc-4.1.patch @@ -0,0 +1,20 @@ +diff -up ./standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java.sav ./standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java +--- ./standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java.sav 2012-01-24 15:23:53.000000000 -0500 ++++ ./standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-01-24 15:24:31.000000000 -0500 +@@ -25,6 +25,8 @@ import javax.sql.DataSource; + + import org.apache.taglibs.standard.resources.Resources; + ++import java.sql.SQLFeatureNotSupportedException; ++import java.util.logging.Logger; + + /** + *

A simple DataSource wrapper for the standard +@@ -118,4 +120,7 @@ public class DataSourceWrapper implement + throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); + } + ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(Resources.getMessage("NOT_SUPPORTED")); ++ } + } diff --git a/SOURCES/jstl-1.1.2.pom b/SOURCES/jstl-1.1.2.pom new file mode 100644 index 0000000..bc4c983 --- /dev/null +++ b/SOURCES/jstl-1.1.2.pom @@ -0,0 +1,19 @@ + + 4.0.0 + jstl + jstl + 1.1.2 + Java Server Pages Standard Tag Library + +The JavaServer Pages Standard Tag Library (JSTL) encapsulates, as simple tags, core functionality common to many JSP applications. + + http://java.sun.com/products/jsp/jstl/ + + http://java.sun.com/products/jsp/jstl/downloads/ + + javax.servlet + jstl + 1.1.2 + + + \ No newline at end of file diff --git a/SOURCES/standard-1.1.2.pom b/SOURCES/standard-1.1.2.pom new file mode 100644 index 0000000..d43698a --- /dev/null +++ b/SOURCES/standard-1.1.2.pom @@ -0,0 +1,6 @@ + + 4.0.0 + taglibs + standard + 1.1.2 + \ No newline at end of file diff --git a/SPECS/jakarta-taglibs-standard.spec b/SPECS/jakarta-taglibs-standard.spec new file mode 100644 index 0000000..6d7eb80 --- /dev/null +++ b/SPECS/jakarta-taglibs-standard.spec @@ -0,0 +1,244 @@ +# Copyright (c) 2000-2007, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +%global base_name standard +%global short_name taglibs-%{base_name} + +Name: jakarta-taglibs-standard +Version: 1.1.2 +Release: 10%{?dist} +Epoch: 0 +Summary: An open-source implementation of the JSP Standard Tag Library +License: ASL 2.0 +Group: Development/Libraries +URL: http://jakarta.apache.org/taglibs/ +Source0: http://archive.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-%{version}-src.tar.gz +Source1: http://repo1.maven.org/maven2/jstl/jstl/%{version}/jstl-%{version}.pom +Source2: http://repo1.maven.org/maven2/taglibs/standard/%{version}/standard-%{version}.pom + +Patch0: jakarta-taglibs-standard-1.1.1-build.patch +Patch1: fix-1.6.0-build.patch +Patch2: %{name}-jdbc-4.1.patch +# remove relocation use -a parameter with %%add_maven_depmap +# prevent maven/system overflow +Patch3: jakarta-taglibs-standard-1.1.2-jstl-pom.patch +Patch4: jakarta-taglibs-standard-1.1.2-standard-pom.patch + +BuildArch: noarch +BuildRequires: jpackage-utils >= 0:1.5.30 +BuildRequires: ant +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: tomcat-servlet-3.0-api +Requires: tomcat-jsp-2.2-api +Requires: xalan-j2 >= 2.6.0 + +%description +This package contains Jakarta Taglibs's open-source implementation of the +JSP Standard Tag Library (JSTL), version 1.1. JSTL is a standard under the +Java Community Process. + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation + +%description javadoc +Javadoc for %{name}. + + +%prep +%setup -q -n %{name}-%{version}-src +%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 < - 0:1.1.2-10 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Thu Mar 7 2013 Mikolaj Izdebski - 0:1.1.2-9 +- Add depmaps for org.eclipse.jetty.orbit + +* Thu Feb 14 2013 Fedora Release Engineering - 0:1.1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Sep 20 2012 Mikolaj Izdebski - 0:1.1.2-7 +- Install LICENSE and NOTICE files + +* Thu Jul 19 2012 Fedora Release Engineering - 0:1.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 19 2012 Hui Wang 0:1.1.2-5 +- Bug 829804 + +* Wed Feb 8 2012 Alexander Kurtakov 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 - 0:1.1.2-3 +- Added patch to build with JDBC 4.1/Java 7 + +* Fri Jan 13 2012 Fedora Release Engineering - 0:1.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Jul 19 2011 Alexander Kurtakov 0:1.1.2-1 +- Update to 1.1.2 upstream release - 7 years later!. + +* Tue Jul 19 2011 Alexander Kurtakov 0:1.1.1-12.3 +- Adapt to current guidelines. + +* Wed Feb 09 2011 Fedora Release Engineering - 0:1.1.1-12.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 24 2009 Fedora Release Engineering - 0:1.1.1-11.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0:1.1.1-10.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.1.1-9.2 +- drop repotag +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 0:1.1.1-9jpp.1 +- Autorebuild for GCC 4.3 + +* Wed Mar 21 2007 Matt Wringe 0:1.1.1-8jpp.1 +- Merge with latest jpp version +- Fix various rpmlint warnings + +* Wed Mar 21 2007 Matt Wringe 0:1.1.1-8jpp +- Fix empty javadoc post and postun rpmlint warnings +- Update copyright year + +* Thu Aug 10 2006 Matt Wringe 0:1.1.1-7jpp.1 +- Merge with upstream version + - Add missing javadoc postun + - Add missing javadoc requires + +* Thu Aug 10 2006 Karsten Hopp 1.1.1-6jpp_3fc +- Requires(post): coreutils + +* Sat Jul 22 2006 Jakub Jelinek - 0:1.1.1-6jpp_2fc +- Rebuilt + +* Thu Jul 20 2006 Matt Wringe 0:1.1.1-6jpp_1fc +- Merge with upstream version +- Natively compile package + +* Thu Jul 20 2006 Matt Wringe 0:1.1.1-6jpp +- Add conditional native compilation +- Add missing BuildRequires and Requires for tomcat5-jsp-2.0-api and xalan-j2 + (from Deepak Bhole ) + +* Thu Apr 27 2006 Fernando Nasser 0:1.1.1-5jpp +- First JPP 1.7 build + +* Fri Oct 22 2004 Fernando Nasser 0:1.1.1-4jpp +- Rebuild to replace incorrect patch file + +* Fri Oct 22 2004 Fernando Nasser 0:1.1.1-3jpp +- Remove hack for 1.3 Java that would break building with an IBM SDK. + +* Sun Aug 23 2004 Randy Watler - 0:1.1.1-2jpp +- Rebuild with ant-1.6.2 + +* Tue Jul 27 2004 Kaj J. Niemi 0:1.1.1-1jpp +- 1.1.1 + +* Tue Feb 17 2004 Kaj J. Niemi 0:1.1.0-1jpp +- 1.1.0 final + +* Wed Jan 22 2004 David Walluck 0:1.1.0-0.B1.2jpp +- change URL +- fix description + +* Fri Jan 9 2004 Kaj J. Niemi - 0:1.1.0-0.B1.1jpp +- First build for JPackage + +* Mon Dec 22 2003 Kaj J. Niemi - 0:1.1.0-0.B1.1 +- First build +- Skip examples for now