Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jffi for openSUSE:Factory checked in at 2022-03-21 20:12:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jffi (Old) and /work/SRC/openSUSE:Factory/.jffi.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jffi" Mon Mar 21 20:12:33 2022 rev:3 rq:963656 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/jffi/jffi.changes 2021-07-10 00:02:56.482843849 +0200 +++ /work/SRC/openSUSE:Factory/.jffi.new.25692/jffi.changes 2022-03-21 20:12:39.392478079 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 11:23:39 UTC 2022 - Fridrich Strba <[email protected]> + +- Fix build with maven-antrun-plugin >= 3.0.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jffi.spec ++++++ --- /var/tmp/diff_new_pack.6KPqhf/_old 2022-03-21 20:12:39.976478662 +0100 +++ /var/tmp/diff_new_pack.6KPqhf/_new 2022-03-21 20:12:39.980478667 +0100 @@ -1,7 +1,7 @@ # # spec file for package jffi # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,6 +40,7 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: pkgconfig(libffi) @@ -71,6 +72,28 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=561448#c9 sed -i.cpu -e '/m\$(MODEL)/d' {jni,libtest}/GNUmakefile +%if %{?pkg_vcmp:%pkg_vcmp maven-antrun-plugin >= 3}%{!?pkg_vcmp:0} +sed -i -e 's#tasks\>#target\>#g' pom.xml +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-antrun-plugin']/pom:executions/pom:execution/pom:configuration/pom:sourceRoot" +%pom_xpath_set "pom:plugin[pom:artifactId='maven-antrun-plugin']/pom:version" "3.0.0" +%pom_add_plugin "org.codehaus.mojo:build-helper-maven-plugin:3.2.0" pom.xml " + <executions> + <execution> + <id>add-source-directory</id> + <phase>generate-sources</phase> + <configuration> + <sources> + <source>\${project.build.directory}/java</source> + </sources> + </configuration> + <goals> + <goal>add-source</goal> + </goals> + </execution> + </executions> +" +%endif + # remove uneccessary directories rm -rf archive/* jni/libffi/ lib/junit*
