From cc15d171797b751c9e5a9e648c4490b14dd9c14f1d7330cbb1ea960e75952b8b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 16 Jun 2012 04:55:34 +0000 Subject: [PATCH] Accepting request 125081 from Java:packages - fix build with java7 - use non-versioned javadocdir OBS-URL: https://build.opensuse.org/request/show/125081 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jakarta-taglibs-standard?expand=0&rev=10 --- jakarta-taglibs-standard-java7.patch | 26 ++++++++++++ jakarta-taglibs-standard.changes | 6 +++ jakarta-taglibs-standard.spec | 59 +++++++++------------------- 3 files changed, 50 insertions(+), 41 deletions(-) create mode 100644 jakarta-taglibs-standard-java7.patch diff --git a/jakarta-taglibs-standard-java7.patch b/jakarta-taglibs-standard-java7.patch new file mode 100644 index 0000000..644593e --- /dev/null +++ b/jakarta-taglibs-standard-java7.patch @@ -0,0 +1,26 @@ +Index: jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java +=================================================================== +--- jakarta-taglibs-standard-1.1.1-src.orig/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-06-13 09:25:20.976324079 +0200 ++++ jakarta-taglibs-standard-1.1.1-src/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2012-06-15 09:24:56.340327868 +0200 +@@ -20,6 +20,10 @@ + import java.sql.Connection; + import java.sql.DriverManager; + import java.sql.SQLException; ++import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; ++ ++import java.util.logging.Logger; + + import javax.sql.DataSource; + +@@ -119,5 +123,10 @@ + public boolean isWrapperFor(Class iface) throws SQLException { + throw new SQLException(Resources.getMessage("NOT_SUPPORTED")); + } ++ ++ // Java7 Build ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(Resources.getMessage("NOT_SUPPORTED")); ++ } + + } diff --git a/jakarta-taglibs-standard.changes b/jakarta-taglibs-standard.changes index c31298a..c299e92 100644 --- a/jakarta-taglibs-standard.changes +++ b/jakarta-taglibs-standard.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 13 07:13:56 UTC 2012 - mvyskocil@suse.cz + +- fix build with java7 +- use non-versioned javadocdir + ------------------------------------------------------------------- Tue Aug 5 11:56:52 CEST 2008 - mvyskocil@suse.cz diff --git a/jakarta-taglibs-standard.spec b/jakarta-taglibs-standard.spec index c4bcf16..ccaf5aa 100644 --- a/jakarta-taglibs-standard.spec +++ b/jakarta-taglibs-standard.spec @@ -1,7 +1,7 @@ # -# spec file for package jakarta-taglibs-standard (Version 1.1.1) +# spec file for package jakarta-taglibs-standard # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,31 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +%define short_name taglibs-standard Name: jakarta-taglibs-standard -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} -%define section free -%define jversion 1.1.1 -%define version 1.1.1 -%define release 4jpp Version: 1.1.1 -Release: 234 +Release: 0 Summary: Open Source Implementation of the JSP Standard Tag Library License: Apache-2.0 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.bz2 +Source0: jakarta-taglibs-standard-%{version}-src.tar.bz2 Patch0: %{name}-%{version}-build.patch Patch1: %{name}-java6-compatibility.patch Patch2: %{name}-%{version}-remove-enums.patch +Patch3: jakarta-taglibs-standard-java7.patch + +BuildRequires: ant +BuildRequires: java-devel +BuildRequires: servletapi5 +BuildRequires: xalan-j2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires: servletapi5 >= 5.0.16 +Requires: xalan-j2 %description This package contains releases for the 1.1.x versions of the Standard @@ -50,7 +49,6 @@ Java Community Process. %package javadoc -License: Apache-2.0 PreReq: coreutils Summary: Javadoc for jakarta-taglibs-standard Group: Development/Libraries/Java @@ -61,10 +59,12 @@ This package contains the javadoc documentation for Jakarta Taglibs. %prep -%setup -q -n %{name}-%{jversion}-src +%setup -q -n %{name}-%{version}-src %patch0 %patch1 -b .sav1 %patch2 -b .sav2 +%patch3 -p1 + cat > build.properties <