Hello community, here is the log from the commit of package jakarta-taglibs-standard for openSUSE:Factory checked in at 2012-06-16 06:55:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jakarta-taglibs-standard (Old) and /work/SRC/openSUSE:Factory/.jakarta-taglibs-standard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-taglibs-standard", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/jakarta-taglibs-standard/jakarta-taglibs-standard.changes 2011-09-23 02:03:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jakarta-taglibs-standard.new/jakarta-taglibs-standard.changes 2012-06-16 06:55:37.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 13 07:13:56 UTC 2012 - [email protected] + +- fix build with java7 +- use non-versioned javadocdir + +------------------------------------------------------------------- New: ---- jakarta-taglibs-standard-java7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-taglibs-standard.spec ++++++ --- /var/tmp/diff_new_pack.GGTYDT/_old 2012-06-16 06:55:41.000000000 +0200 +++ /var/tmp/diff_new_pack.GGTYDT/_new 2012-06-16 06:55:41.000000000 +0200 @@ -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 @@ %package javadoc -License: Apache-2.0 PreReq: coreutils Summary: Javadoc for jakarta-taglibs-standard Group: Development/Libraries/Java @@ -61,10 +59,12 @@ %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 <<EOBP build.dir=build dist.dir=dist @@ -88,17 +88,12 @@ (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done) (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - %files %defattr(0644,root,root,0755) %doc standard/README_src.txt standard/README_bin.txt standard/dist/doc/doc/standard-doc/*.html @@ -106,7 +101,6 @@ %files javadoc %defattr(0644,root,root,0755) -%doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name} %changelog ++++++ jakarta-taglibs-standard-java7.patch ++++++ 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")); + } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
