Skip to content

Commit e5bebc9

Browse files
archana25-msarchana25-ms
authored
Removal of xpp2 version 2.1.10 from SPECS_EXTENDED (#15031)
1 parent 0c4bd4a commit e5bebc9

File tree

12 files changed

+27
-466
lines changed

12 files changed

+27
-466
lines changed

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES-AND-NOTICES/SPECS/data/licenses.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2666,7 +2666,6 @@
26662666
"xmldb-api",
26672667
"xmlrpc-c",
26682668
"xmlunit",
2669-
"xpp2",
26702669
"xz-java"
26712670
]
26722671
},

‎SPECS-EXTENDED/jlex/jlex.spec‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ install -pD -T dist/lib/%{name}.jar \
8282
# javadoc
8383
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
8484
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
85+
mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO .
86+
mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE .
8587

8688
%pre javadoc
8789
# workaround for rpm bug, can be removed in F-17
@@ -96,6 +98,8 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
9698
%files javadoc
9799
%defattr(-,root,root,-)
98100
%{_javadocdir}/%{name}
101+
%license ADDITIONAL_LICENSE_INFO
102+
%license LICENSE
99103

100104
%changelog
101105
* Mon Feb 24 2025 Sumit Jena <v-sumitjena@microsoft.com> - 1.2.6-286

‎SPECS-EXTENDED/regexp/regexp.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
7373

7474
%files
7575
%defattr(0644,root,root,0755)
76-
%doc LICENSE
76+
%license LICENSE
7777
%{_javadir}/*.jar
7878
%{_mavenpomdir}/*
7979
%{_datadir}/maven-metadata/%{name}.xml*

‎SPECS-EXTENDED/servletapi4/servletapi4.spec‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ install -m 644 dist/lib/servlet.jar %{buildroot}%{_javadir}/%{name}-%{version}.j
7070
# javadoc
7171
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
7272
cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name}
73+
mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO .
74+
mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE .
7375
# alternatives
7476
mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
7577
ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar
@@ -93,6 +95,8 @@ fi
9395
%files javadoc
9496
%defattr(-,root,root)
9597
%{_javadocdir}/%{name}
98+
%license ADDITIONAL_LICENSE_INFO
99+
%license LICENSE
96100

97101
%changelog
98102
* Thu Feb 22 2024 Pawel Winogrodzki <pawelwi@microsoft.com> - 4.0.4-302

‎SPECS-EXTENDED/xalan-j2/xalan-j2.spec‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
228228

229229
%files
230230
%defattr(0644,root,root,0755)
231-
%doc KEYS LICENSE.txt NOTICE.txt
231+
%doc KEYS
232+
%license LICENSE.txt NOTICE.txt
232233
%{_javadir}/%{name}-%{version}.jar
233234
%{_javadir}/%{name}.jar
234235
%{_javadir}/%{name}-serializer-%{version}.jar
@@ -245,7 +246,8 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
245246

246247
%files bootstrap
247248
%defattr(0644,root,root,0755)
248-
%doc KEYS LICENSE.txt NOTICE.txt
249+
%doc KEYS
250+
%license LICENSE.txt NOTICE.txt
249251
%{_javadir}/%{name}-%{version}.jar
250252
%{_javadir}/%{name}.jar
251253
%{_javadir}/%{name}-serializer-%{version}.jar

‎SPECS-EXTENDED/xerces-j2/xerces-j2.spec‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ install -pD -m755 -T %{SOURCE2} %{buildroot}%{_bindir}/%{name}-constants
143143
install -d -m 755 %{buildroot}%{_mandir}/man1
144144
install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1
145145
install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
146+
mv %{buildroot}%{_javadocdir}/%{name}/other/legal/ADDITIONAL_LICENSE_INFO .
147+
mv %{buildroot}%{_javadocdir}/%{name}/other/legal/LICENSE .
146148

147149
# demo
148150
install -pD -T build/xercesSamples.jar %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar
@@ -154,8 +156,8 @@ update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar >/dev/null
154156
ln -sf %{name}.jar %{_javadir}/jaxp_parser_impl.jar
155157

156158
%files
157-
%license LICENSE LICENSE.DOM-documentation.html LICENSE.DOM-software.html LICENSE.resolver.txt LICENSE-SAX.html LICENSE.DOM-documentation.html LICENSE.serializer.txt
158-
%doc NOTICE README
159+
%license NOTICE LICENSE LICENSE.DOM-software.html LICENSE.resolver.txt LICENSE-SAX.html LICENSE.DOM-documentation.html LICENSE.serializer.txt
160+
%doc README
159161
%{_bindir}/*
160162
%{_javadir}/*
161163
%{_mandir}/*/*
@@ -167,7 +169,15 @@ ln -sf %{name}.jar %{_javadir}/jaxp_parser_impl.jar
167169
%endif
168170

169171
%files javadoc
170-
%{_javadocdir}/%{name}
172+
%license LICENSE
173+
%license ADDITIONAL_LICENSE_INFO
174+
%exclude /usr/share/javadoc/xerces-j2/xni/legal/ADDITIONAL_LICENSE_INFO
175+
%exclude /usr/share/javadoc/xerces-j2/xni/legal/LICENSE
176+
%exclude /usr/share/javadoc/xerces-j2/xs/legal/ADDITIONAL_LICENSE_INFO
177+
%exclude /usr/share/javadoc/xerces-j2/xs/legal/LICENSE
178+
179+
# Other javadoc files
180+
%{_javadocdir}/%{name}/*
171181

172182
%files demo
173183
%{_datadir}/%{name}

0 commit comments

Comments
 (0)