From 5e5d0c21424578cdef5528b96c82828c0ea0a01262b1faaffe38176291cebcf0 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 5 Aug 2008 23:48:33 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jakarta-taglibs-standard?expand=0&rev=2 --- jakarta-taglibs-standard-1.1.1-build.patch | 24 +- ...-taglibs-standard-1.1.1-remove-enums.patch | 208 ++++++++++++++++++ jakarta-taglibs-standard-1.1.1-src.tar.bz2 | 3 + jakarta-taglibs-standard-1.1.1-src.tar.gz | 3 - ...taglibs-standard-java6-compatibility.patch | 16 ++ jakarta-taglibs-standard.changes | 8 + jakarta-taglibs-standard.spec | 56 +++-- 7 files changed, 291 insertions(+), 27 deletions(-) create mode 100644 jakarta-taglibs-standard-1.1.1-remove-enums.patch create mode 100644 jakarta-taglibs-standard-1.1.1-src.tar.bz2 delete mode 100644 jakarta-taglibs-standard-1.1.1-src.tar.gz create mode 100644 jakarta-taglibs-standard-java6-compatibility.patch diff --git a/jakarta-taglibs-standard-1.1.1-build.patch b/jakarta-taglibs-standard-1.1.1-build.patch index ae345dd..0854ced 100644 --- a/jakarta-taglibs-standard-1.1.1-build.patch +++ b/jakarta-taglibs-standard-1.1.1-build.patch @@ -1,6 +1,6 @@ ---- standard/build.xml.orig 2004-10-22 11:16:21.000000000 -0400 -+++ standard/build.xml 2004-10-22 11:17:53.000000000 -0400 -@@ -164,14 +164,11 @@ +--- standard/build.xml ++++ standard/build.xml +@@ -164,18 +164,17 @@ @@ -17,3 +17,21 @@ excludes="org/apache/taglibs/standard/lang/jstl/parser/jsp20/* org/apache/taglibs/standard/lang/jpath/** org/apache/taglibs/standard/lang/spel/**" debug="${compile.debug}" deprecation="${compile.deprecation}" +- optimize="${compile.optimize}"/> ++ optimize="${compile.optimize}" ++ source="1.5" ++ target="1.5"/> + + + +@@ -277,7 +276,9 @@ + classpath="${servlet24.jar}:${jsp20.jar}:${build.library}/classes" + debug="${compile.debug}" + deprecation="${compile.deprecation}" +- optimize="${compile.optimize}"/> ++ optimize="${compile.optimize}" ++ source="1.5" ++ target="1.5"/> + + + diff --git a/jakarta-taglibs-standard-1.1.1-remove-enums.patch b/jakarta-taglibs-standard-1.1.1-remove-enums.patch new file mode 100644 index 0000000..c3d085f --- /dev/null +++ b/jakarta-taglibs-standard-1.1.1-remove-enums.patch @@ -0,0 +1,208 @@ +--- standard/examples/src/org/apache/taglibs/standard/examples/startup/Init.java ++++ standard/examples/src/org/apache/taglibs/standard/examples/startup/Init.java +@@ -122,10 +122,10 @@ + /** + * Enumeration + */ +- Enumeration enum = numberMap.keys(); ++ Enumeration enum2 = numberMap.keys(); + // don't use 'enum' for attribute name because it is a + // reserved word in EcmaScript. +- sce.getServletContext().setAttribute("enumeration", enum); ++ sce.getServletContext().setAttribute("enumeration", enum2); + + /** + * Message arguments for parametric replacement +--- standard/src/org/apache/taglibs/standard/extra/spath/SPathParser.java ++++ standard/src/org/apache/taglibs/standard/extra/spath/SPathParser.java +@@ -437,8 +437,8 @@ + jj_expentry[i] = jj_lasttokens[i]; + } + boolean exists = false; +- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) { +- int[] oldentry = (int[])(enum.nextElement()); ++ for (java.util.Enumeration enum2 = jj_expentries.elements(); enum2.hasMoreElements();) { ++ int[] oldentry = (int[])(enum2.nextElement()); + if (oldentry.length == jj_expentry.length) { + exists = true; + for (int i = 0; i < jj_expentry.length; i++) { +--- standard/src/org/apache/taglibs/standard/functions/Functions.java ++++ standard/src/org/apache/taglibs/standard/functions/Functions.java +@@ -204,11 +204,11 @@ + return count; + } + if (obj instanceof Enumeration) { +- Enumeration enum = (Enumeration)obj; ++ Enumeration enum2 = (Enumeration)obj; + count = 0; +- while (enum.hasMoreElements()) { ++ while (enum2.hasMoreElements()) { + count++; +- enum.nextElement(); ++ enum2.nextElement(); + } + return count; + } +@@ -231,4 +231,4 @@ + + return buf.toString(); + } +-} +\ No newline at end of file ++} +--- standard/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java ++++ standard/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java +@@ -980,13 +980,13 @@ + + List l = new ArrayList (); + +- Enumeration enum = request.getHeaders ((String) pKey); ++ Enumeration enum2 = request.getHeaders ((String) pKey); + +- if (enum != null) { ++ if (enum2 != null) { + +- while (enum.hasMoreElements ()) { ++ while (enum2.hasMoreElements ()) { + +- l.add (enum.nextElement ()); ++ l.add (enum2.nextElement ()); + + } + +--- standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java ++++ standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java +@@ -1104,8 +1104,8 @@ + jj_expentry[i] = jj_lasttokens[i]; + } + boolean exists = false; +- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) { +- int[] oldentry = (int[])(enum.nextElement()); ++ for (java.util.Enumeration enum2 = jj_expentries.elements(); enum2.hasMoreElements();) { ++ int[] oldentry = (int[])(enum2.nextElement()); + if (oldentry.length == jj_expentry.length) { + exists = true; + for (int i = 0; i < jj_expentry.length; i++) { +--- standard/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java ++++ standard/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java +@@ -246,9 +246,9 @@ + + // Determine locale from client's browser settings. + +- for (Enumeration enum = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest()); +- enum.hasMoreElements(); ) { +- Locale pref = (Locale) enum.nextElement(); ++ for (Enumeration enum2 = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest()); ++ enum2.hasMoreElements(); ) { ++ Locale pref = (Locale) enum2.nextElement(); + ResourceBundle match = findMatch(basename, pref); + if (match != null) { + locCtxt = new LocalizationContext(match, pref); +--- standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java ++++ standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java +@@ -401,9 +401,9 @@ + private static Locale findFormattingMatch(PageContext pageContext, + Locale[] avail) { + Locale match = null; +- for (Enumeration enum = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest()); +- enum.hasMoreElements(); ) { +- Locale locale = (Locale)enum.nextElement(); ++ for (Enumeration enum2 = Util.getRequestLocales((HttpServletRequest)pageContext.getRequest()); ++ enum2.hasMoreElements(); ) { ++ Locale locale = (Locale)enum2.nextElement(); + match = findFormattingMatch(locale, avail); + if (match != null) { + break; +--- standard/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java ++++ standard/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java +@@ -74,10 +74,10 @@ + globalVarSize = 0; + Vector variableVector = new Vector ( ); + // Now construct attributes in different scopes +- Enumeration enum = pageContext.getAttributeNamesInScope( ++ Enumeration enum2 = pageContext.getAttributeNamesInScope( + PageContext.PAGE_SCOPE ); +- while ( enum.hasMoreElements() ) { +- String varName = (String)enum.nextElement(); ++ while ( enum2.hasMoreElements() ) { ++ String varName = (String)enum2.nextElement(); + QName varQName = new QName ( PAGE_NS_URL, PAGE_P, varName); + //Adding both namespace qualified QName and just localName + variableVector.addElement( varQName ); +@@ -86,10 +86,10 @@ + variableVector.addElement( new QName(null, varName ) ); + globalVarSize++; + } +- enum = pageContext.getAttributeNamesInScope( ++ enum2 = pageContext.getAttributeNamesInScope( + PageContext.REQUEST_SCOPE ); +- while ( enum.hasMoreElements() ) { +- String varName = (String)enum.nextElement(); ++ while ( enum2.hasMoreElements() ) { ++ String varName = (String)enum2.nextElement(); + QName varQName = new QName ( REQUEST_NS_URL,REQUEST_P, varName); + //Adding both namespace qualified QName and just localName + variableVector.addElement( varQName ); +@@ -97,10 +97,10 @@ + variableVector.addElement( new QName(null, varName ) ); + globalVarSize++; + } +- enum = pageContext.getAttributeNamesInScope( ++ enum2 = pageContext.getAttributeNamesInScope( + PageContext.SESSION_SCOPE ); +- while ( enum.hasMoreElements() ) { +- String varName = (String)enum.nextElement(); ++ while ( enum2.hasMoreElements() ) { ++ String varName = (String)enum2.nextElement(); + QName varQName = new QName ( SESSION_NS_URL, SESSION_P,varName); + //Adding both namespace qualified QName and just localName + variableVector.addElement( varQName ); +@@ -108,10 +108,10 @@ + variableVector.addElement( new QName(null, varName ) ); + globalVarSize++; + } +- enum = pageContext.getAttributeNamesInScope( ++ enum2 = pageContext.getAttributeNamesInScope( + PageContext.APPLICATION_SCOPE ); +- while ( enum.hasMoreElements() ) { +- String varName = (String)enum.nextElement(); ++ while ( enum2.hasMoreElements() ) { ++ String varName = (String)enum2.nextElement(); + QName varQName = new QName ( APP_NS_URL, APP_P,varName ); + //Adding both namespace qualified QName and just localName + variableVector.addElement( varQName ); +@@ -119,25 +119,25 @@ + variableVector.addElement( new QName(null, varName ) ); + globalVarSize++; + } +- enum = pageContext.getRequest().getParameterNames(); +- while ( enum.hasMoreElements() ) { +- String varName = (String)enum.nextElement(); ++ enum2 = pageContext.getRequest().getParameterNames(); ++ while ( enum2.hasMoreElements() ) { ++ String varName = (String)enum2.nextElement(); + QName varQName = new QName ( PARAM_NS_URL, PARAM_P,varName ); + //Adding both namespace qualified QName and just localName + variableVector.addElement( varQName ); + globalVarSize++; + } +- enum = pageContext.getServletContext().getInitParameterNames(); +- while ( enum.hasMoreElements() ) { +- String varName = (String)enum.nextElement(); ++ enum2 = pageContext.getServletContext().getInitParameterNames(); ++ while ( enum2.hasMoreElements() ) { ++ String varName = (String)enum2.nextElement(); + QName varQName = new QName ( INITPARAM_NS_URL, INITPARAM_P,varName ); + //Adding both namespace qualified QName and just localName + variableVector.addElement( varQName ); + globalVarSize++; + } +- enum = ((HttpServletRequest)pageContext.getRequest()).getHeaderNames(); +- while ( enum.hasMoreElements() ) { +- String varName = (String)enum.nextElement(); ++ enum2 = ((HttpServletRequest)pageContext.getRequest()).getHeaderNames(); ++ while ( enum2.hasMoreElements() ) { ++ String varName = (String)enum2.nextElement(); + QName varQName = new QName ( HEADER_NS_URL, HEADER_P,varName ); + //Adding namespace qualified QName + variableVector.addElement( varQName ); diff --git a/jakarta-taglibs-standard-1.1.1-src.tar.bz2 b/jakarta-taglibs-standard-1.1.1-src.tar.bz2 new file mode 100644 index 0000000..708e5eb --- /dev/null +++ b/jakarta-taglibs-standard-1.1.1-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c51b9543ee4e7a064b8cd617411c95e9755eaf53e66cff67884577461653974 +size 217797 diff --git a/jakarta-taglibs-standard-1.1.1-src.tar.gz b/jakarta-taglibs-standard-1.1.1-src.tar.gz deleted file mode 100644 index 4130054..0000000 --- a/jakarta-taglibs-standard-1.1.1-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a75a8ad1a9c7c53e29f8cefdb2435227556c81925fa9d9dcf15ece2f3a1fb37 -size 283401 diff --git a/jakarta-taglibs-standard-java6-compatibility.patch b/jakarta-taglibs-standard-java6-compatibility.patch new file mode 100644 index 0000000..9482bd0 --- /dev/null +++ b/jakarta-taglibs-standard-java6-compatibility.patch @@ -0,0 +1,16 @@ +--- standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java ++++ standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java +@@ -111,5 +111,13 @@ + throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); + } + ++ // Java6 Build - java.sql.Wrapper ++ public T unwrap(Class iface) throws SQLException { ++ throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); ++ } + ++ public boolean isWrapperFor(Class iface) throws SQLException { ++ throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); ++ } ++ + } diff --git a/jakarta-taglibs-standard.changes b/jakarta-taglibs-standard.changes index 18f30d4..c31298a 100644 --- a/jakarta-taglibs-standard.changes +++ b/jakarta-taglibs-standard.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Aug 5 11:56:52 CEST 2008 - mvyskocil@suse.cz + +- fixed build using openjdk6 (add java6 API and remove enums) +- use bzip2 in source tarball +- use macro name in patches +- use source=1.5 and target=1.5 + ------------------------------------------------------------------- Sun Sep 17 22:44:30 CEST 2006 - ro@suse.de diff --git a/jakarta-taglibs-standard.spec b/jakarta-taglibs-standard.spec index d2551e2..0124b3d 100644 --- a/jakarta-taglibs-standard.spec +++ b/jakarta-taglibs-standard.spec @@ -1,17 +1,25 @@ # # spec file for package jakarta-taglibs-standard (Version 1.1.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: jakarta-taglibs-standard -BuildRequires: ant java2-devel-packages servletapi5 xalan-j2 xml-commons-apis +BuildRequires: ant java-devel servletapi5 xalan-j2 xml-commons-apis %define base_name standard %define short_name taglibs-%{base_name} %define name jakarta-%{short_name} @@ -20,16 +28,18 @@ BuildRequires: ant java2-devel-packages servletapi5 xalan-j2 xml-commons-apis %define version 1.1.1 %define release 4jpp Version: 1.1.1 -Release: 23 +Release: 234 Summary: Open Source Implementation of the JSP Standard Tag Library -License: Apache +License: The Apache Software License Group: Development/Libraries/Java -URL: http://jakarta.apache.org/taglibs/ -Source: http://www.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-%{jversion}-src.tar.gz -Patch0: jakarta-taglibs-standard-%{version}-build.patch +Url: http://jakarta.apache.org/taglibs/ +Source: http://www.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-%{jversion}-src.tar.bz2 +Patch0: %{name}-%{version}-build.patch +Patch1: %{name}-java6-compatibility.patch +Patch2: %{name}-%{version}-remove-enums.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Requires: servletapi5 >= 0:5.0.16 +Requires: servletapi5 >= 5.0.16 %description This package contains releases for the 1.1.x versions of the Standard @@ -40,6 +50,7 @@ Java Community Process. %package javadoc +License: The Apache Software License PreReq: coreutils Summary: Javadoc for jakarta-taglibs-standard Group: Development/Libraries/Java @@ -52,6 +63,8 @@ This package contains the javadoc documentation for Jakarta Taglibs. %prep %setup -q -n %{name}-%{jversion}-src %patch0 +%patch1 -b .sav1 +%patch2 -b .sav2 cat > build.properties <