!23 refix pkg_vcmp macro not being recognized

From: @cherry530 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-07-11 07:13:20 +00:00 committed by Gitee
commit 91f49b9393
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -2,7 +2,7 @@
%global sover 1.2 %global sover 1.2
Name: jffi Name: jffi
Version: 1.2.13 Version: 1.2.13
Release: 2 Release: 3
Summary: Java Foreign Function Interface Summary: Java Foreign Function Interface
License: LGPL-3.0-or-later OR Apache-2.0 License: LGPL-3.0-or-later OR Apache-2.0
URL: http://github.com/jnr/jffi URL: http://github.com/jnr/jffi
@ -18,7 +18,6 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
BuildRequires: apache-parent
%description %description
An optimized Java interface to libffi. An optimized Java interface to libffi.
@ -39,9 +38,7 @@ This package contains the API documentation for %{name}.
%patch0 %patch0
%patch1 %patch1
%patch2 %patch2
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 1.8}%{!?pkg_vcmp:0}
%patch3 -p1 %patch3 -p1
%endif
%patch4 %patch4
sed -i.cpu -e '/m\$(MODEL)/d' jni/GNUmakefile libtest/GNUmakefile sed -i.cpu -e '/m\$(MODEL)/d' jni/GNUmakefile libtest/GNUmakefile
rm -rf archive/* jni/libffi/ jni/win32/ lib/CopyLibs/ lib/junit* rm -rf archive/* jni/libffi/ jni/win32/ lib/CopyLibs/ lib/junit*
@ -85,6 +82,9 @@ ant -Duse.system.libffi=1 test
%doc COPYING.GPL COPYING.LESSER LICENSE %doc COPYING.GPL COPYING.LESSER LICENSE
%changelog %changelog
* Tue Jul 11 2023 xu_ping <707078654@qq.com> - 1.2.13-3
- refix pkg_vcmp macro not being recognized
* Mon Dec 06 2021 xu_ping <xuping33@huawei.com> - 1.2.13-2 * Mon Dec 06 2021 xu_ping <xuping33@huawei.com> - 1.2.13-2
- Add Buildrequires apache-parent package to fix %pkg_vcmp not being recognized - Add Buildrequires apache-parent package to fix %pkg_vcmp not being recognized