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
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
beec7fed4c
commit
cc15d17179
26
jakarta-taglibs-standard-java7.patch
Normal file
26
jakarta-taglibs-standard-java7.patch
Normal file
@ -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"));
|
||||
+ }
|
||||
|
||||
}
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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 <<EOBP
|
||||
build.dir=build
|
||||
dist.dir=dist
|
||||
@ -88,17 +88,12 @@ cp -p standard/dist/standard/lib/standard.jar $RPM_BUILD_ROOT%{_javadir}/jakarta
|
||||
(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,24 +101,6 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
|
||||
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc %{_javadocdir}/%{name}-%{version}
|
||||
%ghost %doc %{_javadocdir}/%{name}
|
||||
%doc %{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Tue Aug 05 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
|
||||
* Mon Sep 18 2006 ro@suse.de
|
||||
- fix build with java-1.5
|
||||
* Wed Jan 25 2006 mls@suse.de
|
||||
- converted neededforbuild to BuildRequires
|
||||
* Thu Jul 28 2005 jsmeix@suse.de
|
||||
- Adjustments in the spec file.
|
||||
* Mon Jul 18 2005 jsmeix@suse.de
|
||||
- Current version 1.1.1 from JPackage.org
|
||||
* Thu Sep 16 2004 skh@suse.de
|
||||
- Fix prerequires of javadoc subpackage
|
||||
* Mon Sep 06 2004 skh@suse.de
|
||||
- Initial package created with version 1.1.1 (JPackage 1.5)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user