pool/jakarta-taglibs-standard
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 527059 from Java:packages

Browse Source 
Fix build with jdk9

OBS-URL: https://build.opensuse.org/request/show/527059
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jakarta-taglibs-standard?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2017-09-20 15:09:28 +00:00 committed by Git OBS Bridge
commit e237b04485
3 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jakarta-taglibs-standard-1.1.1-build.patch
View File

@ -1,6 +1,6 @@
--- standard/build.xml
+++ standard/build.xml
@@ -164,18 +164,17 @@
@@ -164,14 +164,11 @@
<!-- Build the tag library itself -->
<target name="library-build" depends="prepare-build">
@ -17,21 +17,3 @@
excludes="org/apache/taglibs/standard/lang/jstl/parser/jsp20/* org/apache/taglibs/standard/lang/jpath/** org/apache/taglibs/standard/lang/spel/**"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"/>
+ optimize="${compile.optimize}"
+ source="1.5"
+ target="1.5"/>
<!-- copy the TLDs in META-INF -->
<copy todir="${build.library}/META-INF">
@@ -277,7 +276,9 @@
classpath="${servlet24.jar}:${jsp20.jar}:${build.library}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"/>
+ optimize="${compile.optimize}"
+ source="1.5"
+ target="1.5"/>
<!-- Copy web.xml + examples TLD -->
<copy todir="${build.examples}/WEB-INF">

10
jakarta-taglibs-standard.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Sep 18 15:40:25 UTC 2017 - fstrba@suse.com
- Modified patch:
* jakarta-taglibs-standard-1.1.1-build.patch
+ Don't hardcode java source and target levels
- Specify source and target level 1.6 in order to allow building
with jdk9
- Clean spec file and fix some rpmlint errors
-------------------------------------------------------------------
Tue Oct 6 09:00:42 UTC 2015 - tchvatal@suse.com

8
jakarta-taglibs-standard.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package jakarta-taglibs-standard
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -31,12 +31,12 @@ Patch2: %{name}-%{version}-remove-enums.patch
Patch3: jakarta-taglibs-standard-java7.patch
Patch4: CVE-2015-0254.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: java-devel
BuildRequires: servletapi5
BuildRequires: xalan-j2
Requires: servletapi5 >= 5.0.16
Requires: xalan-j2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@ -70,6 +70,7 @@ EOBP
%build
ant \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Dfinal.name=%{short_name} \
-Dj2se.javadoc=%{_javadocdir}/java \
-f standard/build.xml \
@ -85,14 +86,13 @@ cp -p standard/dist/standard/lib/standard.jar %{buildroot}%{_javadir}/jakarta-ta
# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr standard/dist/standard/javadoc/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(0644,root,root,0755)
%doc standard/README_src.txt standard/README_bin.txt standard/dist/doc/doc/standard-doc/*.html
%{_javadir}/*
%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}
%changelog