rpms
/
jna
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:c9
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9
rpms:i9c-beta
rpms:c9-beta
...
pull from: rpms:c10-beta
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9
rpms:i9c-beta
rpms:c9-beta

No commits in common. 'c9' and 'c10-beta' have entirely different histories.
c9 ... c10-beta

11 changed files with 346 additions and 123 deletions
Show Stats

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/jna-5.6.0-clean.tar.xz
SOURCES/jna-5.14.0-clean.tar.xz

2
.jna.metadata
Unescape View File

@ -1 +1 @@
78b24042ae61b976b521efa9c333a914a7981c4c SOURCES/jna-5.6.0-clean.tar.xz
eb9c4f88f448904b17ad2e9525fb5a06b120dce4 SOURCES/jna-5.14.0-clean.tar.xz

6
SOURCES/0001-Adapt-build.patch
Unescape View File

@ -1,7 +1,7 @@
From 2560a89cc5537890c3a692263715c93b97d7ea37 Mon Sep 17 00:00:00 2001
From 52ef407584801916d6e60c4f4c5411023b5ac369 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 16 Jan 2017 11:29:06 +0100
Subject: [PATCH 1/7] Adapt build
Subject: [PATCH 1/6] Adapt build
---
native/Makefile | 3 +--
@ -29,5 +29,5 @@ index 1bea2dc..cb3afed 100644
$(TESTLIB): $(BUILD)/testlib.o
$(LD) $(LDFLAGS) $< $(LIBS)
--
2.38.1
2.20.1

8
SOURCES/0002-Load-system-library.patch
Unescape View File

@ -1,14 +1,14 @@
From 28f5c64f5443a6d465663a1b737e9fc20b7364d4 Mon Sep 17 00:00:00 2001
From 3d08314de0494ff8bdc1a7bccc0ecc1730dbdd60 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 16 Jan 2017 11:31:32 +0100
Subject: [PATCH 2/7] Load system library
Subject: [PATCH 2/6] Load system library
---
src/com/sun/jna/Native.java | 80 ++-----------------------------------
1 file changed, 4 insertions(+), 76 deletions(-)
diff --git a/src/com/sun/jna/Native.java b/src/com/sun/jna/Native.java
index 0cf39fa..603659c 100644
index eae060f..11bcc5b 100644
--- a/src/com/sun/jna/Native.java
+++ b/src/com/sun/jna/Native.java
@@ -912,84 +912,12 @@ public final class Native implements Version {
@ -101,5 +101,5 @@ index 0cf39fa..603659c 100644
static final String JNA_TMPLIB_PREFIX = "jna";
--
2.38.1
2.20.1

10
SOURCES/0003-Tests-headless.patch
Unescape View File

@ -1,17 +1,17 @@
From 4b05abecb7b8a1edc0a32048ab12aba6ee1d6824 Mon Sep 17 00:00:00 2001
From c0f33e9ed0a5cfd79b58487c2a36c9b880b49947 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 16 Jan 2017 11:32:32 +0100
Subject: [PATCH 3/7] Tests headless
Subject: [PATCH 3/6] Tests headless
---
build.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
index 0153731..8dbe173 100644
index d5c2bbc..835c02b 100644
--- a/build.xml
+++ b/build.xml
@@ -1250,6 +1250,7 @@ cd ..
@@ -1202,6 +1202,7 @@ cd ..
<sysproperty key="jna.nosys" value="true"/>
<sysproperty key="jna.builddir" file="${build}"/>
<sysproperty key="jna.nativedir" file="${build.native}"/>
@ -20,5 +20,5 @@ index 0153731..8dbe173 100644
<formatter type="brief" usefile="false"/>
<formatter type="xml"/>
--
2.38.1
2.20.1

10
SOURCES/0004-Fix-javadoc-build.patch
Unescape View File

@ -1,17 +1,17 @@
From 042a878f130a855faae8706abc12a4c417607753 Mon Sep 17 00:00:00 2001
From ced8baacd3bccba7ebaba80785b891bf579af215 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 31 Jan 2017 14:21:19 +0100
Subject: [PATCH 4/7] Fix javadoc build
Subject: [PATCH 4/6] Fix javadoc build
---
build.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
index 8dbe173..741ab6e 100644
index 835c02b..cecafd0 100644
--- a/build.xml
+++ b/build.xml
@@ -1355,6 +1355,7 @@ cd ..
@@ -1307,6 +1307,7 @@ cd ..
<group title="Platform Specific" packages="com.sun.jna.platform.*"/>
<arg value="-notimestamp"/>
@ -20,5 +20,5 @@ index 8dbe173..741ab6e 100644
<jar jarfile="${platform-javadoc-jar}" createUnicodeExtraFields="never" encoding="UTF-8">
<fileset dir="${javadoc}" />
--
2.38.1
2.20.1

16
SOURCES/0005-Fix-duplicate-manifest-entry.patch
Unescape View File

@ -1,17 +1,17 @@
From c86b3417e9588cdbb43d7034e16a22d4b815ce95 Mon Sep 17 00:00:00 2001
From de939d7c9266f89542cea5ebef5980a95f1244a9 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 10 Jul 2017 11:48:43 +0200
Subject: [PATCH 5/7] Fix duplicate manifest entry
Subject: [PATCH 5/6] Fix duplicate manifest entry
---
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 741ab6e..54e569c 100644
index aa5aa00..9deb2b7 100644
--- a/build.xml
+++ b/build.xml
@@ -611,9 +611,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
@@ -681,9 +681,9 @@ osname=macosx;processor=aarch64
includes="LICENSE,LGPL2.1,AL2.0"
prefix="META-INF"/>
</jar>
@ -20,9 +20,9 @@ index 741ab6e..54e569c 100644
<zipfileset src="${build}/${jar}" excludes="**/*jnidispatch*"/>
- </zip>
+ </jar>
</target>
<target name="aar" depends="jar" description="Build Android Archive">
<jar jarfile="${build}/jna-jpms.jar" duplicate="preserve" createUnicodeExtraFields="never" encoding="UTF-8" manifest="${build}/manifest/module.mf">
<zipfileset src="${build}/${jar}" excludes="META-INF/MANIFEST.mf"/>
<zipfileset dir="${build}/manifest/" includes="module-info.class" prefix="META-INF/versions/9"/>
--
2.38.1
2.20.1

14
SOURCES/0006-Remove-Werror.patch
Unescape View File

@ -1,22 +1,22 @@
From 2e21a725ac8836f51f8b9a0171d5610eea81559f Mon Sep 17 00:00:00 2001
From 6e8784db2fa3b3b2efedaae75d15d5d5cf3ed50c Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 22 Feb 2018 16:17:15 +0100
Subject: [PATCH 6/7] Remove -Werror
Subject: [PATCH 6/6] Remove -Werror
---
native/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/native/Makefile b/native/Makefile
index cb3afed..028c201 100644
index 34ace68..b97df45 100644
--- a/native/Makefile
+++ b/native/Makefile
@@ -337,11 +337,11 @@ ifeq ($(CC),gcc)
@@ -356,11 +356,11 @@ ifeq ($(CC),gcc)
GCC_MAJOR_VERSION = $(shell gcc -dumpversion | cut -f 1 -d '.')
ifneq ($(GCC_MAJOR_VERSION),4)
ifneq ($(GCC_MAJOR_VERSION),3)
- LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable
+ LOC_CC_OPTS=-Wno-unknown-warning-option -Wno-clobbered -Wno-unused-variable
- LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable -Wno-alloca-larger-than
+ LOC_CC_OPTS=-Wno-unknown-warning-option -Wno-clobbered -Wno-unused-variable -Wno-alloca-larger-than
endif
endif
else
@ -26,5 +26,5 @@ index cb3afed..028c201 100644
# Enable 64-bit builds if the arch demands it
--
2.38.1
2.31.1

59
SOURCES/0007-Set-explicit-compiler-release.patch
Unescape View File

@ -1,59 +0,0 @@
From a925b1196599f48bfbd85e7f37cfc7c1e9583a3f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 23 Jan 2023 14:53:34 +0100
Subject: [PATCH 7/7] Set explicit compiler release
---
build.xml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 54e569c..f724bb0 100644
--- a/build.xml
+++ b/build.xml
@@ -101,9 +101,7 @@
JDK 11 is the last JDK, that supports creation of Java 6 compatible class
files.
-->
- <condition property="compatibility" value="1.6" else="9">
- <matches pattern="^1\.\d+$" string="${ant.java.version}"/>
- </condition>
+ <property name="compatibility" value="8"/>
<condition property="compatibility-check" value="true">
<equals arg1="${compatibility}" arg2="1.6" />
@@ -394,6 +392,7 @@
<javac source="${compatibility}"
target="${compatibility}"
+ release="${compatibility}"
destdir="${classes}"
includeantruntime="false"
deprecation="on"
@@ -405,6 +404,7 @@
<javac classpath="${compatibility}"
source="${compatibility}"
target="${compatibility}"
+ release="${compatibility}"
destdir="${classes}"
includeantruntime="false"
deprecation="on"
@@ -1071,6 +1071,7 @@ cd ..
<javac classpathref="compile-test.path"
source="${test.compatibility}"
target="${test.compatibility}"
+ release="${test.compatibility}"
destdir="${test.classes}"
includeantruntime="false"
includes="**/StructureFieldOrderInspector.java"
@@ -1087,6 +1088,7 @@ cd ..
<javac classpathref="compile-test.path"
source="${test.compatibility}"
target="${test.compatibility}"
+ release="${test.compatibility}"
destdir="${test.classes}"
includeantruntime="false"
excludes="${tests.exclude-patterns}"
--
2.38.1

210
SOURCES/0007-Support-openjdk-17.patch
Unescape View File

@ -0,0 +1,210 @@
From 511d4b372a2ea1e79b850d2790ce29be9280cd75 Mon Sep 17 00:00:00 2001
From: Zuzana Miklankova <zmiklank@redhat.com>
Date: Mon, 10 Jan 2022 07:46:11 +0100
Subject: [PATCH] Support-openjdk-17
---
contrib/alphamaskdemo/build.xml | 4 ++--
contrib/balloonmanagerdemo/build.xml | 4 ++--
contrib/balloontips/build.xml | 4 ++--
contrib/dnddemo/build.xml | 4 ++--
contrib/monitordemo/build.xml | 4 ++--
contrib/msoffice/build.xml | 4 ++--
contrib/native_window_msg/build.xml | 4 ++--
contrib/ntservice/nbproject/project.properties | 4 ++--
contrib/shapedwindowdemo/build.xml | 4 ++--
contrib/w32printing/build.xml | 4 ++--
contrib/w32windowhooks/build.xml | 4 ++--
contrib/x11/build.xml | 4 ++--
12 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/contrib/alphamaskdemo/build.xml b/contrib/alphamaskdemo/build.xml
index 2186daadd..9e4a2072e 100644
--- a/contrib/alphamaskdemo/build.xml
+++ b/contrib/alphamaskdemo/build.xml
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-alphamask.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.AlphaMaskDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/balloonmanagerdemo/build.xml b/contrib/balloonmanagerdemo/build.xml
index e9cba2c7b..37d0d0e7a 100644
--- a/contrib/balloonmanagerdemo/build.xml
+++ b/contrib/balloonmanagerdemo/build.xml
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-balloonmanager.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.BalloonManagerDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/balloontips/build.xml b/contrib/balloontips/build.xml
index e5b64b11d..8fa15d576 100644
--- a/contrib/balloontips/build.xml
+++ b/contrib/balloontips/build.xml
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-balloontips.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.FilteredTextField" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/dnddemo/build.xml b/contrib/dnddemo/build.xml
index 1feacb3a9..151194fcd 100644
--- a/contrib/dnddemo/build.xml
+++ b/contrib/dnddemo/build.xml
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-dnd.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.GhostedDragImageDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/monitordemo/build.xml b/contrib/monitordemo/build.xml
index 6e7a5c1b5..f7228c7c9 100644
--- a/contrib/monitordemo/build.xml
+++ b/contrib/monitordemo/build.xml
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-monitordemo.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.MonitorInfoDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/msoffice/build.xml b/contrib/msoffice/build.xml
index fa0387b61..06627c1cf 100644
--- a/contrib/msoffice/build.xml
+++ b/contrib/msoffice/build.xml
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-msoffice.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/native_window_msg/build.xml b/contrib/native_window_msg/build.xml
index 19e99db68..066da4065 100644
--- a/contrib/native_window_msg/build.xml
+++ b/contrib/native_window_msg/build.xml
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-nativewindowmsg.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.platform.win32.Win32WindowDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/ntservice/nbproject/project.properties b/contrib/ntservice/nbproject/project.properties
index 587ae2b4d..d30a26c83 100644
--- a/contrib/ntservice/nbproject/project.properties
+++ b/contrib/ntservice/nbproject/project.properties
@@ -7,7 +7,7 @@ javadoc.nonavbar=false
javac.external.vm=false
run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
javac.processorpath=${javac.classpath}
-javac.target=1.6
+javac.target=1.8
annotation.processing.processors.list=
javadoc.noindex=false
javadoc.additionalparam=
@@ -29,7 +29,7 @@ dist.dir=dist
build.classes.excludes=**/*.java,**/*.form
javadoc.splitindex=true
javadoc.encoding=
-javac.source=1.6
+javac.source=1.8
file.reference.jna.jar=../../build/jna.jar
application.vendor=matthias
junit.selected.version=4
diff --git a/contrib/shapedwindowdemo/build.xml b/contrib/shapedwindowdemo/build.xml
index 24c25b5cc..b4f8c995d 100644
--- a/contrib/shapedwindowdemo/build.xml
+++ b/contrib/shapedwindowdemo/build.xml
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-shapedwindow.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.ShapedWindowDemo" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/w32printing/build.xml b/contrib/w32printing/build.xml
index 0af971a82..b76e00709 100644
--- a/contrib/w32printing/build.xml
+++ b/contrib/w32printing/build.xml
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-w32printing.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.platform.win32.Win32SpoolMonitor" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/w32windowhooks/build.xml b/contrib/w32windowhooks/build.xml
index 668d22daa..992ae4d7e 100644
--- a/contrib/w32windowhooks/build.xml
+++ b/contrib/w32windowhooks/build.xml
@@ -9,8 +9,8 @@
<property name="jar" location="${build}/demo-w32windowhooks.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
<property name="main-class" value="com.sun.jna.contrib.demo.WindowHooks" />
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
diff --git a/contrib/x11/build.xml b/contrib/x11/build.xml
index ecf2ae5f9..95f5e8a88 100644
--- a/contrib/x11/build.xml
+++ b/contrib/x11/build.xml
@@ -9,8 +9,8 @@
<property name="classes" location="${build}/classes"/>
<property name="jar" location="${build}/demo-x11.jar"/>
<property name="file.reference.jna.jar" location="../../build/jna.jar"/>
- <property name="javac.target" value="1.6" />
- <property name="javac.source" value="1.6" />
+ <property name="javac.target" value="1.8" />
+ <property name="javac.source" value="1.8" />
<path id="classpath">
<fileset file="${file.reference.jna.jar}"/>
--
2.31.1

132
SPECS/jna.spec
Unescape View File

@ -1,11 +1,18 @@
# Allow conditionally building without the reflections library
%if %{defined rhel}
%bcond_with reflections
%else
%bcond_without reflections
%endif
Name: jna
Version: 5.6.0
Release: 8%{?dist}
Version: 5.14.0
Release: 6%{?dist}
Summary: Pure Java access to native libraries
# Most of code is dual-licensed under either LGPL 2.1+ only or Apache
# License 2.0. WeakIdentityHashMap.java was taken from Apache CXF,
# which is pure Apache License 2.0.
License: (LGPLv2+ or ASL 2.0) and ASL 2.0
License: Apache-2.0 OR LGPL-2.1-or-later
URL: https://github.com/java-native-access/jna/
# ./generate-tarball.sh
@ -29,9 +36,10 @@ Patch3: 0004-Fix-javadoc-build.patch
Patch4: 0005-Fix-duplicate-manifest-entry.patch
# We don't want newly added warnings to break our build
Patch5: 0006-Remove-Werror.patch
# Fix compatibility with Java 8
# See https://bugzilla.redhat.com/show_bug.cgi?id=2162040
Patch6: 0007-Set-explicit-compiler-release.patch
Patch6: 0007-Support-openjdk-17.patch
ExclusiveArch: %{java_arches}
# We manually require libffi because find-requires doesn't work
# inside jars.
@ -45,6 +53,11 @@ BuildRequires: ant-junit
BuildRequires: junit
BuildRequires: libX11-devel
BuildRequires: libXt-devel
BuildRequires: objectweb-asm
BuildRequires: hamcrest
%if %{with reflections}
BuildRequires: reflections
%endif
%description
JNA provides Java programs easy access to native shared libraries
@ -63,7 +76,7 @@ This package contains the javadocs for %{name}.
%package contrib
Summary: Contrib for %{name}
License: LGPLv2+ or ASL 2.0
License: Apache-2.0 OR LGPL-2.1-or-later
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
@ -74,26 +87,41 @@ This package contains the contributed examples for %{name}.
%prep
%setup -q
cp %{SOURCE1} .
%patch0 -p1 -b .build
%patch1 -p1 -b .loadlib
%patch2 -p1 -b .tests-headless
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch -P 0 -p1 -b .build
%patch -P 1 -p1 -b .loadlib
%patch -P 2 -p1 -b .tests-headless
%patch -P 3 -p1
%patch -P 4 -p1
%patch -P 5 -p1
%patch -P 6 -p1
chmod -Rf a+rX,u+w,g-w,o-w .
sed -i 's|@LIBDIR@|%{_libdir}/%{name}|' src/com/sun/jna/Native.java
# TEMPLATE has to be changed to %%version in the pom files
# in order to generate correct provides
sed -i 's/TEMPLATE/%{version}/' pom-jna-jpms.xml \
pom-jna-platform.xml \
pom-jna.xml \
pom-jna-platform-jpms.xml
# clean LICENSE.txt
sed -i 's/\r//' LICENSE
chmod -c 0644 LICENSE OTHERS CHANGES.md
%if %{with reflections}
sed s,'<include name="junit.jar"/>,&<include name="reflections.jar"/>,' -i build.xml
build-jar-repository -s -p lib junit reflections
%else
build-jar-repository -s -p lib junit
rm test/com/sun/jna/StructureFieldOrderInspector.java
rm test/com/sun/jna/StructureFieldOrderInspectorTest.java
%endif
ln -s $(xmvn-resolve ant:ant:1.10.5) lib/ant.jar
ln -s $(xmvn-resolve org.ow2.asm:asm) lib/asm-8.0.1.jar
ln -s $(xmvn-resolve org.hamcrest:hamcrest-all) lib/hamcrest-core-1.3.jar
ln -s $(xmvn-resolve org.reflections:reflections) lib/test/reflections.jar
cp lib/native/aix-ppc64.jar lib/clover.jar
@ -139,27 +167,71 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/
%changelog
* Mon Jan 30 2023 Zuzana Miklankova <zmiklank@redhat.com> - 5.6.0-8
- Set correct compat. value also to ant parameters
- Resolves: rhbz#2162040
* Fri Aug 09 2024 Marián Konček <mkoncek@redhat.com> - 5.14.0-6
- Rebuild without generated Requires
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.14.0-5
- Bump release for June 2024 mass rebuild
* Wed May 15 2024 Zuzana Miklankova <zmiklank@redhat.com> - 5.14.0-4
- update license to SPDX format
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 11 2023 Zuzana Miklankova <zmiklank@redhat.com> - 5.14.0-1
- Rebase to version 5.14.0
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Jan 16 2023 Zuzana Miklankova <zmiklank@redhat.com> - 5.13.0-1
- Rebase to version 5.13.0
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jul 11 2022 Zuzana Miklankova <zmiklank@redhat.com> - 5.12.1-1
- Rebase to version 5.12.1
* Mon May 16 2022 Zuzana Miklankova <zmiklank@redhat.com> - 5.11.0-2
- Use correct version in provided pom files
* Mon Mar 28 2022 Zuzana Miklankova <zmiklank@redhat.com> - 5.11.0-1
- Rebase to version 5.11.0
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 5.10.0-3
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Jan 10 2022 Zuzana Miklankova <zmiklank@redhat.com> - 5.10.0-1
- Rebase to version 5.10.0
* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 5.9.0-4
- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
* Mon Jan 23 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.6.0-7
- Fix compatibility with Java 8
- Resolves: rhbz#2162040
* Wed Dec 1 2021 Zuzana Miklankova <zmiklank@redhat.com> - 5.9.0-3
- Support openjdk-17 with dropping 1.6 compatibility
* Wed Aug 18 2021 Carlos O'Donell <codonell@redhat.com> - 5.6.0-6
- Rebuilt for libffi 3.4.2 SONAME transition.
Related: rhbz#1891914
* Wed Dec 1 2021 Zuzana Miklankova <zmiklank@redhat.com> - 5.9.0-2
- Rebuild with resolved reflections dependecy
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.6.0-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Sep 17 2021 Ondrej Dubaj <odubaj@redhat.com> - 5.9.0-1
- Rebase to version 5.9.0
* Thu Apr 29 2021 Ondrej Dubaj <odubaj@redhat.com> - 5.6.0-4
- Build without reflections optional dependency (#1954987)
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.6.0-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed May 12 2021 Ondrej Dubaj <odubaj@redhat.com> - 5.6.0-3
- Remove maven-javadoc-plugin dependency
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Write Preview
Loading…
Cancel
Save