[jakarta-taglibs-standard] Added patch to build with JDBC 4.1/Java 7

Deepak Bhole dbhole at fedoraproject.org
Tue Jan 24 20:26:33 UTC 2012


commit 91f040d01e422536fd6d9820b3d6f85d60d8f6cb
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Tue Jan 24 15:26:15 2012 -0500

    Added patch to build with JDBC 4.1/Java 7

 jakarta-taglibs-standard-jdbc-4.1.patch |   20 ++++++++++++++++++++
 jakarta-taglibs-standard.spec           |    7 ++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/jakarta-taglibs-standard-jdbc-4.1.patch b/jakarta-taglibs-standard-jdbc-4.1.patch
new file mode 100644
index 0000000..b57fd03
--- /dev/null
+++ b/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;
+ 
+ /**
+  * <p>A simple <code>DataSource</code> 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/jakarta-taglibs-standard.spec b/jakarta-taglibs-standard.spec
index 62a0c3a..94e3faf 100644
--- a/jakarta-taglibs-standard.spec
+++ b/jakarta-taglibs-standard.spec
@@ -33,7 +33,7 @@
 
 Name:           jakarta-taglibs-standard
 Version:        1.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        An open-source implementation of the JSP Standard Tag Library
 License:        ASL 2.0
@@ -42,6 +42,7 @@ 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
 Patch1:         fix-1.6.0-build.patch
+Patch2:         %{name}-jdbc-4.1.patch
 
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.5.30
@@ -72,6 +73,7 @@ Javadoc for %{name}.
 %setup -q -n %{name}-%{version}-src
 %patch0 -b .orig
 %patch1
+%patch2
 cat > build.properties <<EOBP
 build.dir=build
 dist.dir=dist
@@ -108,6 +110,9 @@ cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* 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
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list