Star0
2
Code
Code
Issues5
Pull Requests5
Discussion
Wiki
Analysis
Star0
2
Open
[sync] PR-35: use %mvn_artifact instead of %add_maven_depmap and fix hamcrest jar not found #37
openeuler-ci-botAdd on Aug 11
[sync] PR-35: use %mvn_artifact instead of %add_maven_depmap and fix hamcrest jar not found #37
Open
openeuler-ci-botAdd on Aug 11
Merged fromsync-pr35-master-to-openEuler-26.09intoopenEuler-26.09
Total: 2 files changed+27-4
Afix-hamcrest-jar-search-paths.patch+11-0
@@ -0,0 +1,11 @@
1+--- a/configure.ac
2++++ b/configure.ac
3+@@ -206,7 +206,7 @@
4+ IT_FIND_OPTIONAL_JAR([junit], JUNIT,
5+ [/usr/share/java/junit4.jar /usr/share/junit-4/lib/junit.jar])
6+ IT_FIND_OPTIONAL_JAR([hamcrest], HAMCREST,
7+- [/usr/share/java/hamcrest/all.jar /usr/share/java/hamcrest-core.jar])
8++ [/usr/share/java/hamcrest/all.jar /usr/share/java/hamcrest-core.jar /usr/share/java/hamcrest/hamcrest.jar])
9+ IT_FIND_OPTIONAL_JAR([jacoco], JACOCO,
10+ [/usr/share/java/jacoco/org.jacoco.core.jar])
11+ IT_FIND_OPTIONAL_JAR([asm], ASM,
Micedtea-web.spec+16-4
@@ -10,7 +10,7 @@
10%global debug_package %{nil}10%global debug_package %{nil}
11Name: icedtea-web11Name: icedtea-web
12Version: 1.8.412Version: 1.8.4
13-Release: 913+Release: 10
14Summary: Additional Java components for OpenJDK - Java Web Start implementation14Summary: Additional Java components for OpenJDK - Java Web Start implementation
15License: LGPLv2+ and GPLv2 with exceptions15License: LGPLv2+ and GPLv2 with exceptions
16URL: http://icedtea.classpath.org/wiki/IcedTea-Web16URL: http://icedtea.classpath.org/wiki/IcedTea-Web
@@ -19,6 +19,7 @@ Source0: http://github.com/AdoptOpenJDK/IcedTea-Web/archive/%{name}-
19Patch0006: fix-for-cargo-test-sometimes-fails-when-make-runs-with-several-simultaneous-jobs.patch19Patch0006: fix-for-cargo-test-sometimes-fails-when-make-runs-with-several-simultaneous-jobs.patch
20Patch0007: add-dunce-lib.patch20Patch0007: add-dunce-lib.patch
21Patch0008: del-some-testcases-who-need-network-but-cannot-connect-smoothly.patch21Patch0008: del-some-testcases-who-need-network-but-cannot-connect-smoothly.patch
22+Patch0009: fix-hamcrest-jar-search-paths.patch
22 23 
23BuildRequires: javapackages-tools javapackages-local %{preffered_java}-devel24BuildRequires: javapackages-tools javapackages-local %{preffered_java}-devel
24BuildRequires: desktop-file-utils glib2-devel autoconf automake cargo junit hamcrest25BuildRequires: desktop-file-utils glib2-devel autoconf automake cargo junit hamcrest
@@ -106,8 +107,11 @@ install -d %{buildroot}/%{_mavenpomdir}
106cp metadata/icedtea-web.pom %{buildroot}/%{_mavenpomdir}/icedtea-web.pom107cp metadata/icedtea-web.pom %{buildroot}/%{_mavenpomdir}/icedtea-web.pom
107cp metadata/icedtea-web-plugin.pom %{buildroot}/%{_mavenpomdir}/icedtea-web-plugin.pom108cp metadata/icedtea-web-plugin.pom %{buildroot}/%{_mavenpomdir}/icedtea-web-plugin.pom
108 109 
109-%add_maven_depmap icedtea-web.pom icedtea-web.jar110+# Register Maven artifacts. The legacy %add_maven_depmap macro was removed
110-%add_maven_depmap icedtea-web-plugin.pom icedtea-web-plugin.jar111+# in javapackages-local v5+ (XMvn); on openEuler 26.09+ it is no longer
112+# defined and the literal text reached the shell
113+%mvn_artifact %{buildroot}%{_mavenpomdir}/icedtea-web.pom %{buildroot}%{_javadir}/icedtea-web.jar
114+%mvn_artifact %{buildroot}%{_mavenpomdir}/icedtea-web-plugin.pom %{buildroot}%{_javadir}/icedtea-web-plugin.jar
111 115 
112cp netx.build/lib/src.zip %{buildroot}%{_datadir}/icedtea-web/javaws.src.zip116cp netx.build/lib/src.zip %{buildroot}%{_datadir}/icedtea-web/javaws.src.zip
113cp liveconnect/lib/src.zip %{buildroot}%{_datadir}/icedtea-web/plugin.src.zip117cp liveconnect/lib/src.zip %{buildroot}%{_datadir}/icedtea-web/plugin.src.zip
@@ -148,7 +152,7 @@ then
148fi152fi
149exit 0153exit 0
150 154 
151-%files -f .mfiles -f icedtea-web.lang155+%files -f icedtea-web.lang
152%license COPYING156%license COPYING
153%{_sysconfdir}/bash_completion.d/*157%{_sysconfdir}/bash_completion.d/*
154%config(noreplace) %{_sysconfdir}/java/icedtea-web/itw-modularjdk.args158%config(noreplace) %{_sysconfdir}/java/icedtea-web/itw-modularjdk.args
@@ -158,6 +162,10 @@ exit 0
158%{_datadir}/icedtea-web/*.png162%{_datadir}/icedtea-web/*.png
159%{_datadir}/pixmaps/*163%{_datadir}/pixmaps/*
160%{_datadir}/appdata/*.xml164%{_datadir}/appdata/*.xml
165+%{_javadir}/icedtea-web.jar
166+%{_javadir}/icedtea-web-plugin.jar
167+%{_mavenpomdir}/icedtea-web.pom
168+%{_mavenpomdir}/icedtea-web-plugin.pom
161 169 
162%files devel170%files devel
163%license COPYING171%license COPYING
@@ -169,6 +177,10 @@ exit 0
169%{_datadir}/man/man1/*177%{_datadir}/man/man1/*
170 178 
171%changelog179%changelog
180+* Wed Aug 05 2026 douyiwang <douyiwang@huawei.com> - 1.8.4-10
181+- use %mvn_artifact instead of %add_maven_depmap.
182+- fix hamcrest jar not found by configure (Patch0009).
183+ 
172* Tue Aug 20 2024 Whitney33 <shangqianli1@huawei.com> - 1.8.4-9184* Tue Aug 20 2024 Whitney33 <shangqianli1@huawei.com> - 1.8.4-9
173- fixes failed: with rust-1.78.0, ignore invalid_doc_attributes, to enable build success.185- fixes failed: with rust-1.78.0, ignore invalid_doc_attributes, to enable build success.
174 186