Skip to content

Commit 5266508

Browse files
authored
Build fix for jakarta-taglibs-standard (#15142)
1 parent 763fa41 commit 5266508

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

SPECS-EXTENDED/jakarta-taglibs-standard/jakarta-taglibs-standard.spec

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Distribution: Azure Linux
2121
%define short_name taglibs-standard
2222
Name: jakarta-taglibs-standard
2323
Version: 1.1.1
24-
Release: 261%{?dist}
24+
Release: 262%{?dist}
2525
Summary: Open Source Implementation of the JSP Standard Tag Library
2626
License: ASL 2.0
2727
Group: Development/Libraries/Java
@@ -74,7 +74,7 @@ EOBP
7474

7575
%build
7676
ant \
77-
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
77+
-Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \
7878
-Dfinal.name=%{short_name} \
7979
-Dj2se.javadoc=%{_javadocdir}/java \
8080
-f standard/build.xml \
@@ -90,18 +90,26 @@ cp -p standard/dist/standard/lib/standard.jar %{buildroot}%{_javadir}/jakarta-ta
9090
# javadoc
9191
mkdir -p %{buildroot}%{_javadocdir}/%{name}
9292
cp -pr standard/dist/standard/javadoc/* %{buildroot}%{_javadocdir}/%{name}
93+
mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO .
94+
mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE .
9395
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
9496

9597
%files
9698
%license LICENSE
99+
%license ADDITIONAL_LICENSE_INFO
97100
%doc standard/README_src.txt standard/README_bin.txt standard/dist/doc/doc/standard-doc/*.html
101+
%exclude %{_javadocdir}/%{name}/legal/LICENSE
98102
%{_javadir}/*
99103

100104
%files javadoc
101105
%license LICENSE
102106
%doc %{_javadocdir}/%{name}
103107

104108
%changelog
109+
* Thu Nov 20 2025 Akarsh Chaudhary <v-akarshc@microsoft.com> - 1.1.1-262
110+
- Setting compiler.source to value 1.8 to fix the Build.
111+
- License verified
112+
105113
* Thu Feb 22 2024 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1.1-261
106114
- Updating naming for 3.0 version of Azure Linux.
107115

0 commit comments

Comments
 (0)