Accepting request 1264727 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/1264727
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jffi?expand=0&rev=10

jffi-1.3.11.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51e996fd6674a807045ef6731ee67cf7588a6cb71fbf39ad82fb50951818ba9c
-size 3303269

jffi-1.3.13.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:299a1656b7ca35593623160f5bca988ea773c49480eb33d495256f46ccfc655d
+size 3345405

jffi.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Mar 27 21:09:25 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Fix pom.xml errors that will be fatal with Maven 4
+
+-------------------------------------------------------------------
+Mon Sep 23 14:53:59 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use SOURCE_DATE_EPOCH for reproducible jar mtime
+
+-------------------------------------------------------------------
+Sun Jun 23 05:55:46 UTC 2024 - jun wang <jgwang@suse.com>
+
+- Update to v1.3.13
+  * No changelog provided by upstream, and please refer to
+    https://github.com/jnr/jffi/compare/jffi-1.3.11...jffi-1.3.13
+  * no more provided COPYING.{GPL,LESSER} files
+
 -------------------------------------------------------------------
 Wed Feb 21 10:46:50 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
 

jffi.spec

@@ -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
@@ -19,7 +19,7 @@
 %global cluster jnr
 %global sover 1.2
 Name:           jffi
-Version:        1.3.11
+Version:        1.3.13
 Release:        0
 Summary:        Java Foreign Function Interface
 License:        Apache-2.0 OR LGPL-3.0-or-later
@@ -33,6 +33,8 @@ Patch2:         jffi-fix-system-ffi.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  gcc
+BuildRequires:  hamcrest
+BuildRequires:  junit
 BuildRequires:  make
 BuildRequires:  maven-local
 BuildRequires:  pkgconfig
@@ -76,27 +78,6 @@ sed -i -e '/case FFI_BAD_ARGTYPE:/,3d' jni/jffi/CallContext.c
 # 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 @@ find . -name '*.jar' -delete
 
 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
 
@@ -125,7 +109,11 @@ cp target/%{name}-%{version}-complete.jar target/%{name}-%{version}.jar
 
 mkdir -p META-INF/
 cp %{SOURCE3} META-INF/
-jar -uf %{buildroot}%{_jnidir}/%{name}/%{name}.jar META-INF/p2.inf
+jar \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
+    --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \
+%endif
+    --update --file=%{buildroot}%{_jnidir}/%{name}/%{name}.jar META-INF/p2.inf
 
 # install *.so
 install -dm0755 %{buildroot}%{_libdir}/%{name}
@@ -138,13 +126,13 @@ ln -s lib%{name}-%{sover}.so lib%{name}.so
 popd
 
 %files -f .mfiles
-%license COPYING.{GPL,LESSER} LICENSE
+%license LICENSE
 
 %files native -f .mfiles-native
 %{_libdir}/%{name}
-%license COPYING.{GPL,LESSER} LICENSE
+%license LICENSE
 
 %files javadoc -f .mfiles-javadoc
-%license COPYING.{GPL,LESSER} LICENSE
+%license LICENSE
 
 %changelog