Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jffi for openSUSE:Factory checked in at 2025-03-28 09:36:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jffi (Old) and /work/SRC/openSUSE:Factory/.jffi.new.2696 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jffi" Fri Mar 28 09:36:45 2025 rev:10 rq:1264727 version:1.3.13 Changes: -------- --- /work/SRC/openSUSE:Factory/jffi/jffi.changes 2024-09-24 17:33:00.548408269 +0200 +++ /work/SRC/openSUSE:Factory/.jffi.new.2696/jffi.changes 2025-03-28 09:37:07.428363740 +0100 @@ -1,0 +2,5 @@ +Thu Mar 27 21:09:25 UTC 2025 - Fridrich Strba <fst...@suse.com> + +- Fix pom.xml errors that will be fatal with Maven 4 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jffi.spec ++++++ --- /var/tmp/diff_new_pack.mJvUPB/_old 2025-03-28 09:37:07.924384284 +0100 +++ /var/tmp/diff_new_pack.mJvUPB/_new 2025-03-28 09:37:07.924384284 +0100 @@ -1,7 +1,7 @@ # # spec file for package jffi # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,8 @@ BuildRequires: ant BuildRequires: fdupes BuildRequires: gcc +BuildRequires: hamcrest +BuildRequires: junit BuildRequires: make BuildRequires: maven-local BuildRequires: pkgconfig @@ -76,27 +78,6 @@ # 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_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* @@ -104,6 +85,9 @@ build-jar-repository -s -p lib/ junit hamcrest/core +%pom_xpath_inject "pom:plugin[pom:artifactId = 'maven-jar-plugin']/pom:executions/pom:execution/pom:configuration/pom:archive" \ + "<manifestFile>\${project.build.directory}/META-INF-complete/MANIFEST.MF</manifestFile>" + %{mvn_package} ':::native:' native %{mvn_file} ':{*}' %{name}/@1 @1
