openjfx8.spec

@@ -8,16 +8,10 @@
 %else
 %global arch aarch64
 %endif
-%ifarch ppc64le
-%global arch ppc64le
-%endif
-%ifarch loongarch64
-%global arch loongarch64
-%endif
 
 Name:           openjfx8
-Version:        8u370
+Version:        8u352
-Release:        4
+Release:        1
 Summary:        Rich client application platform for Java
 
 #fxpackager is BSD
@@ -59,10 +53,11 @@ Source31:       build.xml
 Source32:       buildSrc.xml
 Source33:       fxpackager-native.xml
 Source34:       fxpackager-so.xml
+Source35:       settings.xml
 
 Patch0:         0000-Fix-wait-call-in-PosixPlatform.patch
 
-ExclusiveArch:  x86_64 aarch64 ppc64le loongarch64
+ExclusiveArch:  x86_64 aarch64
 
 Requires:       java-1.8.0-openjdk
 
@@ -131,6 +126,7 @@ find -name '*.class' -delete
 find -name '*.jar' -delete
 
 #copy maven files
+cp -a %{_sourcedir}/settings.xml .
 cp -a %{_sourcedir}/pom-*.xml .
 mv pom-openjfx.xml pom.xml
 
@@ -167,7 +163,7 @@ ant -f build.xml
 #set openjdk8 for build
 export JAVA_HOME=%{_jvmdir}/java-1.8.0-openjdk
 # %%mvn_build
-mvn install
+mvn install --settings ./settings.xml
 
 %install
 install -d -m 755 %{buildroot}%{openjfxdir}
@@ -232,21 +228,6 @@ ln -s %{openjfxdir}/bin/javapackager %{buildroot}%{_bindir}
 %license LICENSE
 
 %changelog
-* Tue Nov 5 2024 xieguangyao00 <xieguangyao@inspur.com> - 8u370-4
-- del settings.xml from source
-
-* Tue Jun 04 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 8u370-3
-- add loongarch64 support for openjfx8
-
-* Fri Mar 8 2024 Ren Zhijie <zhijie.ren@shingroup.cn> - 8u370.2
-- Add support for ppc64le
-
-* Tue Jun 20 2023 DXwangg <wangjiawei80@huawei.com> - 8u370.1
-- update 8u353.tar.gz to 8u370.tar.gz
-
-* Wed Dec 12 2022 douyiwang <douyiwang@huawei.com> - 8u353.1
-- update 8u352.tar.bz to 8u353.tar.gz
-
 * Wed Dec 7 2022 douyiwang <douyiwang@huawei.com> - 8u352.1
 - update 8u340.tar.bz to 8u352.tar.gz
 

pom-fxpackager.xml

@@ -78,7 +78,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<target>
+					<tasks>
 						<move todir="target/classes/resources/classes/com/javafx/main">
 							<fileset dir="target/classes/com/javafx/main"/>
 						</move>
@@ -87,7 +87,7 @@
 							<fileset dir="native/target"/>
 							<globmapper from="JavaAppLauncher.uexe" to="JavaAppLauncher"/>
 						</copy>
-					</target>
+					</tasks>
 				</configuration>
 			</plugin>
 		</plugins>

pom-web.xml

@@ -71,11 +71,11 @@
 					</execution>
 				</executions>
 				<configuration>
-					<target>
+					<tasks>
 						<copy todir="src/main/java">
 							<fileset dir="src/main/native/Source/WebCore/bindings/java/dom3/java"/>
 						</copy>
-					</target>
+					</tasks>
 				</configuration>
 			</plugin>
 		</plugins>

settings.xml

@@ -0,0 +1,13 @@
+<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://repo.huaweicloud.com/repository/maven/</url>
+        </mirror>
+    </mirrors>
+ </settings>