!41 sync patch from master
From: @DingliZhang Reviewed-by: @douyiwang Signed-off-by: @douyiwang
This commit is contained in:
commit
ccce2b760d
15
openjfx.spec
15
openjfx.spec
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Name: openjfx
|
Name: openjfx
|
||||||
Version: 11.0.18.0
|
Version: 11.0.18.0
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Rich client application platform for Java
|
Summary: Rich client application platform for Java
|
||||||
|
|
||||||
License: GPL v2 with exceptions and BSD
|
License: GPL v2 with exceptions and BSD
|
||||||
@ -40,9 +40,8 @@ Source26: pom-swing.xml
|
|||||||
Source27: pom-swt.xml
|
Source27: pom-swt.xml
|
||||||
Source28: pom-web.xml
|
Source28: pom-web.xml
|
||||||
Source29: build.xml
|
Source29: build.xml
|
||||||
Source30: settings.xml
|
|
||||||
|
|
||||||
ExclusiveArch: x86_64 aarch64 ppc64le loongarch64
|
ExclusiveArch: x86_64 aarch64 ppc64le loongarch64 riscv64
|
||||||
|
|
||||||
Requires: java-11-openjdk
|
Requires: java-11-openjdk
|
||||||
Requires: javapackages-tools
|
Requires: javapackages-tools
|
||||||
@ -96,7 +95,6 @@ find -name '*.class' -delete
|
|||||||
find -name '*.jar' -delete
|
find -name '*.jar' -delete
|
||||||
|
|
||||||
#copy maven files
|
#copy maven files
|
||||||
cp -a %{_sourcedir}/settings.xml .
|
|
||||||
cp -a %{_sourcedir}/pom-*.xml .
|
cp -a %{_sourcedir}/pom-*.xml .
|
||||||
mv pom-openjfx.xml pom.xml
|
mv pom-openjfx.xml pom.xml
|
||||||
|
|
||||||
@ -130,7 +128,7 @@ export JAVA_HOME=%{_jvmdir}/java-11-openjdk
|
|||||||
export CFLAGS="${RPM_OPT_FLAGS}"
|
export CFLAGS="${RPM_OPT_FLAGS}"
|
||||||
export CXXFLAGS="${RPM_OPT_FLAGS}"
|
export CXXFLAGS="${RPM_OPT_FLAGS}"
|
||||||
|
|
||||||
mvn install --settings ./settings.xml
|
mvn install
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
||||||
@ -155,13 +153,18 @@ cp -a modules/javafx.graphics/mvn-lib{decora,javafx_font,javafx_font_freetype,ja
|
|||||||
%doc README.md
|
%doc README.md
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 27 2024 Dingli Zhang <dingli@iscas.ac.cn> - 11.0.18.0-4
|
||||||
|
- Add support for riscv64
|
||||||
|
- Fix changelog date error
|
||||||
|
- Delete settings.xml from source
|
||||||
|
|
||||||
* Wed Nov 13 2024 liningjie <liningjie@xfusion.com> - 11.0.18.0-3
|
* Wed Nov 13 2024 liningjie <liningjie@xfusion.com> - 11.0.18.0-3
|
||||||
- Add ppc64le support for openjfx11
|
- Add ppc64le support for openjfx11
|
||||||
|
|
||||||
* Tue Oct 15 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 11.0.18.0-2
|
* Tue Oct 15 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 11.0.18.0-2
|
||||||
- add loongarch64 to ExclusiveArch
|
- add loongarch64 to ExclusiveArch
|
||||||
|
|
||||||
* Wed Dec 20 2022 Noah <hedongbo@huawei.com> - 11.0.18.0-1
|
* Tue Dec 20 2022 Noah <hedongbo@huawei.com> - 11.0.18.0-1
|
||||||
- update to openjfx-11.0.18+0
|
- update to openjfx-11.0.18+0
|
||||||
|
|
||||||
* Wed Jul 21 2021 Noah <hedongbo@huawei.com> - 11.0.3-6
|
* Wed Jul 21 2021 Noah <hedongbo@huawei.com> - 11.0.3-6
|
||||||
|
|||||||
13
settings.xml
13
settings.xml
@ -1,13 +0,0 @@
|
|||||||
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
|
|
||||||
http://maven.apache.org/xsd/settings-1.0.0.xsd">
|
|
||||||
<mirrors>
|
|
||||||
<mirror>
|
|
||||||
<id>huaweicloud</id>
|
|
||||||
<mirrorOf>central</mirrorOf>
|
|
||||||
<name>central repo</name>
|
|
||||||
<url>https://mirrors.huaweicloud.com/repository/maven/</url>
|
|
||||||
</mirror>
|
|
||||||
</mirrors>
|
|
||||||
</settings>
|
|
||||||
Loading…
x
Reference in New Issue
Block a user