[jakarta-taglibs-standard] Update to 1.1.2 upstream release - 7 years later!.

[Alexander Kurtakov]

commit 4c18e6ad903df43b7fae931280a60062917da9f5
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jul 19 14:27:39 2011 +0300

    Update to 1.1.2 upstream release - 7 years later!.

 .gitignore                    |    1 +
 fix-1.6.0-build.patch         |   14 ++++++++++++++
 jakarta-taglibs-standard.spec |   13 +++++++++----
 sources                       |    2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0850601..bfff243 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ jakarta-taglibs-standard-1.1.1-src.tar.gz
 jakarta-taglibs-standard-1.1.1-src
 noarch
 *.src.rpm
+jakarta-taglibs-standard-1.1.2-src.tar.gz
diff --git a/fix-1.6.0-build.patch b/fix-1.6.0-build.patch
new file mode 100644
index 0000000..7befacc
--- /dev/null
+++ b/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/jakarta-taglibs-standard.spec b/jakarta-taglibs-standard.spec
index ee93963..58796eb 100644
--- a/jakarta-taglibs-standard.spec
+++ b/jakarta-taglibs-standard.spec
@@ -32,15 +32,16 @@
 %global short_name      taglibs-%{base_name}
 
 Name:           jakarta-taglibs-standard
-Version:        1.1.1
-Release:        12.3%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Epoch:          0
 Summary:        An open-source implementation of the JSP Standard Tag Library
 License:        ASL 2.0
 Group:          Development/Libraries/Java
 URL:            http://jakarta.apache.org/taglibs/
-Source:         http://archive.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-1.1.1-src.tar.gz
-Patch0:         jakarta-taglibs-standard-%{version}-build.patch
+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
 
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.5.30
@@ -70,6 +71,7 @@ Javadoc for %{name}.
 %prep
 %setup -q -n %{name}-%{version}-src
 %patch0 -b .orig
+%patch1
 cat > build.properties <<EOBP
 build.dir=build
 dist.dir=dist
@@ -106,6 +108,9 @@ cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Jul 19 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.2-1
+- Update to 1.1.2 upstream release - 7 years later!.
+
 * Tue Jul 19 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.1-12.3
 - Adapt to current guidelines.
 
diff --git a/sources b/sources
index 1589ca2..1c55669 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3960eb703e5f02b09cb1d7b14c4b9029  jakarta-taglibs-standard-1.1.1-src.tar.gz
+42a65b8bd2dede333e4fdfa029f557c2  jakarta-taglibs-standard-1.1.2-src.tar.gz