From 93f7fe35ceb6ce9432887586f1efe42c0925891a Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 28 Mar 2017 20:07:41 +0200 Subject: [PATCH 01/67] Update to upstream version 4.4.0 --- .gitignore | 1 + jna.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7436b71..47a3fdc 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ jna-3.2.7.tar.bz2 /jna-4.2.1-clean.tar.xz /jna-4.2.2-clean.tar.xz /jna-4.3.0-clean.tar.xz +/jna-4.4.0-clean.tar.xz diff --git a/jna.spec b/jna.spec index c2cb23c..1acc31f 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna -Version: 4.3.0 -Release: 4%{?dist} +Version: 4.4.0 +Release: 1%{?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, @@ -80,7 +80,7 @@ sed -i 's/\r//' LICENSE chmod -c 0644 LICENSE OTHERS CHANGES.md sed s,',&,' -i build.xml -build-jar-repository -s -p lib junit reflections +build-jar-repository -s -p lib junit reflections ant cp lib/native/aix-ppc64.jar lib/clover.jar @@ -131,6 +131,9 @@ cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Tue Mar 28 2017 Michael Simacek - 4.4.0-1 +- Update to upstream version 4.4.0 + * Tue Feb 07 2017 Michael Simacek - 4.3.0-4 - Use --allow-script-in-comments on all arches diff --git a/sources b/sources index 661badc..ba58526 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-4.3.0-clean.tar.xz) = 693d4056e98c40dbcf5af2ef170bcbc5127ef27b55cb96319ed81db3d2b65865a3c75f1f6da3b47ed6e44b17a092a6fc9a1ce68b81340c1f61409eeed38c4655 +SHA512 (jna-4.4.0-clean.tar.xz) = b3be08b309efc05c168901aab51358f1ad8c7feba7335745da685dc6afad3b5c12ba9d4198f139dbf9abe5d0bfa5947219edcbdf94d0350e6cb1ce4d40ae2570 From 13f7ff85f7c49fb002fc139da6f26bdfb9078632 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 3 Jul 2017 14:43:23 +0200 Subject: [PATCH 02/67] Install with XMvn --- jna.spec | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/jna.spec b/jna.spec index 1acc31f..e20eb8e 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna Version: 4.4.0 -Release: 1%{?dist} +Release: 2%{?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, @@ -28,8 +28,7 @@ Patch3: 0004-Fix-javadoc-build.patch Requires: libffi BuildRequires: gcc BuildRequires: make -BuildRequires: java-devel -BuildRequires: jpackage-utils +BuildRequires: javapackages-local BuildRequires: libffi-devel BuildRequires: ant BuildRequires: ant-junit @@ -94,27 +93,21 @@ ant -Dcompatibility=1.6 -Dplatform.compatibility=1.6 -Dcflags_extra.native="%{op find contrib -name build -exec rm -rf {} \; || : %install -# jars -install -D -m 644 build/%{name}-min.jar %{buildroot}%{_javadir}/%{name}.jar -install -d -m 755 %{buildroot}%{_javadir}/%{name} -find contrib -name '*.jar' -exec cp {} %{buildroot}%{_javadir}/%{name}/ \; # NOTE: JNA has highly custom code to look for native jars in this # directory. Since this roughly matches the jpackage guidelines, # we'll leave it unchanged. install -d -m 755 %{buildroot}%{_libdir}/%{name} install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ -# install maven pom file -install -Dm 644 pom-%{name}.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -install -Dm 644 pom-%{name}-platform.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-platform.pom +%mvn_file :jna jna jna/jna -# ... and maven depmap -%add_maven_depmap JPP-%{name}.pom %{name}.jar -%add_maven_depmap JPP.%{name}-%{name}-platform.pom -f platform %{name}/%{name}-platform.jar -a "net.java.dev.jna:platform" +%mvn_package :jna-platform contrib +%mvn_alias :jna-platform :platform -# javadocs -install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name} +%mvn_artifact pom-jna.xml build/jna-min.jar +%mvn_artifact pom-jna-platform.xml contrib/platform/dist/jna-platform.jar + +%mvn_install -J doc/javadoc %files -f .mfiles @@ -122,15 +115,16 @@ cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name} %license LICENSE LGPL2.1 AL2.0 %{_libdir}/%{name} -%files javadoc +%files javadoc -f .mfiles-javadoc %license LICENSE LGPL2.1 AL2.0 -%{_javadocdir}/%{name} -%files contrib -f .mfiles-platform -%{_javadir}/%{name} +%files contrib -f .mfiles-contrib %changelog +* Mon Jul 03 2017 Michael Simacek - 4.4.0-2 +- Install with XMvn + * Tue Mar 28 2017 Michael Simacek - 4.4.0-1 - Update to upstream version 4.4.0 From e2a30d15713fdac0e17cbb95969eecd3792a682d Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 7 Jul 2017 12:50:09 +0200 Subject: [PATCH 03/67] Temporarily add symlink to javadir --- jna.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jna.spec b/jna.spec index e20eb8e..f23e69f 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna Version: 4.4.0 -Release: 2%{?dist} +Release: 3%{?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, @@ -99,7 +99,7 @@ find contrib -name build -exec rm -rf {} \; || : install -d -m 755 %{buildroot}%{_libdir}/%{name} install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ -%mvn_file :jna jna jna/jna +%mvn_file :jna jna jna/jna %{_javadir}/jna %mvn_package :jna-platform contrib %mvn_alias :jna-platform :platform @@ -122,6 +122,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Fri Jul 07 2017 Michael Simacek - 4.4.0-3 +- Temporarily add symlink to javadir + * Mon Jul 03 2017 Michael Simacek - 4.4.0-2 - Install with XMvn From 288c87db8d3a08b71e9d2ae286f15eaf6c40e068 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 10 Jul 2017 11:45:33 +0200 Subject: [PATCH 04/67] Fix duplicate manifest bug Resolves: rhbz#1469022 --- 0001-Adapt-build.patch | 8 +++---- 0002-Load-system-library.patch | 8 +++---- 0003-Tests-headless.patch | 8 +++---- 0004-Fix-javadoc-build.patch | 8 +++---- 0005-Fix-duplicate-manifest-entry.patch | 29 +++++++++++++++++++++++++ jna.spec | 10 ++++++++- 6 files changed, 54 insertions(+), 17 deletions(-) create mode 100644 0005-Fix-duplicate-manifest-entry.patch diff --git a/0001-Adapt-build.patch b/0001-Adapt-build.patch index c7df6cc..b070b9d 100644 --- a/0001-Adapt-build.patch +++ b/0001-Adapt-build.patch @@ -1,14 +1,14 @@ -From c38ff2904958eeae70e3d47b7b2363f9f181013b Mon Sep 17 00:00:00 2001 +From c72c148b343d0071cb89bb71caa56ce8c73cdd8f Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:29:06 +0100 -Subject: [PATCH 1/4] Adapt build +Subject: [PATCH 1/5] Adapt build --- native/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/native/Makefile b/native/Makefile -index fb5ac4b..be1b452 100644 +index a465660..1325d8c 100644 --- a/native/Makefile +++ b/native/Makefile @@ -107,7 +107,7 @@ CDEFINES=-D_REENTRANT @@ -20,7 +20,7 @@ index fb5ac4b..be1b452 100644 ifeq ($(DYNAMIC_LIBFFI),true) CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo) LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi) -@@ -442,7 +442,6 @@ $(BUILD)/$(JNA_JNI_VERSION).stamp: +@@ -432,7 +432,6 @@ $(BUILD)/$(JNA_JNI_VERSION).stamp: $(LIBRARY): $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LD) $(LDFLAGS) $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LIBS) diff --git a/0002-Load-system-library.patch b/0002-Load-system-library.patch index 1485d54..e4f7472 100644 --- a/0002-Load-system-library.patch +++ b/0002-Load-system-library.patch @@ -1,17 +1,17 @@ -From 3f48354a76a0d24fb21e9132482d9ff7af6df8b4 Mon Sep 17 00:00:00 2001 +From a94220ca2121dc886a2f1f643bc53ac56575701d Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:31:32 +0100 -Subject: [PATCH 2/4] Load system library +Subject: [PATCH 2/5] Load system library --- src/com/sun/jna/Native.java | 97 ++------------------------------------------- 1 file changed, 4 insertions(+), 93 deletions(-) diff --git a/src/com/sun/jna/Native.java b/src/com/sun/jna/Native.java -index f51a152..b3ddbc3 100644 +index 274bb78..39c57f4 100644 --- a/src/com/sun/jna/Native.java +++ b/src/com/sun/jna/Native.java -@@ -788,101 +788,12 @@ public final class Native implements Version { +@@ -829,101 +829,12 @@ public final class Native implements Version { /** * Loads the JNA stub library. diff --git a/0003-Tests-headless.patch b/0003-Tests-headless.patch index 393d723..8686bcb 100644 --- a/0003-Tests-headless.patch +++ b/0003-Tests-headless.patch @@ -1,17 +1,17 @@ -From 4a4aae7689b217a0057608667eb03d2eea3f3eba Mon Sep 17 00:00:00 2001 +From 22264992b93d5f0d92cef180fa491311b53dcd19 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:32:32 +0100 -Subject: [PATCH 3/4] Tests headless +Subject: [PATCH 3/5] Tests headless --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index 09aeac2..d9be501 100644 +index 051bdaa..121d7c8 100644 --- a/build.xml +++ b/build.xml -@@ -1008,6 +1008,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc +@@ -1088,6 +1088,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc diff --git a/0004-Fix-javadoc-build.patch b/0004-Fix-javadoc-build.patch index 16f92a0..efd2208 100644 --- a/0004-Fix-javadoc-build.patch +++ b/0004-Fix-javadoc-build.patch @@ -1,17 +1,17 @@ -From 5fb86e7e8a37d8215d16480672a39e3ba75bd79d Mon Sep 17 00:00:00 2001 +From cbcbf6e6e47a1a9b6548314c2981290da4737c9c Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 31 Jan 2017 14:21:19 +0100 -Subject: [PATCH 4/4] Fix javadoc build +Subject: [PATCH 4/5] Fix javadoc build --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index d9be501..bbb93a3 100644 +index 121d7c8..457e0fb 100644 --- a/build.xml +++ b/build.xml -@@ -1113,6 +1113,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc +@@ -1193,6 +1193,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc diff --git a/0005-Fix-duplicate-manifest-entry.patch b/0005-Fix-duplicate-manifest-entry.patch new file mode 100644 index 0000000..285e366 --- /dev/null +++ b/0005-Fix-duplicate-manifest-entry.patch @@ -0,0 +1,29 @@ +From 5c381240cdb037e26fd26be5aa0f0d4567f41773 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 10 Jul 2017 11:48:43 +0200 +Subject: [PATCH 5/5] Fix duplicate manifest entry + +Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1469022 +--- + build.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build.xml b/build.xml +index 457e0fb..d1f673c 100644 +--- a/build.xml ++++ b/build.xml +@@ -541,9 +541,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc + includes="*jnidispatch*" + prefix="com/sun/jna/w32ce-arm"/> + +- ++ + +- ++ + + + +-- +2.9.3 + diff --git a/jna.spec b/jna.spec index f23e69f..05de560 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna Version: 4.4.0 -Release: 3%{?dist} +Release: 4%{?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, @@ -22,6 +22,9 @@ Patch1: 0002-Load-system-library.patch Patch2: 0003-Tests-headless.patch # Adds --allow-script-in-comments arg to javadoc to avoid error Patch3: 0004-Fix-javadoc-build.patch +# Avoid generating duplicate manifest entry +# See https://bugzilla.redhat.com/show_bug.cgi?id=1469022 +Patch4: 0005-Fix-duplicate-manifest-entry.patch # We manually require libffi because find-requires doesn't work # inside jars. @@ -69,6 +72,7 @@ cp %{SOURCE1} . %patch1 -p1 -b .loadlib %patch2 -p1 -b .tests-headless %patch3 -p1 +%patch4 -p1 chmod -Rf a+rX,u+w,g-w,o-w . sed -i 's|@LIBDIR@|%{_libdir}/%{name}|' src/com/sun/jna/Native.java @@ -122,6 +126,10 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Mon Jul 10 2017 Mikolaj Izdebski - 4.4.0-4 +- Fix duplicate manifest bug +- Resolves: rhbz#1469022 + * Fri Jul 07 2017 Michael Simacek - 4.4.0-3 - Temporarily add symlink to javadir From 3ea41eb9430ce91a70868b59d9a1acf1e1c2dd20 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 19 Jul 2017 14:43:02 +0200 Subject: [PATCH 05/67] Fix generation of JAR manifest Resolves: rhbz#1472494 --- 0005-Fix-duplicate-manifest-entry.patch | 6 +++--- jna.spec | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/0005-Fix-duplicate-manifest-entry.patch b/0005-Fix-duplicate-manifest-entry.patch index 285e366..7ee066f 100644 --- a/0005-Fix-duplicate-manifest-entry.patch +++ b/0005-Fix-duplicate-manifest-entry.patch @@ -1,4 +1,4 @@ -From 5c381240cdb037e26fd26be5aa0f0d4567f41773 Mon Sep 17 00:00:00 2001 +From 2f4dd94744a4367b5022837f64b7b113923580e8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 10 Jul 2017 11:48:43 +0200 Subject: [PATCH 5/5] Fix duplicate manifest entry @@ -9,7 +9,7 @@ Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1469022 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml -index 457e0fb..d1f673c 100644 +index 457e0fb..366cba2 100644 --- a/build.xml +++ b/build.xml @@ -541,9 +541,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc @@ -17,7 +17,7 @@ index 457e0fb..d1f673c 100644 prefix="com/sun/jna/w32ce-arm"/> - -+ ++ - + diff --git a/jna.spec b/jna.spec index 05de560..9ed4aec 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna Version: 4.4.0 -Release: 4%{?dist} +Release: 5%{?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, @@ -126,6 +126,10 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Wed Jul 19 2017 Mikolaj Izdebski - 4.4.0-5 +- Fix generation of JAR manifest +- Resolves: rhbz#1472494 + * Mon Jul 10 2017 Mikolaj Izdebski - 4.4.0-4 - Fix duplicate manifest bug - Resolves: rhbz#1469022 From c09ec6e7ab705767dd34ccf1776fa4edfccc1789 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 14:33:17 +0000 Subject: [PATCH 06/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 9ed4aec..2b5478a 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna Version: 4.4.0 -Release: 5%{?dist} +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, @@ -126,6 +126,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 4.4.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Jul 19 2017 Mikolaj Izdebski - 4.4.0-5 - Fix generation of JAR manifest - Resolves: rhbz#1472494 From f5623bca30e00128bc51da6d89c07e08bff20c23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 00:00:58 +0000 Subject: [PATCH 07/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 2b5478a..d2a456d 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna Version: 4.4.0 -Release: 6%{?dist} +Release: 7%{?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, @@ -126,6 +126,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 4.4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 4.4.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 02b3586320f032e3ab1fdc48851606730053c9c8 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 19 Sep 2017 14:42:41 +0300 Subject: [PATCH 08/67] Update to upstream version 4.5.0 --- .gitignore | 1 + 0001-Adapt-build.patch | 10 +++++----- 0002-Load-system-library.patch | 6 +++--- 0003-Tests-headless.patch | 8 ++++---- 0004-Fix-javadoc-build.patch | 8 ++++---- 0005-Fix-duplicate-manifest-entry.patch | 8 ++++---- jna.spec | 7 +++++-- sources | 2 +- 8 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 47a3fdc..1368083 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ jna-3.2.7.tar.bz2 /jna-4.2.2-clean.tar.xz /jna-4.3.0-clean.tar.xz /jna-4.4.0-clean.tar.xz +/jna-4.5.0-clean.tar.xz diff --git a/0001-Adapt-build.patch b/0001-Adapt-build.patch index b070b9d..26e8025 100644 --- a/0001-Adapt-build.patch +++ b/0001-Adapt-build.patch @@ -1,4 +1,4 @@ -From c72c148b343d0071cb89bb71caa56ce8c73cdd8f Mon Sep 17 00:00:00 2001 +From d9b409e9d7cf16a8bb109f3336cb8c8f4e8a3531 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:29:06 +0100 Subject: [PATCH 1/5] Adapt build @@ -8,10 +8,10 @@ Subject: [PATCH 1/5] Adapt build 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/native/Makefile b/native/Makefile -index a465660..1325d8c 100644 +index 6f9ad25..3712a9e 100644 --- a/native/Makefile +++ b/native/Makefile -@@ -107,7 +107,7 @@ CDEFINES=-D_REENTRANT +@@ -97,7 +97,7 @@ CDEFINES=-D_REENTRANT PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"' @@ -20,7 +20,7 @@ index a465660..1325d8c 100644 ifeq ($(DYNAMIC_LIBFFI),true) CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo) LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi) -@@ -432,7 +432,6 @@ $(BUILD)/$(JNA_JNI_VERSION).stamp: +@@ -455,7 +455,6 @@ $(BUILD)/$(JNA_JNI_VERSION).stamp: $(LIBRARY): $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LD) $(LDFLAGS) $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LIBS) @@ -29,5 +29,5 @@ index a465660..1325d8c 100644 $(TESTLIB): $(BUILD)/testlib.o $(LD) $(LDFLAGS) $< $(LIBS) -- -2.9.3 +2.13.5 diff --git a/0002-Load-system-library.patch b/0002-Load-system-library.patch index e4f7472..23d81be 100644 --- a/0002-Load-system-library.patch +++ b/0002-Load-system-library.patch @@ -1,4 +1,4 @@ -From a94220ca2121dc886a2f1f643bc53ac56575701d Mon Sep 17 00:00:00 2001 +From d16fea5f0fb7720ca4d7b58d4facfb36eb293ef4 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:31:32 +0100 Subject: [PATCH 2/5] Load system library @@ -8,7 +8,7 @@ Subject: [PATCH 2/5] Load system library 1 file changed, 4 insertions(+), 93 deletions(-) diff --git a/src/com/sun/jna/Native.java b/src/com/sun/jna/Native.java -index 274bb78..39c57f4 100644 +index 91b195f..9ac3815 100644 --- a/src/com/sun/jna/Native.java +++ b/src/com/sun/jna/Native.java @@ -829,101 +829,12 @@ public final class Native implements Version { @@ -118,5 +118,5 @@ index 274bb78..39c57f4 100644 static final String JNA_TMPLIB_PREFIX = "jna"; -- -2.9.3 +2.13.5 diff --git a/0003-Tests-headless.patch b/0003-Tests-headless.patch index 8686bcb..0607fa9 100644 --- a/0003-Tests-headless.patch +++ b/0003-Tests-headless.patch @@ -1,4 +1,4 @@ -From 22264992b93d5f0d92cef180fa491311b53dcd19 Mon Sep 17 00:00:00 2001 +From 02150119b13f944ed40ab9b6335eb1540de52516 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:32:32 +0100 Subject: [PATCH 3/5] Tests headless @@ -8,10 +8,10 @@ Subject: [PATCH 3/5] Tests headless 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index 051bdaa..121d7c8 100644 +index b956b6e..10fdab2 100644 --- a/build.xml +++ b/build.xml -@@ -1088,6 +1088,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc +@@ -1118,6 +1118,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc @@ -20,5 +20,5 @@ index 051bdaa..121d7c8 100644 -- -2.9.3 +2.13.5 diff --git a/0004-Fix-javadoc-build.patch b/0004-Fix-javadoc-build.patch index efd2208..c8ce7a1 100644 --- a/0004-Fix-javadoc-build.patch +++ b/0004-Fix-javadoc-build.patch @@ -1,4 +1,4 @@ -From cbcbf6e6e47a1a9b6548314c2981290da4737c9c Mon Sep 17 00:00:00 2001 +From 5c45622fff4f2f4ed80b4619f4b575af6bac6a22 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 31 Jan 2017 14:21:19 +0100 Subject: [PATCH 4/5] Fix javadoc build @@ -8,10 +8,10 @@ Subject: [PATCH 4/5] Fix javadoc build 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index 121d7c8..457e0fb 100644 +index 10fdab2..56f2b6e 100644 --- a/build.xml +++ b/build.xml -@@ -1193,6 +1193,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc +@@ -1223,6 +1223,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc @@ -20,5 +20,5 @@ index 121d7c8..457e0fb 100644 -- -2.9.3 +2.13.5 diff --git a/0005-Fix-duplicate-manifest-entry.patch b/0005-Fix-duplicate-manifest-entry.patch index 7ee066f..424ea52 100644 --- a/0005-Fix-duplicate-manifest-entry.patch +++ b/0005-Fix-duplicate-manifest-entry.patch @@ -1,4 +1,4 @@ -From 2f4dd94744a4367b5022837f64b7b113923580e8 Mon Sep 17 00:00:00 2001 +From 3e50e65e9139587414959e89e7721eff5c38552b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 10 Jul 2017 11:48:43 +0200 Subject: [PATCH 5/5] Fix duplicate manifest entry @@ -9,10 +9,10 @@ Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1469022 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml -index 457e0fb..366cba2 100644 +index 56f2b6e..f9713da 100644 --- a/build.xml +++ b/build.xml -@@ -541,9 +541,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc +@@ -561,9 +561,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc includes="*jnidispatch*" prefix="com/sun/jna/w32ce-arm"/> @@ -25,5 +25,5 @@ index 457e0fb..366cba2 100644 -- -2.9.3 +2.13.5 diff --git a/jna.spec b/jna.spec index d2a456d..7c8f556 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna -Version: 4.4.0 -Release: 7%{?dist} +Version: 4.5.0 +Release: 1%{?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, @@ -126,6 +126,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Tue Sep 19 2017 Michael Simacek - 4.5.0-1 +- Update to upstream version 4.5.0 + * Thu Aug 03 2017 Fedora Release Engineering - 4.4.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index ba58526..7108b40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-4.4.0-clean.tar.xz) = b3be08b309efc05c168901aab51358f1ad8c7feba7335745da685dc6afad3b5c12ba9d4198f139dbf9abe5d0bfa5947219edcbdf94d0350e6cb1ce4d40ae2570 +SHA512 (jna-4.5.0-clean.tar.xz) = 7d9e009bdc708ac139feec2eac994937bff5ae962b1fa4d684b0a824cc6f694a7e958a0df9e5949f2cdfd3e7e9f828ec174f3b304b0eb94db47131fa76a6a38e From c20644b2a7332d13dbaedba8b34fba100cb2623b Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 5 Jan 2018 15:21:32 +0100 Subject: [PATCH 09/67] Update to upstream version 4.5.1 --- .gitignore | 1 + 0001-Adapt-build.patch | 4 ++-- 0002-Load-system-library.patch | 4 ++-- 0003-Tests-headless.patch | 8 ++++---- 0004-Fix-javadoc-build.patch | 8 ++++---- 0005-Fix-duplicate-manifest-entry.patch | 8 ++++---- jna.spec | 5 ++++- sources | 2 +- 8 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 1368083..32e836f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ jna-3.2.7.tar.bz2 /jna-4.3.0-clean.tar.xz /jna-4.4.0-clean.tar.xz /jna-4.5.0-clean.tar.xz +/jna-4.5.1-clean.tar.xz diff --git a/0001-Adapt-build.patch b/0001-Adapt-build.patch index 26e8025..53f0872 100644 --- a/0001-Adapt-build.patch +++ b/0001-Adapt-build.patch @@ -1,4 +1,4 @@ -From d9b409e9d7cf16a8bb109f3336cb8c8f4e8a3531 Mon Sep 17 00:00:00 2001 +From 52ef407584801916d6e60c4f4c5411023b5ac369 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:29:06 +0100 Subject: [PATCH 1/5] Adapt build @@ -29,5 +29,5 @@ index 6f9ad25..3712a9e 100644 $(TESTLIB): $(BUILD)/testlib.o $(LD) $(LDFLAGS) $< $(LIBS) -- -2.13.5 +2.14.3 diff --git a/0002-Load-system-library.patch b/0002-Load-system-library.patch index 23d81be..f5e4179 100644 --- a/0002-Load-system-library.patch +++ b/0002-Load-system-library.patch @@ -1,4 +1,4 @@ -From d16fea5f0fb7720ca4d7b58d4facfb36eb293ef4 Mon Sep 17 00:00:00 2001 +From 3d08314de0494ff8bdc1a7bccc0ecc1730dbdd60 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:31:32 +0100 Subject: [PATCH 2/5] Load system library @@ -118,5 +118,5 @@ index 91b195f..9ac3815 100644 static final String JNA_TMPLIB_PREFIX = "jna"; -- -2.13.5 +2.14.3 diff --git a/0003-Tests-headless.patch b/0003-Tests-headless.patch index 0607fa9..b504451 100644 --- a/0003-Tests-headless.patch +++ b/0003-Tests-headless.patch @@ -1,4 +1,4 @@ -From 02150119b13f944ed40ab9b6335eb1540de52516 Mon Sep 17 00:00:00 2001 +From c0f33e9ed0a5cfd79b58487c2a36c9b880b49947 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:32:32 +0100 Subject: [PATCH 3/5] Tests headless @@ -8,10 +8,10 @@ Subject: [PATCH 3/5] Tests headless 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index b956b6e..10fdab2 100644 +index 63a9cc7..ab9cf52 100644 --- a/build.xml +++ b/build.xml -@@ -1118,6 +1118,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc +@@ -1128,6 +1128,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc @@ -20,5 +20,5 @@ index b956b6e..10fdab2 100644 -- -2.13.5 +2.14.3 diff --git a/0004-Fix-javadoc-build.patch b/0004-Fix-javadoc-build.patch index c8ce7a1..ca81e99 100644 --- a/0004-Fix-javadoc-build.patch +++ b/0004-Fix-javadoc-build.patch @@ -1,4 +1,4 @@ -From 5c45622fff4f2f4ed80b4619f4b575af6bac6a22 Mon Sep 17 00:00:00 2001 +From ced8baacd3bccba7ebaba80785b891bf579af215 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 31 Jan 2017 14:21:19 +0100 Subject: [PATCH 4/5] Fix javadoc build @@ -8,10 +8,10 @@ Subject: [PATCH 4/5] Fix javadoc build 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index 10fdab2..56f2b6e 100644 +index ab9cf52..d1fe4aa 100644 --- a/build.xml +++ b/build.xml -@@ -1223,6 +1223,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc +@@ -1233,6 +1233,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc @@ -20,5 +20,5 @@ index 10fdab2..56f2b6e 100644 -- -2.13.5 +2.14.3 diff --git a/0005-Fix-duplicate-manifest-entry.patch b/0005-Fix-duplicate-manifest-entry.patch index 424ea52..112e12b 100644 --- a/0005-Fix-duplicate-manifest-entry.patch +++ b/0005-Fix-duplicate-manifest-entry.patch @@ -1,4 +1,4 @@ -From 3e50e65e9139587414959e89e7721eff5c38552b Mon Sep 17 00:00:00 2001 +From de939d7c9266f89542cea5ebef5980a95f1244a9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 10 Jul 2017 11:48:43 +0200 Subject: [PATCH 5/5] Fix duplicate manifest entry @@ -9,10 +9,10 @@ Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1469022 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml -index 56f2b6e..f9713da 100644 +index d1fe4aa..c0a0b78 100644 --- a/build.xml +++ b/build.xml -@@ -561,9 +561,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc +@@ -571,9 +571,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc includes="*jnidispatch*" prefix="com/sun/jna/w32ce-arm"/> @@ -25,5 +25,5 @@ index 56f2b6e..f9713da 100644 -- -2.13.5 +2.14.3 diff --git a/jna.spec b/jna.spec index 7c8f556..921529c 100644 --- a/jna.spec +++ b/jna.spec @@ -1,5 +1,5 @@ Name: jna -Version: 4.5.0 +Version: 4.5.1 Release: 1%{?dist} Summary: Pure Java access to native libraries # Most of code is dual-licensed under either LGPL 2.1 only or Apache @@ -126,6 +126,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Fri Jan 05 2018 Michael Simacek - 4.5.1-1 +- Update to upstream version 4.5.1 + * Tue Sep 19 2017 Michael Simacek - 4.5.0-1 - Update to upstream version 4.5.0 diff --git a/sources b/sources index 7108b40..6c60b2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-4.5.0-clean.tar.xz) = 7d9e009bdc708ac139feec2eac994937bff5ae962b1fa4d684b0a824cc6f694a7e958a0df9e5949f2cdfd3e7e9f828ec174f3b304b0eb94db47131fa76a6a38e +SHA512 (jna-4.5.1-clean.tar.xz) = e27a5635ebcb746dd7c1de9d408ef803039fe46b865aca4d7352ffda6439f1b4d3e19b2543d7de2790505c3e5d1f4d4749b5cc3e5d2bccfba878d6c6bcb2fcdd From 30481efa2e9a28858b8d383be39abd9114ce2355 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 19:00:44 +0000 Subject: [PATCH 10/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 921529c..61890a3 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna Version: 4.5.1 -Release: 1%{?dist} +Release: 2%{?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, @@ -126,6 +126,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 4.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 05 2018 Michael Simacek - 4.5.1-1 - Update to upstream version 4.5.1 From 2931a800f442ac91c5ccb06bf3dfefda0b4a5202 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 22 Feb 2018 16:26:06 +0100 Subject: [PATCH 11/67] Disable -Werror --- 0001-Adapt-build.patch | 2 +- 0002-Load-system-library.patch | 2 +- 0003-Tests-headless.patch | 2 +- 0004-Fix-javadoc-build.patch | 2 +- 0005-Fix-duplicate-manifest-entry.patch | 2 +- 0006-Remove-Werror.patch | 29 +++++++++++++++++++++++++ jna.spec | 8 ++++++- 7 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 0006-Remove-Werror.patch diff --git a/0001-Adapt-build.patch b/0001-Adapt-build.patch index 53f0872..003d5db 100644 --- a/0001-Adapt-build.patch +++ b/0001-Adapt-build.patch @@ -1,7 +1,7 @@ From 52ef407584801916d6e60c4f4c5411023b5ac369 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:29:06 +0100 -Subject: [PATCH 1/5] Adapt build +Subject: [PATCH 1/6] Adapt build --- native/Makefile | 3 +-- diff --git a/0002-Load-system-library.patch b/0002-Load-system-library.patch index f5e4179..717300c 100644 --- a/0002-Load-system-library.patch +++ b/0002-Load-system-library.patch @@ -1,7 +1,7 @@ From 3d08314de0494ff8bdc1a7bccc0ecc1730dbdd60 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:31:32 +0100 -Subject: [PATCH 2/5] Load system library +Subject: [PATCH 2/6] Load system library --- src/com/sun/jna/Native.java | 97 ++------------------------------------------- diff --git a/0003-Tests-headless.patch b/0003-Tests-headless.patch index b504451..f879f9d 100644 --- a/0003-Tests-headless.patch +++ b/0003-Tests-headless.patch @@ -1,7 +1,7 @@ From c0f33e9ed0a5cfd79b58487c2a36c9b880b49947 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Jan 2017 11:32:32 +0100 -Subject: [PATCH 3/5] Tests headless +Subject: [PATCH 3/6] Tests headless --- build.xml | 1 + diff --git a/0004-Fix-javadoc-build.patch b/0004-Fix-javadoc-build.patch index ca81e99..f68b0be 100644 --- a/0004-Fix-javadoc-build.patch +++ b/0004-Fix-javadoc-build.patch @@ -1,7 +1,7 @@ From ced8baacd3bccba7ebaba80785b891bf579af215 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 31 Jan 2017 14:21:19 +0100 -Subject: [PATCH 4/5] Fix javadoc build +Subject: [PATCH 4/6] Fix javadoc build --- build.xml | 1 + diff --git a/0005-Fix-duplicate-manifest-entry.patch b/0005-Fix-duplicate-manifest-entry.patch index 112e12b..fce0d78 100644 --- a/0005-Fix-duplicate-manifest-entry.patch +++ b/0005-Fix-duplicate-manifest-entry.patch @@ -1,7 +1,7 @@ From de939d7c9266f89542cea5ebef5980a95f1244a9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 10 Jul 2017 11:48:43 +0200 -Subject: [PATCH 5/5] Fix duplicate manifest entry +Subject: [PATCH 5/6] Fix duplicate manifest entry Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1469022 --- diff --git a/0006-Remove-Werror.patch b/0006-Remove-Werror.patch new file mode 100644 index 0000000..60f7f02 --- /dev/null +++ b/0006-Remove-Werror.patch @@ -0,0 +1,29 @@ +From 6e8784db2fa3b3b2efedaae75d15d5d5cf3ed50c Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Thu, 22 Feb 2018 16:17:15 +0100 +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 3712a9e..73a906f 100644 +--- a/native/Makefile ++++ b/native/Makefile +@@ -336,10 +336,10 @@ endif + ifeq ($(CC),gcc) + GCC_MAJOR_VERSION = $(shell gcc -dumpversion | cut -f 1 -d '.') + ifneq ($(GCC_MAJOR_VERSION),4) +- 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 + endif + else +- 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 + endif + + # Enable 64-bit builds if the arch demands it +-- +2.14.3 + diff --git a/jna.spec b/jna.spec index 61890a3..2dd442c 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna Version: 4.5.1 -Release: 2%{?dist} +Release: 3%{?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, @@ -25,6 +25,8 @@ Patch3: 0004-Fix-javadoc-build.patch # Avoid generating duplicate manifest entry # See https://bugzilla.redhat.com/show_bug.cgi?id=1469022 Patch4: 0005-Fix-duplicate-manifest-entry.patch +# We don't want newly added warnings to break our build +Patch5: 0006-Remove-Werror.patch # We manually require libffi because find-requires doesn't work # inside jars. @@ -73,6 +75,7 @@ cp %{SOURCE1} . %patch2 -p1 -b .tests-headless %patch3 -p1 %patch4 -p1 +%patch5 -p1 chmod -Rf a+rX,u+w,g-w,o-w . sed -i 's|@LIBDIR@|%{_libdir}/%{name}|' src/com/sun/jna/Native.java @@ -126,6 +129,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Feb 22 2018 Michael Simacek - 4.5.1-3 +- Disable -Werror + * Wed Feb 07 2018 Fedora Release Engineering - 4.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From ecbe7be18fbf5092656aa89cbb0d014a89acc07b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 06:31:49 +0000 Subject: [PATCH 12/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 2dd442c..e8312b7 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna Version: 4.5.1 -Release: 3%{?dist} +Release: 4%{?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, @@ -129,6 +129,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 4.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 22 2018 Michael Simacek - 4.5.1-3 - Disable -Werror From 65fff278a0d08ca4723d51313222e8387d5590bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 04:34:26 +0000 Subject: [PATCH 13/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index e8312b7..11aa363 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,6 @@ Name: jna Version: 4.5.1 -Release: 4%{?dist} +Release: 5%{?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, @@ -129,6 +129,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 4.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 4.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 53cd350fc6b7c458bdff4fd9f7dcb85291648982 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 7 Mar 2019 18:27:35 +0000 Subject: [PATCH 14/67] Allow conditionally building without the reflections library for tests --- jna.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 11aa363..6588d4e 100644 --- a/jna.spec +++ b/jna.spec @@ -1,6 +1,9 @@ +# Allow conditionally building without the reflections library +%bcond_without reflections + Name: jna Version: 4.5.1 -Release: 5%{?dist} +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, @@ -40,7 +43,9 @@ BuildRequires: ant-junit BuildRequires: junit BuildRequires: libX11-devel BuildRequires: libXt-devel +%if %{with reflections} BuildRequires: reflections +%endif %description JNA provides Java programs easy access to native shared libraries @@ -85,8 +90,15 @@ sed -i 's/\r//' LICENSE chmod -c 0644 LICENSE OTHERS CHANGES.md +%if %{with reflections} sed s,',&,' -i build.xml build-jar-repository -s -p lib junit reflections ant +%else +build-jar-repository -s -p lib junit ant +rm test/com/sun/jna/StructureFieldOrderInspector.java +rm test/com/sun/jna/StructureFieldOrderInspectorTest.java +rm contrib/platform/test/com/sun/jna/platform/StructureFieldOrderTest.java +%endif cp lib/native/aix-ppc64.jar lib/clover.jar @@ -129,6 +141,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Mar 07 2019 Mat Booth - 4.5.1-6 +- Allow conditionally building without the reflections library for tests + * Fri Feb 01 2019 Fedora Release Engineering - 4.5.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f70c9f36ea59ac0f273c34011244e9da21679c25 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sat, 8 Jun 2019 15:28:28 +0100 Subject: [PATCH 15/67] Speed up builds on 32bit arm --- jna.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 6588d4e..f4f03dc 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 4.5.1 -Release: 6%{?dist} +Release: 7%{?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, @@ -47,6 +47,11 @@ BuildRequires: libXt-devel BuildRequires: reflections %endif +%ifarch %{arm} +# Speed up builds on 32bit arm +BuildRequires: java-1.8.0-openjdk-aarch32-devel +%endif + %description JNA provides Java programs easy access to native shared libraries (DLLs on Windows) without writing anything but Java code. JNA's @@ -104,6 +109,13 @@ cp lib/native/aix-ppc64.jar lib/clover.jar %build +# Ensure we get the jit on arm +%ifarch %{arm} +export JAVA_HOME=$(ls -d %{_jvmdir}/java-1.8.0-openjdk-aarch32*) +%else +export JAVA_HOME=%{_jvmdir}/java +%endif + # We pass -Ddynlink.native which comes from our patch because # upstream doesn't want to default to dynamic linking. #ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true native compile javadoc jar contrib-jars @@ -141,6 +153,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Sat Jun 08 2019 Mat Booth - 4.5.1-7 +- Speed up builds on 32bit arm + * Thu Mar 07 2019 Mat Booth - 4.5.1-6 - Allow conditionally building without the reflections library for tests From bb76e8cf1babbe793daf4a57ac87d4aeff7edd7e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 17 Jun 2019 21:52:09 +0100 Subject: [PATCH 16/67] Use xmvn-resolve for portable way to get the ant jar --- jna.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jna.spec b/jna.spec index f4f03dc..84648c2 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 4.5.1 -Release: 7%{?dist} +Release: 8%{?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, @@ -97,13 +97,14 @@ chmod -c 0644 LICENSE OTHERS CHANGES.md %if %{with reflections} sed s,',&,' -i build.xml -build-jar-repository -s -p lib junit reflections ant +build-jar-repository -s -p lib junit reflections %else -build-jar-repository -s -p lib junit ant +build-jar-repository -s -p lib junit rm test/com/sun/jna/StructureFieldOrderInspector.java rm test/com/sun/jna/StructureFieldOrderInspectorTest.java rm contrib/platform/test/com/sun/jna/platform/StructureFieldOrderTest.java %endif +ln -s $(xmvn-resolve ant:ant:1.10.5) lib/ant.jar cp lib/native/aix-ppc64.jar lib/clover.jar @@ -153,6 +154,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Mon Jun 17 2019 Mat Booth - 4.5.1-8 +- Use xmvn-resolve for portable way to get the ant jar + * Sat Jun 08 2019 Mat Booth - 4.5.1-7 - Speed up builds on 32bit arm From 61a4ca0b15a0764cf216c5ccb0008a7e78f9392b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 1 Jul 2019 12:11:42 +0100 Subject: [PATCH 17/67] Minor correction in license tag --- jna.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jna.spec b/jna.spec index 84648c2..3fb2710 100644 --- a/jna.spec +++ b/jna.spec @@ -3,12 +3,12 @@ Name: jna Version: 4.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Pure Java access to native libraries -# Most of code is dual-licensed under either LGPL 2.1 only or Apache +# 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: (LGPLv2+ or ASL 2.0) and ASL 2.0 URL: https://github.com/java-native-access/jna/ # ./generate-tarball.sh Source0: %{name}-%{version}-clean.tar.xz @@ -69,7 +69,7 @@ This package contains the javadocs for %{name}. %package contrib Summary: Contrib for %{name} -License: LGPLv2 or ASL 2.0 +License: LGPLv2+ or ASL 2.0 Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -154,6 +154,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Mon Jul 01 2019 Mat Booth - 4.5.1-9 +- Minor correction in license tag + * Mon Jun 17 2019 Mat Booth - 4.5.1-8 - Use xmvn-resolve for portable way to get the ant jar From 291ce372d31be667165402fda3b5046e0b73a07f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 10:37:06 +0000 Subject: [PATCH 18/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 3fb2710..95ac17f 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 4.5.1 -Release: 9%{?dist} +Release: 10%{?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, @@ -154,6 +154,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 4.5.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jul 01 2019 Mat Booth - 4.5.1-9 - Minor correction in license tag From 796b1bce0305969c283cbd7a9bdf132521017191 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 17 Jan 2019 14:41:31 +0100 Subject: [PATCH 19/67] Update to upstream version 5.4.0 --- .gitignore | 2 + 0001-Adapt-build.patch | 6 +-- 0002-Load-system-library.patch | 61 +++++++++---------------- 0003-Tests-headless.patch | 8 ++-- 0004-Fix-javadoc-build.patch | 6 +-- 0005-Fix-duplicate-manifest-entry.patch | 11 ++--- 0006-Remove-Werror.patch | 13 +++--- jna.spec | 16 +++++-- sources | 2 +- 9 files changed, 59 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index 32e836f..4286e61 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ jna-3.2.7.tar.bz2 /jna-4.4.0-clean.tar.xz /jna-4.5.0-clean.tar.xz /jna-4.5.1-clean.tar.xz +/jna-5.2.0-clean.tar.xz +/jna-5.4.0-clean.tar.xz diff --git a/0001-Adapt-build.patch b/0001-Adapt-build.patch index 003d5db..36ad5d1 100644 --- a/0001-Adapt-build.patch +++ b/0001-Adapt-build.patch @@ -8,7 +8,7 @@ Subject: [PATCH 1/6] Adapt build 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/native/Makefile b/native/Makefile -index 6f9ad25..3712a9e 100644 +index 1bea2dc..cb3afed 100644 --- a/native/Makefile +++ b/native/Makefile @@ -97,7 +97,7 @@ CDEFINES=-D_REENTRANT @@ -20,7 +20,7 @@ index 6f9ad25..3712a9e 100644 ifeq ($(DYNAMIC_LIBFFI),true) CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo) LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi) -@@ -455,7 +455,6 @@ $(BUILD)/$(JNA_JNI_VERSION).stamp: +@@ -457,7 +457,6 @@ $(BUILD)/$(JNA_JNI_VERSION).stamp: $(LIBRARY): $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LD) $(LDFLAGS) $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LIBS) @@ -29,5 +29,5 @@ index 6f9ad25..3712a9e 100644 $(TESTLIB): $(BUILD)/testlib.o $(LD) $(LDFLAGS) $< $(LIBS) -- -2.14.3 +2.20.1 diff --git a/0002-Load-system-library.patch b/0002-Load-system-library.patch index 717300c..b8785b0 100644 --- a/0002-Load-system-library.patch +++ b/0002-Load-system-library.patch @@ -4,21 +4,19 @@ Date: Mon, 16 Jan 2017 11:31:32 +0100 Subject: [PATCH 2/6] Load system library --- - src/com/sun/jna/Native.java | 97 ++------------------------------------------- - 1 file changed, 4 insertions(+), 93 deletions(-) + 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 91b195f..9ac3815 100644 +index eae060f..11bcc5b 100644 --- a/src/com/sun/jna/Native.java +++ b/src/com/sun/jna/Native.java -@@ -829,101 +829,12 @@ public final class Native implements Version { - - /** +@@ -912,84 +912,12 @@ public final class Native implements Version { * Loads the JNA stub library. -- * First tries jna.boot.library.path, then the system path, then from the -- * jar file. -+ * MODIFIED FROM UPSTREAM - we rip out all sorts of gunk here that is -+ * unnecessary when JNA is properly installed with the OS. + * First tries jna.boot.library.path, then the system path, then from the + * jar file. ++ * MODIFIED FROM UPSTREAM - we rip out all sorts of gunk here that is ++ * unnecessary when JNA is properly installed with the OS. */ private static void loadNativeDispatchLibrary() { - if (!Boolean.getBoolean("jna.nounpack")) { @@ -26,7 +24,7 @@ index 91b195f..9ac3815 100644 - removeTemporaryFiles(); - } - catch(IOException e) { -- System.err.println("JNA Warning: IOException removing temporary files: " + e.getMessage()); +- LOG.log(Level.WARNING, "JNA Warning: IOException removing temporary files", e); - } - } - @@ -39,20 +37,14 @@ index 91b195f..9ac3815 100644 - String dir = dirs.nextToken(); - File file = new File(new File(dir), System.mapLibraryName(libName).replace(".dylib", ".jnilib")); - String path = file.getAbsolutePath(); -- if (DEBUG_JNA_LOAD) { -- System.out.println("Looking in " + path); -- } +- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Looking in {0}", path); - if (file.exists()) { - try { -- if (DEBUG_JNA_LOAD) { -- System.out.println("Trying " + path); -- } +- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Trying {0}", path); - System.setProperty("jnidispatch.path", path); - System.load(path); - jnidispatchPath = path; -- if (DEBUG_JNA_LOAD) { -- System.out.println("Found jnidispatch at " + path); -- } +- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Found jnidispatch at {0}", path); - return; - } catch (UnsatisfiedLinkError ex) { - // Not a problem if already loaded in anoteher class loader @@ -70,37 +62,28 @@ index 91b195f..9ac3815 100644 - ext = "dylib"; - } - path = path.substring(0, path.lastIndexOf(orig)) + ext; -- if (DEBUG_JNA_LOAD) { -- System.out.println("Looking in " + path); -- } +- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Looking in {0}", path); - if (new File(path).exists()) { - try { -- if (DEBUG_JNA_LOAD) { -- System.out.println("Trying " + path); -- } +- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Trying {0}", path); - System.setProperty("jnidispatch.path", path); - System.load(path); - jnidispatchPath = path; -- if (DEBUG_JNA_LOAD) { -- System.out.println("Found jnidispatch at " + path); -- } +- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Found jnidispatch at {0}", path); - return; - } catch (UnsatisfiedLinkError ex) { -- System.err.println("File found at " + path + " but not loadable: " + ex.getMessage()); +- LOG.log(Level.WARNING, "File found at " + path + " but not loadable: " + ex.getMessage(), ex); - } - } - } - } - } -- if (!Boolean.getBoolean("jna.nosys")) { +- String jnaNosys = System.getProperty("jna.nosys", "true"); +- if ((!Boolean.parseBoolean(jnaNosys)) || Platform.isAndroid()) { - try { -- if (DEBUG_JNA_LOAD) { -- System.out.println("Trying (via loadLibrary) " + libName); -- } +- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Trying (via loadLibrary) {0}", libName); - System.loadLibrary(libName); -- if (DEBUG_JNA_LOAD) { -- System.out.println("Found jnidispatch on system path"); -- } +- LOG.log(DEBUG_JNA_LOAD_LEVEL, "Found jnidispatch on system path"); - return; - } - catch(UnsatisfiedLinkError e) { @@ -113,10 +96,10 @@ index 91b195f..9ac3815 100644 - throw new UnsatisfiedLinkError("Unable to locate JNA native support library"); - } + jnidispatchPath = "@LIBDIR@/" + System.mapLibraryName("jnidispatch"); -+ System.load(jnidispatchPath); ++ System.load(jnidispatchPath); } static final String JNA_TMPLIB_PREFIX = "jna"; -- -2.14.3 +2.20.1 diff --git a/0003-Tests-headless.patch b/0003-Tests-headless.patch index f879f9d..9a4645d 100644 --- a/0003-Tests-headless.patch +++ b/0003-Tests-headless.patch @@ -8,17 +8,17 @@ Subject: [PATCH 3/6] Tests headless 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index 63a9cc7..ab9cf52 100644 +index d5c2bbc..835c02b 100644 --- a/build.xml +++ b/build.xml -@@ -1128,6 +1128,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc +@@ -1202,6 +1202,7 @@ cd .. + - + -- -2.14.3 +2.20.1 diff --git a/0004-Fix-javadoc-build.patch b/0004-Fix-javadoc-build.patch index f68b0be..a51113d 100644 --- a/0004-Fix-javadoc-build.patch +++ b/0004-Fix-javadoc-build.patch @@ -8,10 +8,10 @@ Subject: [PATCH 4/6] Fix javadoc build 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index ab9cf52..d1fe4aa 100644 +index 835c02b..cecafd0 100644 --- a/build.xml +++ b/build.xml -@@ -1233,6 +1233,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc +@@ -1307,6 +1307,7 @@ cd .. @@ -20,5 +20,5 @@ index ab9cf52..d1fe4aa 100644 -- -2.14.3 +2.20.1 diff --git a/0005-Fix-duplicate-manifest-entry.patch b/0005-Fix-duplicate-manifest-entry.patch index fce0d78..01ea16c 100644 --- a/0005-Fix-duplicate-manifest-entry.patch +++ b/0005-Fix-duplicate-manifest-entry.patch @@ -3,18 +3,17 @@ From: Mikolaj Izdebski Date: Mon, 10 Jul 2017 11:48:43 +0200 Subject: [PATCH 5/6] Fix duplicate manifest entry -Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1469022 --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml -index d1fe4aa..c0a0b78 100644 +index cecafd0..ad5794e 100644 --- a/build.xml +++ b/build.xml -@@ -571,9 +571,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc - includes="*jnidispatch*" - prefix="com/sun/jna/w32ce-arm"/> +@@ -586,9 +586,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc + includes="LICENSE,LGPL2.1,AL2.0" + prefix="META-INF"/> - + @@ -25,5 +24,5 @@ index d1fe4aa..c0a0b78 100644 -- -2.14.3 +2.20.1 diff --git a/0006-Remove-Werror.patch b/0006-Remove-Werror.patch index 60f7f02..951e600 100644 --- a/0006-Remove-Werror.patch +++ b/0006-Remove-Werror.patch @@ -8,15 +8,16 @@ Subject: [PATCH 6/6] Remove -Werror 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/native/Makefile b/native/Makefile -index 3712a9e..73a906f 100644 +index cb3afed..028c201 100644 --- a/native/Makefile +++ b/native/Makefile -@@ -336,10 +336,10 @@ endif - ifeq ($(CC),gcc) +@@ -337,11 +337,11 @@ ifeq ($(CC),gcc) GCC_MAJOR_VERSION = $(shell gcc -dumpversion | cut -f 1 -d '.') ifneq ($(GCC_MAJOR_VERSION),4) -- 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 + 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 + endif endif else - LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable @@ -25,5 +26,5 @@ index 3712a9e..73a906f 100644 # Enable 64-bit builds if the arch demands it -- -2.14.3 +2.20.1 diff --git a/jna.spec b/jna.spec index 95ac17f..b3d0058 100644 --- a/jna.spec +++ b/jna.spec @@ -2,18 +2,20 @@ %bcond_without reflections Name: jna -Version: 4.5.1 -Release: 10%{?dist} +Version: 5.4.0 +Release: 1%{?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 + URL: https://github.com/java-native-access/jna/ # ./generate-tarball.sh Source0: %{name}-%{version}-clean.tar.xz Source1: package-list Source2: generate-tarball.sh + Patch0: 0001-Adapt-build.patch # This patch is Fedora-specific for now until we get the huge # JNI library location mess sorted upstream @@ -78,7 +80,7 @@ This package contains the contributed examples for %{name}. %prep -%setup -q -n %{name}-%{version} +%setup -q cp %{SOURCE1} . %patch0 -p1 -b .build %patch1 -p1 -b .loadlib @@ -119,11 +121,14 @@ export JAVA_HOME=%{_jvmdir}/java # We pass -Ddynlink.native which comes from our patch because # upstream doesn't want to default to dynamic linking. +# -Drelease removes the .SNAPSHOT suffix from maven artifact names #ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true native compile javadoc jar contrib-jars -ant -Dcompatibility=1.6 -Dplatform.compatibility=1.6 -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true native dist +ant -Drelease -Dcompatibility=1.6 -Dplatform.compatibility=1.6\ + -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true native dist # remove compiled contribs find contrib -name build -exec rm -rf {} \; || : + %install # NOTE: JNA has highly custom code to look for native jars in this # directory. Since this roughly matches the jpackage guidelines, @@ -154,6 +159,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Aug 01 2019 Marian Koncek - 5.4.0-1 +- Update to upstream version 5.4.0 + * Thu Jul 25 2019 Fedora Release Engineering - 4.5.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 6c60b2c..2c55cf8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-4.5.1-clean.tar.xz) = e27a5635ebcb746dd7c1de9d408ef803039fe46b865aca4d7352ffda6439f1b4d3e19b2543d7de2790505c3e5d1f4d4749b5cc3e5d2bccfba878d6c6bcb2fcdd +SHA512 (jna-5.4.0-clean.tar.xz) = bcf01008965e83eb954a212bc58862c923e9c72b1486eebccbe000b6eeda356b4b5ee22a1190ec59bdd4d47249fdd0e1b6b2f9fe7cc1eb82a0fc50062f5b6b12 From fd443bda621356a068c694968e184e97e3bdecce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 06:15:28 +0000 Subject: [PATCH 20/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index b3d0058..121a235 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.4.0 -Release: 1%{?dist} +Release: 2%{?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, @@ -159,6 +159,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 5.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 01 2019 Marian Koncek - 5.4.0-1 - Update to upstream version 5.4.0 From f3cba3e9a2cf81b006fd502f5bcfa283d473ce4d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 2 Apr 2020 23:25:43 +0000 Subject: [PATCH 21/67] Pass C compiler to ant __cc defaults to gcc, so this does not change the current build at all, but it allows us to to do test builds with other compilers simply by redefining the __cc macro. --- jna.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jna.spec b/jna.spec index 121a235..603bff2 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.4.0 -Release: 2%{?dist} +Release: 3%{?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, @@ -124,7 +124,7 @@ export JAVA_HOME=%{_jvmdir}/java # -Drelease removes the .SNAPSHOT suffix from maven artifact names #ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true native compile javadoc jar contrib-jars ant -Drelease -Dcompatibility=1.6 -Dplatform.compatibility=1.6\ - -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true native dist + -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -DCC=%{__cc} native dist # remove compiled contribs find contrib -name build -exec rm -rf {} \; || : @@ -159,6 +159,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Apr 02 2020 Tom Stellard - 5.4.0-3 +- Pass C compiler to ant + * Wed Jan 29 2020 Fedora Release Engineering - 5.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 30673a6841158ccf21a6311a6b80cb0518e91f49 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 9 Jul 2020 15:03:31 +0100 Subject: [PATCH 22/67] Fix conditional build without reflections --- jna.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jna.spec b/jna.spec index 603bff2..d7612df 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.4.0 -Release: 3%{?dist} +Release: 4%{?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, @@ -104,7 +104,6 @@ build-jar-repository -s -p lib junit reflections build-jar-repository -s -p lib junit rm test/com/sun/jna/StructureFieldOrderInspector.java rm test/com/sun/jna/StructureFieldOrderInspectorTest.java -rm contrib/platform/test/com/sun/jna/platform/StructureFieldOrderTest.java %endif ln -s $(xmvn-resolve ant:ant:1.10.5) lib/ant.jar @@ -159,6 +158,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Jul 09 2020 Mat Booth - 5.4.0-4 +- Fix conditional build without reflections + * Thu Apr 02 2020 Tom Stellard - 5.4.0-3 - Pass C compiler to ant From 28a1a01c658e3a15b8a867486ff70d15391b0990 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 00:38:00 +0200 Subject: [PATCH 23/67] Rebuilt for JDK-11 --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index d7612df..24c494d 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.4.0 -Release: 4%{?dist} +Release: 5%{?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, @@ -158,6 +158,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Fri Jul 10 2020 Jiri Vanek - 5.4.0-5 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Thu Jul 09 2020 Mat Booth - 5.4.0-4 - Fix conditional build without reflections From ea3bab24c1165b66dffcdb500e6207e5ba396ae7 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 23 Jul 2020 12:34:23 +0200 Subject: [PATCH 24/67] remove special-cased aarch32 build for java-1.8.0-openjdk --- jna.spec | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/jna.spec b/jna.spec index 24c494d..99c3a61 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.4.0 -Release: 5%{?dist} +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, @@ -49,11 +49,6 @@ BuildRequires: libXt-devel BuildRequires: reflections %endif -%ifarch %{arm} -# Speed up builds on 32bit arm -BuildRequires: java-1.8.0-openjdk-aarch32-devel -%endif - %description JNA provides Java programs easy access to native shared libraries (DLLs on Windows) without writing anything but Java code. JNA's @@ -111,13 +106,6 @@ cp lib/native/aix-ppc64.jar lib/clover.jar %build -# Ensure we get the jit on arm -%ifarch %{arm} -export JAVA_HOME=$(ls -d %{_jvmdir}/java-1.8.0-openjdk-aarch32*) -%else -export JAVA_HOME=%{_jvmdir}/java -%endif - # We pass -Ddynlink.native which comes from our patch because # upstream doesn't want to default to dynamic linking. # -Drelease removes the .SNAPSHOT suffix from maven artifact names @@ -158,6 +146,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Jul 23 2020 Fabio Valentini - 5.4.0-6 +- Remove special-cased aarch32 build for java-1.8.0-openjdk. + * Fri Jul 10 2020 Jiri Vanek - 5.4.0-5 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 82a0a123311fb18e15ac6dc722a3f6628951199e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 02:25:46 +0000 Subject: [PATCH 25/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 99c3a61..971c8de 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.4.0 -Release: 6%{?dist} +Release: 7%{?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, @@ -146,6 +146,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 5.4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 23 2020 Fabio Valentini - 5.4.0-6 - Remove special-cased aarch32 build for java-1.8.0-openjdk. From c402ef008b67cb071e26fbe65fa79024692163ff Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Thu, 7 Jan 2021 11:17:12 +0100 Subject: [PATCH 26/67] Rebased to version 5.6.0 (#1767170) --- .gitignore | 1 + 0004-Fix-javadoc-build.patch | 2 +- jna.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4286e61..8054ca8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ jna-3.2.7.tar.bz2 /jna-4.5.1-clean.tar.xz /jna-5.2.0-clean.tar.xz /jna-5.4.0-clean.tar.xz +/jna-5.6.0-clean.tar.xz diff --git a/0004-Fix-javadoc-build.patch b/0004-Fix-javadoc-build.patch index a51113d..dc5ab54 100644 --- a/0004-Fix-javadoc-build.patch +++ b/0004-Fix-javadoc-build.patch @@ -17,7 +17,7 @@ index 835c02b..cecafd0 100644 + - + -- 2.20.1 diff --git a/jna.spec b/jna.spec index 971c8de..3d942dc 100644 --- a/jna.spec +++ b/jna.spec @@ -2,8 +2,8 @@ %bcond_without reflections Name: jna -Version: 5.4.0 -Release: 7%{?dist} +Version: 5.6.0 +Release: 1%{?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, @@ -146,6 +146,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Jan 07 2021 Ondrej Dubaj - 5.6.0-1 +- Rebase to version 5.6.0 + * Tue Jul 28 2020 Fedora Release Engineering - 5.4.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 2c55cf8..55ec522 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-5.4.0-clean.tar.xz) = bcf01008965e83eb954a212bc58862c923e9c72b1486eebccbe000b6eeda356b4b5ee22a1190ec59bdd4d47249fdd0e1b6b2f9fe7cc1eb82a0fc50062f5b6b12 +SHA512 (jna-5.6.0-clean.tar.xz) = d39877a11cfd76a9c34a6c828dffd997d906c0c6251c5b4356393e563711317239ad104c1870509e137539aed1d27fec0616073ad6e5e5cc386b969cdaa3423a From 146b22d8d7be3a96af11f7bb8d421b4034348efe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:56:47 +0000 Subject: [PATCH 27/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 3d942dc..ed2a075 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.6.0 -Release: 1%{?dist} +Release: 2%{?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, @@ -146,6 +146,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 5.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jan 07 2021 Ondrej Dubaj - 5.6.0-1 - Rebase to version 5.6.0 From 26284104c0b2a7eb93c1996eaeb0bfcdb0c3714e Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Wed, 12 May 2021 14:13:53 +0200 Subject: [PATCH 28/67] Remove maven-javadoc-plugin dependency --- jna.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index ed2a075..832c469 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.6.0 -Release: 2%{?dist} +Release: 3%{?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, @@ -104,6 +104,8 @@ ln -s $(xmvn-resolve ant:ant:1.10.5) lib/ant.jar cp lib/native/aix-ppc64.jar lib/clover.jar +%pom_remove_plugin -r :maven-javadoc-plugin parent + %build # We pass -Ddynlink.native which comes from our patch because @@ -146,6 +148,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Wed May 12 2021 Ondrej Dubaj - 5.6.0-3 +- Remove maven-javadoc-plugin dependency + * Tue Jan 26 2021 Fedora Release Engineering - 5.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3904c8696c956e1a47433f1ea00a7c50a180aeda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:10:40 +0000 Subject: [PATCH 29/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 832c469..2b17eb0 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.6.0 -Release: 3%{?dist} +Release: 4%{?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, @@ -148,6 +148,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 5.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed May 12 2021 Ondrej Dubaj - 5.6.0-3 - Remove maven-javadoc-plugin dependency From b56a74f4d145cb1e8f209eacbbf6a940d43a127c Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Fri, 17 Sep 2021 11:48:36 +0200 Subject: [PATCH 30/67] Rebase to version 5.9.0 --- .gitignore | 1 + 0005-Fix-duplicate-manifest-entry.patch | 10 +++++----- 0006-Remove-Werror.patch | 10 +++++----- jna.spec | 11 +++++++++-- sources | 2 +- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 8054ca8..72fb1f5 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ jna-3.2.7.tar.bz2 /jna-5.2.0-clean.tar.xz /jna-5.4.0-clean.tar.xz /jna-5.6.0-clean.tar.xz +/jna-5.9.0-clean.tar.xz diff --git a/0005-Fix-duplicate-manifest-entry.patch b/0005-Fix-duplicate-manifest-entry.patch index 01ea16c..abcefa8 100644 --- a/0005-Fix-duplicate-manifest-entry.patch +++ b/0005-Fix-duplicate-manifest-entry.patch @@ -8,10 +8,10 @@ Subject: [PATCH 5/6] Fix duplicate manifest entry 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml -index cecafd0..ad5794e 100644 +index aa5aa00..9deb2b7 100644 --- a/build.xml +++ b/build.xml -@@ -586,9 +586,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"/> @@ -20,9 +20,9 @@ index cecafd0..ad5794e 100644 - + - - - + + + -- 2.20.1 diff --git a/0006-Remove-Werror.patch b/0006-Remove-Werror.patch index 951e600..cfc6c9f 100644 --- a/0006-Remove-Werror.patch +++ b/0006-Remove-Werror.patch @@ -8,15 +8,15 @@ Subject: [PATCH 6/6] Remove -Werror 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.20.1 +2.31.1 diff --git a/jna.spec b/jna.spec index 2b17eb0..c382975 100644 --- a/jna.spec +++ b/jna.spec @@ -2,8 +2,8 @@ %bcond_without reflections Name: jna -Version: 5.6.0 -Release: 4%{?dist} +Version: 5.9.0 +Release: 1%{?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, @@ -45,6 +45,8 @@ BuildRequires: ant-junit BuildRequires: junit BuildRequires: libX11-devel BuildRequires: libXt-devel +BuildRequires: objectweb-asm +BuildRequires: hamcrest %if %{with reflections} BuildRequires: reflections %endif @@ -101,6 +103,8 @@ 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 cp lib/native/aix-ppc64.jar lib/clover.jar @@ -148,6 +152,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Fri Sep 17 2021 Ondrej Dubaj - 5.9.0-1 +- Rebase to version 5.9.0 + * Thu Jul 22 2021 Fedora Release Engineering - 5.6.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 55ec522..dab34c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-5.6.0-clean.tar.xz) = d39877a11cfd76a9c34a6c828dffd997d906c0c6251c5b4356393e563711317239ad104c1870509e137539aed1d27fec0616073ad6e5e5cc386b969cdaa3423a +SHA512 (jna-5.9.0-clean.tar.xz) = dddd61404e53d6bb20e471a2f205aaf7443f103b409f91594dd16188932c08e2c0305f72e133a1c2bbdbbbf63a8dc7c13f249982d7bce8eb3445c6222cc2589a From fd68877ab9e64217b78d05752a1bf6ff0dba56a7 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Wed, 1 Dec 2021 17:25:50 +0100 Subject: [PATCH 31/67] Resolve reflections dependecy --- jna.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index c382975..5a4eb7e 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.9.0 -Release: 1%{?dist} +Release: 2%{?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, @@ -105,6 +105,7 @@ rm test/com/sun/jna/StructureFieldOrderInspectorTest.java 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 @@ -152,6 +153,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Wed Dec 1 2021 Zuzana Miklankova - 5.9.0-2 +- Rebuild with resolved reflections dependecy + * Fri Sep 17 2021 Ondrej Dubaj - 5.9.0-1 - Rebase to version 5.9.0 From be9d4eff9a0a49f9c8f3ba6e671e87ed102aa42c Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Wed, 1 Dec 2021 16:49:28 +0100 Subject: [PATCH 32/67] support openjdk 17 --- 0007-Support-openjdk-17.patch | 227 ++++++++++++++++++++++++++++++++++ jna.spec | 10 +- 2 files changed, 235 insertions(+), 2 deletions(-) create mode 100644 0007-Support-openjdk-17.patch diff --git a/0007-Support-openjdk-17.patch b/0007-Support-openjdk-17.patch new file mode 100644 index 0000000..9345b59 --- /dev/null +++ b/0007-Support-openjdk-17.patch @@ -0,0 +1,227 @@ +From d47b8f0db649856949a27fac8f2958da8b98b964 Mon Sep 17 00:00:00 2001 +From: Zuzana Miklankova +Date: Wed, 1 Dec 2021 15:24:01 +0100 +Subject: [PATCH] patch + +--- + contrib/alphamaskdemo/build.xml | 2 +- + contrib/balloonmanagerdemo/build.xml | 2 +- + contrib/balloontips/build.xml | 2 +- + contrib/dnddemo/build.xml | 2 +- + contrib/monitordemo/build.xml | 2 +- + contrib/msoffice/build.xml | 2 +- + contrib/native_window_msg/build.xml | 2 +- + contrib/ntservice/nbproject/project.properties | 4 ++-- + contrib/platform/nbproject/project.properties | 4 ++-- + contrib/shapedwindowdemo/build.xml | 2 +- + contrib/w32printing/build.xml | 2 +- + contrib/w32windowhooks/build.xml | 2 +- + contrib/x11/build.xml | 2 +- + nbproject/project.xml | 4 ++-- + 14 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/contrib/alphamaskdemo/build.xml b/contrib/alphamaskdemo/build.xml +index a9bead9ea..8f119be82 100644 +--- a/contrib/alphamaskdemo/build.xml ++++ b/contrib/alphamaskdemo/build.xml +@@ -37,7 +37,7 @@ + + + +- + + +diff --git a/contrib/balloonmanagerdemo/build.xml b/contrib/balloonmanagerdemo/build.xml +index 7f53f329e..11c8c5d4f 100644 +--- a/contrib/balloonmanagerdemo/build.xml ++++ b/contrib/balloonmanagerdemo/build.xml +@@ -37,7 +37,7 @@ + + + +- + + +diff --git a/contrib/balloontips/build.xml b/contrib/balloontips/build.xml +index 594b65f95..34b117f2c 100644 +--- a/contrib/balloontips/build.xml ++++ b/contrib/balloontips/build.xml +@@ -37,7 +37,7 @@ + + + +- + + +diff --git a/contrib/dnddemo/build.xml b/contrib/dnddemo/build.xml +index 4fab70a83..ae84b615a 100644 +--- a/contrib/dnddemo/build.xml ++++ b/contrib/dnddemo/build.xml +@@ -37,7 +37,7 @@ + + + +- + + +diff --git a/contrib/monitordemo/build.xml b/contrib/monitordemo/build.xml +index cb5ad9e77..2ad6a9de6 100644 +--- a/contrib/monitordemo/build.xml ++++ b/contrib/monitordemo/build.xml +@@ -37,7 +37,7 @@ + + + +- + + +diff --git a/contrib/msoffice/build.xml b/contrib/msoffice/build.xml +index 50452b084..c65c3f241 100644 +--- a/contrib/msoffice/build.xml ++++ b/contrib/msoffice/build.xml +@@ -37,7 +37,7 @@ + + + +- + + +diff --git a/contrib/native_window_msg/build.xml b/contrib/native_window_msg/build.xml +index 15bdb95b6..a35cdbd82 100644 +--- a/contrib/native_window_msg/build.xml ++++ b/contrib/native_window_msg/build.xml +@@ -36,7 +36,7 @@ + + + +- + + +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/platform/nbproject/project.properties b/contrib/platform/nbproject/project.properties +index fe6ceb756..da40cd9a9 100644 +--- a/contrib/platform/nbproject/project.properties ++++ b/contrib/platform/nbproject/project.properties +@@ -52,8 +52,8 @@ javac.classpath=\ + # Space-separated list of extra javac options + javac.compilerargs=-XDignore.symbol.file + javac.deprecation=false +-javac.source=1.6 +-javac.target=1.6 ++javac.source=1.8 ++javac.target=1.8 + javac.test.classpath=\ + ${javac.classpath}:\ + ${file.reference.jna-test.jar}:\ +diff --git a/contrib/shapedwindowdemo/build.xml b/contrib/shapedwindowdemo/build.xml +index cbcb1eea5..7fe70185a 100644 +--- a/contrib/shapedwindowdemo/build.xml ++++ b/contrib/shapedwindowdemo/build.xml +@@ -37,7 +37,7 @@ + + + +- + + +diff --git a/contrib/w32printing/build.xml b/contrib/w32printing/build.xml +index 5ac1fca8a..aa1310644 100644 +--- a/contrib/w32printing/build.xml ++++ b/contrib/w32printing/build.xml +@@ -27,7 +27,7 @@ + + + +- + + +diff --git a/contrib/w32windowhooks/build.xml b/contrib/w32windowhooks/build.xml +index cc77d70eb..c8d983805 100644 +--- a/contrib/w32windowhooks/build.xml ++++ b/contrib/w32windowhooks/build.xml +@@ -37,7 +37,7 @@ + + + +- + + +diff --git a/contrib/x11/build.xml b/contrib/x11/build.xml +index 6f9318681..f080928af 100644 +--- a/contrib/x11/build.xml ++++ b/contrib/x11/build.xml +@@ -46,7 +46,7 @@ + + + +- + + +diff --git a/nbproject/project.xml b/nbproject/project.xml +index c05eefc13..9cd22da94 100644 +--- a/nbproject/project.xml ++++ b/nbproject/project.xml +@@ -141,7 +141,7 @@ auxiliary.show.customizer.message= + + src + src +- 1.6 ++ 1.8 + + + test +@@ -152,7 +152,7 @@ auxiliary.show.customizer.message= + + ant-tools-src + src:lib/ant.jar:lib/asm-8.0.1.jar +- 1.6 ++ 1.8 + + + +-- +2.31.1 + diff --git a/jna.spec b/jna.spec index 5a4eb7e..2887424 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.9.0 -Release: 2%{?dist} +Release: 3%{?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, @@ -33,6 +33,8 @@ Patch4: 0005-Fix-duplicate-manifest-entry.patch # We don't want newly added warnings to break our build Patch5: 0006-Remove-Werror.patch +Patch6: 0007-Support-openjdk-17.patch + # We manually require libffi because find-requires doesn't work # inside jars. Requires: libffi @@ -85,6 +87,7 @@ cp %{SOURCE1} . %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 chmod -Rf a+rX,u+w,g-w,o-w . sed -i 's|@LIBDIR@|%{_libdir}/%{name}|' src/com/sun/jna/Native.java @@ -117,7 +120,7 @@ cp lib/native/aix-ppc64.jar lib/clover.jar # upstream doesn't want to default to dynamic linking. # -Drelease removes the .SNAPSHOT suffix from maven artifact names #ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true native compile javadoc jar contrib-jars -ant -Drelease -Dcompatibility=1.6 -Dplatform.compatibility=1.6\ +ant -Drelease -Dcompatibility=1.8 -Dplatform.compatibility=1.8\ -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -DCC=%{__cc} native dist # remove compiled contribs find contrib -name build -exec rm -rf {} \; || : @@ -153,6 +156,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Wed Dec 1 2021 Zuzana Miklankova - 5.9.0-3 +- Support openjdk-17 with dropping 1.6 compatibility + * Wed Dec 1 2021 Zuzana Miklankova - 5.9.0-2 - Rebuild with resolved reflections dependecy From 58e25ca9c52f70c0c11a87ef937189741052cf19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 8 Jan 2022 11:12:08 +0100 Subject: [PATCH 33/67] Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 2887424..85af3ae 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.9.0 -Release: 3%{?dist} +Release: 4%{?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, @@ -156,6 +156,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Sat Jan 08 2022 Miro Hrončok - 5.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + * Wed Dec 1 2021 Zuzana Miklankova - 5.9.0-3 - Support openjdk-17 with dropping 1.6 compatibility From d7eef977ecdbc6a368e0872d0ac7f311e118f4fe Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Wed, 12 Jan 2022 10:21:39 +0100 Subject: [PATCH 34/67] Rebase to version 5.10.0 --- .gitignore | 1 + 0007-Support-openjdk-17.patch | 272 ++++++++++++++++++---------------- jna.spec | 7 +- sources | 2 +- 4 files changed, 154 insertions(+), 128 deletions(-) diff --git a/.gitignore b/.gitignore index 72fb1f5..9ef85cf 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ jna-3.2.7.tar.bz2 /jna-5.4.0-clean.tar.xz /jna-5.6.0-clean.tar.xz /jna-5.9.0-clean.tar.xz +/jna-5.10.0-clean.tar.xz diff --git a/0007-Support-openjdk-17.patch b/0007-Support-openjdk-17.patch index 9345b59..4c76bcd 100644 --- a/0007-Support-openjdk-17.patch +++ b/0007-Support-openjdk-17.patch @@ -1,116 +1,130 @@ -From d47b8f0db649856949a27fac8f2958da8b98b964 Mon Sep 17 00:00:00 2001 +From 511d4b372a2ea1e79b850d2790ce29be9280cd75 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova -Date: Wed, 1 Dec 2021 15:24:01 +0100 -Subject: [PATCH] patch +Date: Mon, 10 Jan 2022 07:46:11 +0100 +Subject: [PATCH] Support-openjdk-17 --- - contrib/alphamaskdemo/build.xml | 2 +- - contrib/balloonmanagerdemo/build.xml | 2 +- - contrib/balloontips/build.xml | 2 +- - contrib/dnddemo/build.xml | 2 +- - contrib/monitordemo/build.xml | 2 +- - contrib/msoffice/build.xml | 2 +- - contrib/native_window_msg/build.xml | 2 +- + 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/platform/nbproject/project.properties | 4 ++-- - contrib/shapedwindowdemo/build.xml | 2 +- - contrib/w32printing/build.xml | 2 +- - contrib/w32windowhooks/build.xml | 2 +- - contrib/x11/build.xml | 2 +- + contrib/shapedwindowdemo/build.xml | 4 ++-- + contrib/w32printing/build.xml | 4 ++-- + contrib/w32windowhooks/build.xml | 4 ++-- + contrib/x11/build.xml | 4 ++-- nbproject/project.xml | 4 ++-- - 14 files changed, 17 insertions(+), 17 deletions(-) + 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/contrib/alphamaskdemo/build.xml b/contrib/alphamaskdemo/build.xml -index a9bead9ea..8f119be82 100644 +index 2186daadd..9e4a2072e 100644 --- a/contrib/alphamaskdemo/build.xml +++ b/contrib/alphamaskdemo/build.xml -@@ -37,7 +37,7 @@ - - - -- - - +@@ -9,8 +9,8 @@ + + + +- +- ++ ++ + + + diff --git a/contrib/balloonmanagerdemo/build.xml b/contrib/balloonmanagerdemo/build.xml -index 7f53f329e..11c8c5d4f 100644 +index e9cba2c7b..37d0d0e7a 100644 --- a/contrib/balloonmanagerdemo/build.xml +++ b/contrib/balloonmanagerdemo/build.xml -@@ -37,7 +37,7 @@ - - - -- - - +@@ -9,8 +9,8 @@ + + + +- +- ++ ++ + + + diff --git a/contrib/balloontips/build.xml b/contrib/balloontips/build.xml -index 594b65f95..34b117f2c 100644 +index e5b64b11d..8fa15d576 100644 --- a/contrib/balloontips/build.xml +++ b/contrib/balloontips/build.xml -@@ -37,7 +37,7 @@ - - - -- - - +@@ -9,8 +9,8 @@ + + + +- +- ++ ++ + + + diff --git a/contrib/dnddemo/build.xml b/contrib/dnddemo/build.xml -index 4fab70a83..ae84b615a 100644 +index 1feacb3a9..151194fcd 100644 --- a/contrib/dnddemo/build.xml +++ b/contrib/dnddemo/build.xml -@@ -37,7 +37,7 @@ - - - -- - - +@@ -9,8 +9,8 @@ + + + +- +- ++ ++ + + + diff --git a/contrib/monitordemo/build.xml b/contrib/monitordemo/build.xml -index cb5ad9e77..2ad6a9de6 100644 +index 6e7a5c1b5..f7228c7c9 100644 --- a/contrib/monitordemo/build.xml +++ b/contrib/monitordemo/build.xml -@@ -37,7 +37,7 @@ - - - -- - - +@@ -9,8 +9,8 @@ + + + +- +- ++ ++ + + + diff --git a/contrib/msoffice/build.xml b/contrib/msoffice/build.xml -index 50452b084..c65c3f241 100644 +index fa0387b61..06627c1cf 100644 --- a/contrib/msoffice/build.xml +++ b/contrib/msoffice/build.xml -@@ -37,7 +37,7 @@ - - - -- - - +@@ -9,8 +9,8 @@ + + + +- +- ++ ++ + + + diff --git a/contrib/native_window_msg/build.xml b/contrib/native_window_msg/build.xml -index 15bdb95b6..a35cdbd82 100644 +index 19e99db68..066da4065 100644 --- a/contrib/native_window_msg/build.xml +++ b/contrib/native_window_msg/build.xml -@@ -36,7 +36,7 @@ - - - -- - - +@@ -9,8 +9,8 @@ + + + +- +- ++ ++ + + + diff --git a/contrib/ntservice/nbproject/project.properties b/contrib/ntservice/nbproject/project.properties index 587ae2b4d..d30a26c83 100644 --- a/contrib/ntservice/nbproject/project.properties @@ -149,57 +163,65 @@ index fe6ceb756..da40cd9a9 100644 ${javac.classpath}:\ ${file.reference.jna-test.jar}:\ diff --git a/contrib/shapedwindowdemo/build.xml b/contrib/shapedwindowdemo/build.xml -index cbcb1eea5..7fe70185a 100644 +index 24c25b5cc..b4f8c995d 100644 --- a/contrib/shapedwindowdemo/build.xml +++ b/contrib/shapedwindowdemo/build.xml -@@ -37,7 +37,7 @@ - - - -- - - +@@ -9,8 +9,8 @@ + + + +- +- ++ ++ + + + diff --git a/contrib/w32printing/build.xml b/contrib/w32printing/build.xml -index 5ac1fca8a..aa1310644 100644 +index 0af971a82..b76e00709 100644 --- a/contrib/w32printing/build.xml +++ b/contrib/w32printing/build.xml -@@ -27,7 +27,7 @@ - - - -- - - +@@ -9,8 +9,8 @@ + + + +- +- ++ ++ + + + diff --git a/contrib/w32windowhooks/build.xml b/contrib/w32windowhooks/build.xml -index cc77d70eb..c8d983805 100644 +index 668d22daa..992ae4d7e 100644 --- a/contrib/w32windowhooks/build.xml +++ b/contrib/w32windowhooks/build.xml -@@ -37,7 +37,7 @@ - - - -- - - +@@ -9,8 +9,8 @@ + + + +- +- ++ ++ + + + diff --git a/contrib/x11/build.xml b/contrib/x11/build.xml -index 6f9318681..f080928af 100644 +index ecf2ae5f9..95f5e8a88 100644 --- a/contrib/x11/build.xml +++ b/contrib/x11/build.xml -@@ -46,7 +46,7 @@ - - - -- - - +@@ -9,8 +9,8 @@ + + + +- +- ++ ++ + + + diff --git a/nbproject/project.xml b/nbproject/project.xml index c05eefc13..9cd22da94 100644 --- a/nbproject/project.xml diff --git a/jna.spec b/jna.spec index 85af3ae..13b6d0e 100644 --- a/jna.spec +++ b/jna.spec @@ -2,8 +2,8 @@ %bcond_without reflections Name: jna -Version: 5.9.0 -Release: 4%{?dist} +Version: 5.10.0 +Release: 1%{?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, @@ -156,6 +156,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Mon Jan 10 2022 Zuzana Miklankova - 5.10.0-1 +- Rebase to version 5.10.0 + * Sat Jan 08 2022 Miro Hrončok - 5.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 diff --git a/sources b/sources index dab34c1..885957b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-5.9.0-clean.tar.xz) = dddd61404e53d6bb20e471a2f205aaf7443f103b409f91594dd16188932c08e2c0305f72e133a1c2bbdbbbf63a8dc7c13f249982d7bce8eb3445c6222cc2589a +SHA512 (jna-5.10.0-clean.tar.xz) = 47743e2e714f3bc9ef8a8ebfbe4abb3a926095979cf5c7b155a245bd896e0206656a6358d0c9f6bd7886c345ab2aa002d8102870ce7520a2c326ce720b935f75 From 0ca38d942e77cbb936976d48a0368f3d0eb3b766 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:52:52 +0000 Subject: [PATCH 35/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 13b6d0e..a23a70f 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.10.0 -Release: 1%{?dist} +Release: 2%{?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, @@ -156,6 +156,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 5.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jan 10 2022 Zuzana Miklankova - 5.10.0-1 - Rebase to version 5.10.0 From c5254592335d09509d0fd27c63be0abe3320e253 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 21:54:00 +0100 Subject: [PATCH 36/67] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index a23a70f..4a6690d 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.10.0 -Release: 2%{?dist} +Release: 3%{?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, @@ -156,6 +156,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Sat Feb 05 2022 Jiri Vanek - 5.10.0-3 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 5.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 797ad810a360aa996637302545618d958b126ece Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Mon, 28 Mar 2022 10:15:06 +0200 Subject: [PATCH 37/67] Rebase to version 5.11.0 --- .gitignore | 1 + jna.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9ef85cf..1453e98 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ jna-3.2.7.tar.bz2 /jna-5.6.0-clean.tar.xz /jna-5.9.0-clean.tar.xz /jna-5.10.0-clean.tar.xz +/jna-5.11.0-clean.tar.xz diff --git a/jna.spec b/jna.spec index 4a6690d..f4a5e6e 100644 --- a/jna.spec +++ b/jna.spec @@ -2,8 +2,8 @@ %bcond_without reflections Name: jna -Version: 5.10.0 -Release: 3%{?dist} +Version: 5.11.0 +Release: 1%{?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, @@ -156,6 +156,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Mon Mar 28 2022 Zuzana Miklankova - 5.11.0-1 +- Rebase to version 5.11.0 + * Sat Feb 05 2022 Jiri Vanek - 5.10.0-3 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index 885957b..65b4ed4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-5.10.0-clean.tar.xz) = 47743e2e714f3bc9ef8a8ebfbe4abb3a926095979cf5c7b155a245bd896e0206656a6358d0c9f6bd7886c345ab2aa002d8102870ce7520a2c326ce720b935f75 +SHA512 (jna-5.11.0-clean.tar.xz) = 7567750293424d9da352a3a2989fd4a4f19fcf29062eac18c6fd08b68bd916d1d4555f7631506714d7c6e5f84dd973e87ffd71d8187871a273cf2e80f95fc9d3 From 41e3e7904ca208e5b89f06b66d7a35aa656fa8d5 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Mon, 16 May 2022 11:25:37 +0200 Subject: [PATCH 38/67] use version of rpm in pomfiles --- jna.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index f4a5e6e..06d1474 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.11.0 -Release: 1%{?dist} +Release: 2%{?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, @@ -92,6 +92,13 @@ cp %{SOURCE1} . 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 @@ -156,6 +163,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Mon May 16 2022 Zuzana Miklankova - 5.11.0-2 +- Use correct version in provided pom files + * Mon Mar 28 2022 Zuzana Miklankova - 5.11.0-1 - Rebase to version 5.11.0 From bb99af0355d21d617455fdd3a046056e6d2604b8 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Mon, 11 Jul 2022 12:47:02 +0200 Subject: [PATCH 39/67] Use exclusivearch in specfile It is added, because Java in Fedora is dropping i686 support. Resolves: #2104060 --- jna.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jna.spec b/jna.spec index 06d1474..1f2ada5 100644 --- a/jna.spec +++ b/jna.spec @@ -35,6 +35,8 @@ Patch5: 0006-Remove-Werror.patch Patch6: 0007-Support-openjdk-17.patch +ExclusiveArch: %{java_arches} + # We manually require libffi because find-requires doesn't work # inside jars. Requires: libffi From 958596e4786b143e0b32383be8f819d3d5e0475d Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Mon, 11 Jul 2022 15:03:08 +0200 Subject: [PATCH 40/67] Rebase to 5.12.1 Resolves: #2101130 --- .gitignore | 1 + jna.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1453e98..87183a3 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ jna-3.2.7.tar.bz2 /jna-5.9.0-clean.tar.xz /jna-5.10.0-clean.tar.xz /jna-5.11.0-clean.tar.xz +/jna-5.12.1-clean.tar.xz diff --git a/jna.spec b/jna.spec index 1f2ada5..a95405f 100644 --- a/jna.spec +++ b/jna.spec @@ -2,8 +2,8 @@ %bcond_without reflections Name: jna -Version: 5.11.0 -Release: 2%{?dist} +Version: 5.12.1 +Release: 1%{?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, @@ -121,8 +121,6 @@ ln -s $(xmvn-resolve org.reflections:reflections) lib/test/reflections.jar cp lib/native/aix-ppc64.jar lib/clover.jar -%pom_remove_plugin -r :maven-javadoc-plugin parent - %build # We pass -Ddynlink.native which comes from our patch because @@ -165,6 +163,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Mon Jul 11 2022 Zuzana Miklankova - 5.12.1-1 +- Rebase to version 5.12.1 + * Mon May 16 2022 Zuzana Miklankova - 5.11.0-2 - Use correct version in provided pom files diff --git a/sources b/sources index 65b4ed4..063bd63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-5.11.0-clean.tar.xz) = 7567750293424d9da352a3a2989fd4a4f19fcf29062eac18c6fd08b68bd916d1d4555f7631506714d7c6e5f84dd973e87ffd71d8187871a273cf2e80f95fc9d3 +SHA512 (jna-5.12.1-clean.tar.xz) = 5a23178f7f87c3b42a53197cec0cc1c87ea9db30952642ae08cc824638565aae6b3a779c09aab87913855e7ca8819be61671c1cfeac857b10b811e8e7b065b6b From 7bd4fe8e65aab60ddbfb4e79b7ce7771de127cd8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:19:09 +0000 Subject: [PATCH 41/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index a95405f..634985c 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.12.1 -Release: 1%{?dist} +Release: 2%{?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, @@ -163,6 +163,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 5.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jul 11 2022 Zuzana Miklankova - 5.12.1-1 - Rebase to version 5.12.1 From 7e430fdc72d80f945a4587e1d6602e8aca9152e0 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Mon, 16 Jan 2023 09:49:14 +0100 Subject: [PATCH 42/67] Rebase to 5.13.0 Resolves: #2160939 --- .gitignore | 1 + jna.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 87183a3..2c4d409 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ jna-3.2.7.tar.bz2 /jna-5.10.0-clean.tar.xz /jna-5.11.0-clean.tar.xz /jna-5.12.1-clean.tar.xz +/jna-5.13.0-clean.tar.xz diff --git a/jna.spec b/jna.spec index 634985c..1484a73 100644 --- a/jna.spec +++ b/jna.spec @@ -2,8 +2,8 @@ %bcond_without reflections Name: jna -Version: 5.12.1 -Release: 2%{?dist} +Version: 5.13.0 +Release: 1%{?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, @@ -163,6 +163,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Mon Jan 16 2023 Zuzana Miklankova - 5.13.0-1 +- Rebase to version 5.13.0 + * Thu Jul 21 2022 Fedora Release Engineering - 5.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 063bd63..237f9e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-5.12.1-clean.tar.xz) = 5a23178f7f87c3b42a53197cec0cc1c87ea9db30952642ae08cc824638565aae6b3a779c09aab87913855e7ca8819be61671c1cfeac857b10b811e8e7b065b6b +SHA512 (jna-5.13.0-clean.tar.xz) = fdff67802e3f07801a0db7ae4215b0a5954e4238b63d5c02ad4d0b1d84668dcd26c44412bb2b0e86376b71ad2284f1fbefe3370e28b6e7225d06b330fbee6129 From 6eda24cf6625b5bf50cd6caf1947a93bca59b467 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:49:09 +0000 Subject: [PATCH 43/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 1484a73..328a2d1 100644 --- a/jna.spec +++ b/jna.spec @@ -3,7 +3,7 @@ Name: jna Version: 5.13.0 -Release: 1%{?dist} +Release: 2%{?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, @@ -163,6 +163,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 5.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 16 2023 Zuzana Miklankova - 5.13.0-1 - Rebase to version 5.13.0 From 40727f19900e6c71ba4e746e3f99049785dbf0c7 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Wed, 8 Mar 2023 09:20:40 +0100 Subject: [PATCH 44/67] migrated to SPDX license --- jna.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 328a2d1..e8b9dcc 100644 --- a/jna.spec +++ b/jna.spec @@ -8,7 +8,7 @@ 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 From b9cc7c4bbab32d3132987d601fce76795f9820eb Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 16 May 2023 00:52:05 -0400 Subject: [PATCH 45/67] Disable reflections by default in RHEL builds reflections is optional here and unwanted in RHEL. --- jna.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jna.spec b/jna.spec index e8b9dcc..5a238b5 100644 --- a/jna.spec +++ b/jna.spec @@ -1,5 +1,9 @@ # Allow conditionally building without the reflections library +%if %{defined rhel} +%bcond_with reflections +%else %bcond_without reflections +%endif Name: jna Version: 5.13.0 From 8390776d61e3dcf0ee6c4cca9679456f7f2985b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:07:38 +0000 Subject: [PATCH 46/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 5a238b5..75577b4 100644 --- a/jna.spec +++ b/jna.spec @@ -7,7 +7,7 @@ Name: jna Version: 5.13.0 -Release: 2%{?dist} +Release: 3%{?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, @@ -167,6 +167,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 5.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 5.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d2fec8bacd6cc669d95a51bd562d9f16dabb824a Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Mon, 11 Dec 2023 15:52:31 +0100 Subject: [PATCH 47/67] use %patch -P N instead of deprecated %patchN --- jna.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jna.spec b/jna.spec index 75577b4..326c0ef 100644 --- a/jna.spec +++ b/jna.spec @@ -87,13 +87,13 @@ 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 From a3cb1177eea509b421345498cb15204337a65017 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Mon, 11 Dec 2023 15:46:49 +0100 Subject: [PATCH 48/67] Rebase to 5.14.0 version Resolves: #2253929 --- .gitignore | 1 + 0007-Support-openjdk-17.patch | 41 +---------------------------------- jna.spec | 7 ++++-- sources | 2 +- 4 files changed, 8 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 2c4d409..ff411bc 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ jna-3.2.7.tar.bz2 /jna-5.11.0-clean.tar.xz /jna-5.12.1-clean.tar.xz /jna-5.13.0-clean.tar.xz +/jna-5.14.0-clean.tar.xz diff --git a/0007-Support-openjdk-17.patch b/0007-Support-openjdk-17.patch index 4c76bcd..062fae4 100644 --- a/0007-Support-openjdk-17.patch +++ b/0007-Support-openjdk-17.patch @@ -12,13 +12,11 @@ Subject: [PATCH] Support-openjdk-17 contrib/msoffice/build.xml | 4 ++-- contrib/native_window_msg/build.xml | 4 ++-- contrib/ntservice/nbproject/project.properties | 4 ++-- - contrib/platform/nbproject/project.properties | 4 ++-- contrib/shapedwindowdemo/build.xml | 4 ++-- contrib/w32printing/build.xml | 4 ++-- contrib/w32windowhooks/build.xml | 4 ++-- contrib/x11/build.xml | 4 ++-- - nbproject/project.xml | 4 ++-- - 14 files changed, 28 insertions(+), 28 deletions(-) + 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/contrib/alphamaskdemo/build.xml b/contrib/alphamaskdemo/build.xml index 2186daadd..9e4a2072e 100644 @@ -147,21 +145,6 @@ index 587ae2b4d..d30a26c83 100644 file.reference.jna.jar=../../build/jna.jar application.vendor=matthias junit.selected.version=4 -diff --git a/contrib/platform/nbproject/project.properties b/contrib/platform/nbproject/project.properties -index fe6ceb756..da40cd9a9 100644 ---- a/contrib/platform/nbproject/project.properties -+++ b/contrib/platform/nbproject/project.properties -@@ -52,8 +52,8 @@ javac.classpath=\ - # Space-separated list of extra javac options - javac.compilerargs=-XDignore.symbol.file - javac.deprecation=false --javac.source=1.6 --javac.target=1.6 -+javac.source=1.8 -+javac.target=1.8 - javac.test.classpath=\ - ${javac.classpath}:\ - ${file.reference.jna-test.jar}:\ diff --git a/contrib/shapedwindowdemo/build.xml b/contrib/shapedwindowdemo/build.xml index 24c25b5cc..b4f8c995d 100644 --- a/contrib/shapedwindowdemo/build.xml @@ -222,28 +205,6 @@ index ecf2ae5f9..95f5e8a88 100644 -diff --git a/nbproject/project.xml b/nbproject/project.xml -index c05eefc13..9cd22da94 100644 ---- a/nbproject/project.xml -+++ b/nbproject/project.xml -@@ -141,7 +141,7 @@ auxiliary.show.customizer.message= - - src - src -- 1.6 -+ 1.8 - - - test -@@ -152,7 +152,7 @@ auxiliary.show.customizer.message= - - ant-tools-src - src:lib/ant.jar:lib/asm-8.0.1.jar -- 1.6 -+ 1.8 - - - -- 2.31.1 diff --git a/jna.spec b/jna.spec index 326c0ef..e0f47ee 100644 --- a/jna.spec +++ b/jna.spec @@ -6,8 +6,8 @@ %endif Name: jna -Version: 5.13.0 -Release: 3%{?dist} +Version: 5.14.0 +Release: 1%{?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, @@ -167,6 +167,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Mon Dec 11 2023 Zuzana Miklankova - 5.14.0-1 +- Rebase to version 5.14.0 + * Thu Jul 20 2023 Fedora Release Engineering - 5.13.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 237f9e4..15beb3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-5.13.0-clean.tar.xz) = fdff67802e3f07801a0db7ae4215b0a5954e4238b63d5c02ad4d0b1d84668dcd26c44412bb2b0e86376b71ad2284f1fbefe3370e28b6e7225d06b330fbee6129 +SHA512 (jna-5.14.0-clean.tar.xz) = 26b1d222f155f7fb785552592f863ad72ac2b04fcfe3c6ea8ad85d16f7d77ae33d5b3f2d17684f0ea612c8680c12e1cd98f699f35ec514dbd044ba19bb4aa9c8 From f8b7ea0c606910aaac97d912fd1f347f4b4f37b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:43:15 +0000 Subject: [PATCH 49/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index e0f47ee..4bcdefd 100644 --- a/jna.spec +++ b/jna.spec @@ -7,7 +7,7 @@ Name: jna Version: 5.14.0 -Release: 1%{?dist} +Release: 2%{?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, @@ -167,6 +167,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 5.14.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 11 2023 Zuzana Miklankova - 5.14.0-1 - Rebase to version 5.14.0 From 4ac9d1d9d3c9ffa7e5f47c70fc130398b919a12e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:23:13 +0000 Subject: [PATCH 50/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 4bcdefd..442db32 100644 --- a/jna.spec +++ b/jna.spec @@ -7,7 +7,7 @@ Name: jna Version: 5.14.0 -Release: 2%{?dist} +Release: 3%{?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, @@ -167,6 +167,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 5.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 5.14.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From dd83eb3261a2d6ed04e9bfecf5b04a74901ad2e7 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 16 Jan 2024 14:58:52 +0100 Subject: [PATCH 51/67] Add generic JPV tests --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 10 ++++++++++ 4 files changed, 20 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..c9358ca --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,10 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: main +execute: + how: tmt +environment: + JP_VALIDATOR_SOURCE_PATH: '' + JP_VALIDATOR_ARGS: org.fedoraproject.javapackages.validator.validators.DefaultValidatorFactory From 8f42b9bafe5b66df580681a4d2ddfbd2c545e117 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 16:36:09 +0100 Subject: [PATCH 52/67] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 442db32..8f6a138 100644 --- a/jna.spec +++ b/jna.spec @@ -7,7 +7,7 @@ Name: jna Version: 5.14.0 -Release: 3%{?dist} +Release: 4%{?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, @@ -167,6 +167,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Tue Feb 27 2024 Jiri Vanek - 5.14.0-4 +- Rebuilt for java-21-openjdk as system jdk + * Wed Jan 24 2024 Fedora Release Engineering - 5.14.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 64f716809e3858ebc4877e5a86b9b0117f8224d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:04:30 +0000 Subject: [PATCH 53/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- jna.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jna.spec b/jna.spec index 8f6a138..9f0e020 100644 --- a/jna.spec +++ b/jna.spec @@ -7,7 +7,7 @@ Name: jna Version: 5.14.0 -Release: 4%{?dist} +Release: 5%{?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, @@ -167,6 +167,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 5.14.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 5.14.0-4 - Rebuilt for java-21-openjdk as system jdk From bf36daae1d6b2d443bb6b1dd55fc2e28cf14488a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 16 Sep 2024 10:21:13 +0200 Subject: [PATCH 54/67] Switch to using generic flavor of JPV tests --- plans/javapackages.fmf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index c9358ca..1e5c8de 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -5,6 +5,5 @@ discover: ref: main execute: how: tmt -environment: - JP_VALIDATOR_SOURCE_PATH: '' - JP_VALIDATOR_ARGS: org.fedoraproject.javapackages.validator.validators.DefaultValidatorFactory +context: + jpv_flavor: generic From f82f86e08e647f604a86d2c4ab58acfaa64c5fec Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 16 Sep 2024 10:22:14 +0200 Subject: [PATCH 55/67] Use %autorelease and %autochangelog --- changelog | 362 +++++++++++++++++++++++++++++++++++++++++++++++++++++ jna.spec | 365 +----------------------------------------------------- 2 files changed, 364 insertions(+), 363 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..02f72ff --- /dev/null +++ b/changelog @@ -0,0 +1,362 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 5.14.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 5.14.0-4 +- Rebuilt for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 5.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 5.14.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 11 2023 Zuzana Miklankova - 5.14.0-1 +- Rebase to version 5.14.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 5.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 5.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Zuzana Miklankova - 5.13.0-1 +- Rebase to version 5.13.0 + +* Thu Jul 21 2022 Fedora Release Engineering - 5.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jul 11 2022 Zuzana Miklankova - 5.12.1-1 +- Rebase to version 5.12.1 + +* Mon May 16 2022 Zuzana Miklankova - 5.11.0-2 +- Use correct version in provided pom files + +* Mon Mar 28 2022 Zuzana Miklankova - 5.11.0-1 +- Rebase to version 5.11.0 + +* Sat Feb 05 2022 Jiri Vanek - 5.10.0-3 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 5.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Jan 10 2022 Zuzana Miklankova - 5.10.0-1 +- Rebase to version 5.10.0 + +* Sat Jan 08 2022 Miro Hrončok - 5.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + +* Wed Dec 1 2021 Zuzana Miklankova - 5.9.0-3 +- Support openjdk-17 with dropping 1.6 compatibility + +* Wed Dec 1 2021 Zuzana Miklankova - 5.9.0-2 +- Rebuild with resolved reflections dependecy + +* Fri Sep 17 2021 Ondrej Dubaj - 5.9.0-1 +- Rebase to version 5.9.0 + +* Thu Jul 22 2021 Fedora Release Engineering - 5.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed May 12 2021 Ondrej Dubaj - 5.6.0-3 +- Remove maven-javadoc-plugin dependency + +* Tue Jan 26 2021 Fedora Release Engineering - 5.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 07 2021 Ondrej Dubaj - 5.6.0-1 +- Rebase to version 5.6.0 + +* Tue Jul 28 2020 Fedora Release Engineering - 5.4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 23 2020 Fabio Valentini - 5.4.0-6 +- Remove special-cased aarch32 build for java-1.8.0-openjdk. + +* Fri Jul 10 2020 Jiri Vanek - 5.4.0-5 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jul 09 2020 Mat Booth - 5.4.0-4 +- Fix conditional build without reflections + +* Thu Apr 02 2020 Tom Stellard - 5.4.0-3 +- Pass C compiler to ant + +* Wed Jan 29 2020 Fedora Release Engineering - 5.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Aug 01 2019 Marian Koncek - 5.4.0-1 +- Update to upstream version 5.4.0 + +* Thu Jul 25 2019 Fedora Release Engineering - 4.5.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 01 2019 Mat Booth - 4.5.1-9 +- Minor correction in license tag + +* Mon Jun 17 2019 Mat Booth - 4.5.1-8 +- Use xmvn-resolve for portable way to get the ant jar + +* Sat Jun 08 2019 Mat Booth - 4.5.1-7 +- Speed up builds on 32bit arm + +* Thu Mar 07 2019 Mat Booth - 4.5.1-6 +- Allow conditionally building without the reflections library for tests + +* Fri Feb 01 2019 Fedora Release Engineering - 4.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 4.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 22 2018 Michael Simacek - 4.5.1-3 +- Disable -Werror + +* Wed Feb 07 2018 Fedora Release Engineering - 4.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 05 2018 Michael Simacek - 4.5.1-1 +- Update to upstream version 4.5.1 + +* Tue Sep 19 2017 Michael Simacek - 4.5.0-1 +- Update to upstream version 4.5.0 + +* Thu Aug 03 2017 Fedora Release Engineering - 4.4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 4.4.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 19 2017 Mikolaj Izdebski - 4.4.0-5 +- Fix generation of JAR manifest +- Resolves: rhbz#1472494 + +* Mon Jul 10 2017 Mikolaj Izdebski - 4.4.0-4 +- Fix duplicate manifest bug +- Resolves: rhbz#1469022 + +* Fri Jul 07 2017 Michael Simacek - 4.4.0-3 +- Temporarily add symlink to javadir + +* Mon Jul 03 2017 Michael Simacek - 4.4.0-2 +- Install with XMvn + +* Tue Mar 28 2017 Michael Simacek - 4.4.0-1 +- Update to upstream version 4.4.0 + +* Tue Feb 07 2017 Michael Simacek - 4.3.0-4 +- Use --allow-script-in-comments on all arches + +* Wed Feb 1 2017 Mikolaj Izdebski - 4.3.0-3 +- Add missing build-requires on GCC + +* Tue Jan 31 2017 Michael Simacek - 4.3.0-2 +- Try to fix javadoc generation + +* Mon Jan 16 2017 Michael Simacek - 4.3.0-1 +- Update to upstream version 4.3.0 +- Cleanup rhel macros, because packages was retired in EPEL + +* Thu Mar 24 2016 Mikolaj Izdebski - 4.2.2-1 +- Update to upstream version 4.2.2 + +* Thu Feb 04 2016 Fedora Release Engineering - 4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Oct 20 2015 Mikolaj Izdebski - 4.2.1-1 +- Update to upstream version 4.2.1 + +* Thu Sep 17 2015 Levente Farkas - 4.2.0-1 +- Update to 4.2.0 + +* Wed Jun 17 2015 Fedora Release Engineering - 4.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Jun 11 2015 Mikolaj Izdebski - 4.1.0-8 +- Force Java 1.6 source/target (rhbz#842609) +- Fix licensing headers (rhbz#988808) + +* Wed Oct 01 2014 Michal Srb - 4.1.0-7 +- Fix for 32-bit systems (Resolves: rhbz#1148349) +- Fix FTBFS (Resolves: rhbz#1106955) + +* Sat Aug 16 2014 Fedora Release Engineering - 4.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 4.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Jan 10 2014 Roland Grunberg - 4.0.0-4 +- fix updated depmap + +* Fri Jan 10 2014 Roland Grunberg - 4.0.0-3 +- Update depmap calls and fix tests compilation issue. + +* Sat Aug 03 2013 Fedora Release Engineering - 4.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Jul 6 2013 Levente Farkas - 4.0-1 +- Update to 4.0 + +* Fri Jun 28 2013 Mikolaj Izdebski - 3.5.2-2 +- Fix ant-trax and ant-nodeps BR on RHEL + +* Thu Apr 25 2013 Levente Farkas - 3.5.2-1 +- Update to 3.5.2 + +* Thu Feb 14 2013 Fedora Release Engineering - 3.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 3.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jun 20 2012 Levente Farkas - 3.4.0-4 +- fix #833786 by Mary Ellen Foster + +* Wed Mar 14 2012 Juan Hernandez - 3.4.0-3 +- Generate correctly the maven dependencies map (#) + +* Sun Mar 11 2012 Ville Skyttä - 3.4.0-2 +- Don't strip binaries too early, build with $RPM_LD_FLAGS (#802020). + +* Wed Mar 7 2012 Levente Farkas - 3.4.0-1 +- Update to 3.4.0 + +* Fri Jan 13 2012 Fedora Release Engineering - 3.2.7-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 3.2.7-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 9 2010 Ville Skyttä - 3.2.7-11 +- Drop dependency on main package from -javadoc. +- Add license to -javadoc, and OTHERS and TODO to main package docs. +- Install javadocs and jars unversioned. +- Fix release-notes.html permissions. +- Make -javadoc and -contrib noarch where available. + +* Fri Dec 3 2010 Levente Farkas - 3.2.7-10 +- fix pom file name #655810 +- disable check everywhere since it seems to always fail in mock + +* Fri Nov 5 2010 Dan Horák - 3.2.7-9 +- exclude checks on s390(x) + +* Tue Oct 12 2010 Levente Farkas - 3.2.7-8 +- exclude check on ppc + +* Fri Oct 8 2010 Levente Farkas - 3.2.7-7 +- fix excludearch condition + +* Wed Oct 6 2010 Levente Farkas - 3.2.7-6 +- readd excludearch for old release fix #548099 + +* Fri Oct 01 2010 Dennis Gilmore - 3.2.7-5.1 +- remove the ExcludeArch it makes no sense + +* Sun Aug 1 2010 Levente Farkas - 3.2.7-5 +- reenable test and clean up contrib files + +* Tue Jul 27 2010 Levente Farkas - 3.2.7-4 +- add Obsoletes for jna-examples + +* Sat Jul 24 2010 Levente Farkas - 3.2.7-3 +- upstream 64bit fixes + +* Fri Jul 23 2010 Levente Farkas - 3.2.7-2 +- Temporary hack for 64bit build + +* Thu Jul 22 2010 Levente Farkas - 3.2.7-1 +- Rebase on upstream 3.2.7 + +* Wed Jul 21 2010 Stanislav Ochotnicky - 3.2.4-6 +- Add maven depmap + +* Thu Apr 22 2010 Colin Walters - 3.2.4-5 +- Add patches to make the build happen with gcj + +* Wed Apr 21 2010 Colin Walters - 3.2.4-4 +- Fix the build by removing upstream's hardcoded md5 + +* Thu Dec 17 2009 Levente Farkas - 3.2.4-3 +- add proper ExclusiveArch + +* Thu Dec 17 2009 Alexander Kurtakov 3.2.4-2 +- Comment rhel ExclusiveArchs - not correct applies on Fedora. + +* Sat Nov 14 2009 Levente Farkas - 3.2.4-1 +- Rebase on upstream 3.2.4 + +* Thu Oct 29 2009 Lubomir Rintel - 3.0.9-6 +- Add examples subpackage + +* Fri Jul 24 2009 Fedora Release Engineering - 3.0.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 3.0.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 30 2008 Colin Walters - 3.0.9-3 +- Add patch to allow opening current process + +* Sun Nov 30 2008 Colin Walters - 3.0.9-2 +- Fix library mapping, remove upstreamed patches + +* Fri Oct 31 2008 Colin Walters - 3.0.9-1 +- Rebase on upstream 3.0.9 + +* Tue Oct 14 2008 Colin Walters - 3.0.4-10.svn729 +- Add patch to support String[] returns + +* Wed Oct 01 2008 Colin Walters - 3.0.4-9.svn729 +- Add new patch to support NativeMapped[] which I want + +* Wed Oct 01 2008 Colin Walters - 3.0.4-8.svn729 +- Update to svn r729 +- drop upstreamed typemapper patch + +* Thu Sep 18 2008 Colin Walters - 3.0.4-7.svn700 +- Add patch to make typemapper always accessible +- Add patch to skip cracktastic X11 test bits which currently fail + +* Tue Sep 09 2008 Colin Walters - 3.0.4-5.svn700 +- Update to upstream SVN r700; drop all now upstreamed patches + +* Sat Sep 06 2008 Colin Walters - 3.0.4-3.svn630 +- A few more patches for JGIR + +* Thu Sep 04 2008 Colin Walters - 3.0.4-2.svn630 +- Add two (sent upstream) patches that I need for JGIR + +* Thu Jul 31 2008 Colin Walters - 3.0.4-1.svn630 +- New upstream version, drop upstreamed patch parts +- New patch jna-3.0.4-nomixedjar.patch which ensures that we don't + include the .so in the .jar + +* Fri Apr 04 2008 Colin Walters - 3.0.2-7 +- Add patch to use JPackage-compatible JNI library path +- Do build debuginfo package +- Refactor build patch greatly so it's hopefully upstreamable +- Install .so directly to JNI directory, rather than inside jar +- Clean up Requires/BuildRequires (thanks Mamoru Tasaka) + +* Sun Mar 30 2008 Conrad Meyer - 3.0.2-6 +- -javadocs should be -javadoc. +- %%files section cleaned a bit. + +* Mon Mar 17 2008 Conrad Meyer - 3.0.2-5 +- -javadocs package should be in group "Documentation". + +* Mon Mar 17 2008 Conrad Meyer - 3.0.2-4 +- License should be LGPLv2+, not GPLv2+. +- Several minor fixes. +- Fix Requires in javadoc package. + +* Sun Mar 16 2008 Conrad Meyer - 3.0.2-3 +- Don't use internal libffi. + +* Thu Mar 6 2008 Conrad Meyer - 3.0.2-2 +- Don't pull in jars from the web. + +* Mon Mar 3 2008 Conrad Meyer - 3.0.2-1 +- Initial package. diff --git a/jna.spec b/jna.spec index 9f0e020..963a085 100644 --- a/jna.spec +++ b/jna.spec @@ -7,7 +7,7 @@ Name: jna Version: 5.14.0 -Release: 5%{?dist} +Release: %autorelease 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, @@ -167,365 +167,4 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 5.14.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 5.14.0-4 -- Rebuilt for java-21-openjdk as system jdk - -* Wed Jan 24 2024 Fedora Release Engineering - 5.14.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 5.14.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 11 2023 Zuzana Miklankova - 5.14.0-1 -- Rebase to version 5.14.0 - -* Thu Jul 20 2023 Fedora Release Engineering - 5.13.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 5.13.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Jan 16 2023 Zuzana Miklankova - 5.13.0-1 -- Rebase to version 5.13.0 - -* Thu Jul 21 2022 Fedora Release Engineering - 5.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jul 11 2022 Zuzana Miklankova - 5.12.1-1 -- Rebase to version 5.12.1 - -* Mon May 16 2022 Zuzana Miklankova - 5.11.0-2 -- Use correct version in provided pom files - -* Mon Mar 28 2022 Zuzana Miklankova - 5.11.0-1 -- Rebase to version 5.11.0 - -* Sat Feb 05 2022 Jiri Vanek - 5.10.0-3 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 5.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Jan 10 2022 Zuzana Miklankova - 5.10.0-1 -- Rebase to version 5.10.0 - -* Sat Jan 08 2022 Miro Hrončok - 5.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 - -* Wed Dec 1 2021 Zuzana Miklankova - 5.9.0-3 -- Support openjdk-17 with dropping 1.6 compatibility - -* Wed Dec 1 2021 Zuzana Miklankova - 5.9.0-2 -- Rebuild with resolved reflections dependecy - -* Fri Sep 17 2021 Ondrej Dubaj - 5.9.0-1 -- Rebase to version 5.9.0 - -* Thu Jul 22 2021 Fedora Release Engineering - 5.6.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed May 12 2021 Ondrej Dubaj - 5.6.0-3 -- Remove maven-javadoc-plugin dependency - -* Tue Jan 26 2021 Fedora Release Engineering - 5.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 07 2021 Ondrej Dubaj - 5.6.0-1 -- Rebase to version 5.6.0 - -* Tue Jul 28 2020 Fedora Release Engineering - 5.4.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jul 23 2020 Fabio Valentini - 5.4.0-6 -- Remove special-cased aarch32 build for java-1.8.0-openjdk. - -* Fri Jul 10 2020 Jiri Vanek - 5.4.0-5 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu Jul 09 2020 Mat Booth - 5.4.0-4 -- Fix conditional build without reflections - -* Thu Apr 02 2020 Tom Stellard - 5.4.0-3 -- Pass C compiler to ant - -* Wed Jan 29 2020 Fedora Release Engineering - 5.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Aug 01 2019 Marian Koncek - 5.4.0-1 -- Update to upstream version 5.4.0 - -* Thu Jul 25 2019 Fedora Release Engineering - 4.5.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 01 2019 Mat Booth - 4.5.1-9 -- Minor correction in license tag - -* Mon Jun 17 2019 Mat Booth - 4.5.1-8 -- Use xmvn-resolve for portable way to get the ant jar - -* Sat Jun 08 2019 Mat Booth - 4.5.1-7 -- Speed up builds on 32bit arm - -* Thu Mar 07 2019 Mat Booth - 4.5.1-6 -- Allow conditionally building without the reflections library for tests - -* Fri Feb 01 2019 Fedora Release Engineering - 4.5.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 4.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 22 2018 Michael Simacek - 4.5.1-3 -- Disable -Werror - -* Wed Feb 07 2018 Fedora Release Engineering - 4.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 05 2018 Michael Simacek - 4.5.1-1 -- Update to upstream version 4.5.1 - -* Tue Sep 19 2017 Michael Simacek - 4.5.0-1 -- Update to upstream version 4.5.0 - -* Thu Aug 03 2017 Fedora Release Engineering - 4.4.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 4.4.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jul 19 2017 Mikolaj Izdebski - 4.4.0-5 -- Fix generation of JAR manifest -- Resolves: rhbz#1472494 - -* Mon Jul 10 2017 Mikolaj Izdebski - 4.4.0-4 -- Fix duplicate manifest bug -- Resolves: rhbz#1469022 - -* Fri Jul 07 2017 Michael Simacek - 4.4.0-3 -- Temporarily add symlink to javadir - -* Mon Jul 03 2017 Michael Simacek - 4.4.0-2 -- Install with XMvn - -* Tue Mar 28 2017 Michael Simacek - 4.4.0-1 -- Update to upstream version 4.4.0 - -* Tue Feb 07 2017 Michael Simacek - 4.3.0-4 -- Use --allow-script-in-comments on all arches - -* Wed Feb 1 2017 Mikolaj Izdebski - 4.3.0-3 -- Add missing build-requires on GCC - -* Tue Jan 31 2017 Michael Simacek - 4.3.0-2 -- Try to fix javadoc generation - -* Mon Jan 16 2017 Michael Simacek - 4.3.0-1 -- Update to upstream version 4.3.0 -- Cleanup rhel macros, because packages was retired in EPEL - -* Thu Mar 24 2016 Mikolaj Izdebski - 4.2.2-1 -- Update to upstream version 4.2.2 - -* Thu Feb 04 2016 Fedora Release Engineering - 4.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Oct 20 2015 Mikolaj Izdebski - 4.2.1-1 -- Update to upstream version 4.2.1 - -* Thu Sep 17 2015 Levente Farkas - 4.2.0-1 -- Update to 4.2.0 - -* Wed Jun 17 2015 Fedora Release Engineering - 4.1.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Jun 11 2015 Mikolaj Izdebski - 4.1.0-8 -- Force Java 1.6 source/target (rhbz#842609) -- Fix licensing headers (rhbz#988808) - -* Wed Oct 01 2014 Michal Srb - 4.1.0-7 -- Fix for 32-bit systems (Resolves: rhbz#1148349) -- Fix FTBFS (Resolves: rhbz#1106955) - -* Sat Aug 16 2014 Fedora Release Engineering - 4.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 4.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Jan 10 2014 Roland Grunberg - 4.0.0-4 -- fix updated depmap - -* Fri Jan 10 2014 Roland Grunberg - 4.0.0-3 -- Update depmap calls and fix tests compilation issue. - -* Sat Aug 03 2013 Fedora Release Engineering - 4.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Jul 6 2013 Levente Farkas - 4.0-1 -- Update to 4.0 - -* Fri Jun 28 2013 Mikolaj Izdebski - 3.5.2-2 -- Fix ant-trax and ant-nodeps BR on RHEL - -* Thu Apr 25 2013 Levente Farkas - 3.5.2-1 -- Update to 3.5.2 - -* Thu Feb 14 2013 Fedora Release Engineering - 3.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 3.4.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jun 20 2012 Levente Farkas - 3.4.0-4 -- fix #833786 by Mary Ellen Foster - -* Wed Mar 14 2012 Juan Hernandez - 3.4.0-3 -- Generate correctly the maven dependencies map (#) - -* Sun Mar 11 2012 Ville Skyttä - 3.4.0-2 -- Don't strip binaries too early, build with $RPM_LD_FLAGS (#802020). - -* Wed Mar 7 2012 Levente Farkas - 3.4.0-1 -- Update to 3.4.0 - -* Fri Jan 13 2012 Fedora Release Engineering - 3.2.7-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 3.2.7-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Dec 9 2010 Ville Skyttä - 3.2.7-11 -- Drop dependency on main package from -javadoc. -- Add license to -javadoc, and OTHERS and TODO to main package docs. -- Install javadocs and jars unversioned. -- Fix release-notes.html permissions. -- Make -javadoc and -contrib noarch where available. - -* Fri Dec 3 2010 Levente Farkas - 3.2.7-10 -- fix pom file name #655810 -- disable check everywhere since it seems to always fail in mock - -* Fri Nov 5 2010 Dan Horák - 3.2.7-9 -- exclude checks on s390(x) - -* Tue Oct 12 2010 Levente Farkas - 3.2.7-8 -- exclude check on ppc - -* Fri Oct 8 2010 Levente Farkas - 3.2.7-7 -- fix excludearch condition - -* Wed Oct 6 2010 Levente Farkas - 3.2.7-6 -- readd excludearch for old release fix #548099 - -* Fri Oct 01 2010 Dennis Gilmore - 3.2.7-5.1 -- remove the ExcludeArch it makes no sense - -* Sun Aug 1 2010 Levente Farkas - 3.2.7-5 -- reenable test and clean up contrib files - -* Tue Jul 27 2010 Levente Farkas - 3.2.7-4 -- add Obsoletes for jna-examples - -* Sat Jul 24 2010 Levente Farkas - 3.2.7-3 -- upstream 64bit fixes - -* Fri Jul 23 2010 Levente Farkas - 3.2.7-2 -- Temporary hack for 64bit build - -* Thu Jul 22 2010 Levente Farkas - 3.2.7-1 -- Rebase on upstream 3.2.7 - -* Wed Jul 21 2010 Stanislav Ochotnicky - 3.2.4-6 -- Add maven depmap - -* Thu Apr 22 2010 Colin Walters - 3.2.4-5 -- Add patches to make the build happen with gcj - -* Wed Apr 21 2010 Colin Walters - 3.2.4-4 -- Fix the build by removing upstream's hardcoded md5 - -* Thu Dec 17 2009 Levente Farkas - 3.2.4-3 -- add proper ExclusiveArch - -* Thu Dec 17 2009 Alexander Kurtakov 3.2.4-2 -- Comment rhel ExclusiveArchs - not correct applies on Fedora. - -* Sat Nov 14 2009 Levente Farkas - 3.2.4-1 -- Rebase on upstream 3.2.4 - -* Thu Oct 29 2009 Lubomir Rintel - 3.0.9-6 -- Add examples subpackage - -* Fri Jul 24 2009 Fedora Release Engineering - 3.0.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 3.0.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 30 2008 Colin Walters - 3.0.9-3 -- Add patch to allow opening current process - -* Sun Nov 30 2008 Colin Walters - 3.0.9-2 -- Fix library mapping, remove upstreamed patches - -* Fri Oct 31 2008 Colin Walters - 3.0.9-1 -- Rebase on upstream 3.0.9 - -* Tue Oct 14 2008 Colin Walters - 3.0.4-10.svn729 -- Add patch to support String[] returns - -* Wed Oct 01 2008 Colin Walters - 3.0.4-9.svn729 -- Add new patch to support NativeMapped[] which I want - -* Wed Oct 01 2008 Colin Walters - 3.0.4-8.svn729 -- Update to svn r729 -- drop upstreamed typemapper patch - -* Thu Sep 18 2008 Colin Walters - 3.0.4-7.svn700 -- Add patch to make typemapper always accessible -- Add patch to skip cracktastic X11 test bits which currently fail - -* Tue Sep 09 2008 Colin Walters - 3.0.4-5.svn700 -- Update to upstream SVN r700; drop all now upstreamed patches - -* Sat Sep 06 2008 Colin Walters - 3.0.4-3.svn630 -- A few more patches for JGIR - -* Thu Sep 04 2008 Colin Walters - 3.0.4-2.svn630 -- Add two (sent upstream) patches that I need for JGIR - -* Thu Jul 31 2008 Colin Walters - 3.0.4-1.svn630 -- New upstream version, drop upstreamed patch parts -- New patch jna-3.0.4-nomixedjar.patch which ensures that we don't - include the .so in the .jar - -* Fri Apr 04 2008 Colin Walters - 3.0.2-7 -- Add patch to use JPackage-compatible JNI library path -- Do build debuginfo package -- Refactor build patch greatly so it's hopefully upstreamable -- Install .so directly to JNI directory, rather than inside jar -- Clean up Requires/BuildRequires (thanks Mamoru Tasaka) - -* Sun Mar 30 2008 Conrad Meyer - 3.0.2-6 -- -javadocs should be -javadoc. -- %%files section cleaned a bit. - -* Mon Mar 17 2008 Conrad Meyer - 3.0.2-5 -- -javadocs package should be in group "Documentation". - -* Mon Mar 17 2008 Conrad Meyer - 3.0.2-4 -- License should be LGPLv2+, not GPLv2+. -- Several minor fixes. -- Fix Requires in javadoc package. - -* Sun Mar 16 2008 Conrad Meyer - 3.0.2-3 -- Don't use internal libffi. - -* Thu Mar 6 2008 Conrad Meyer - 3.0.2-2 -- Don't pull in jars from the web. - -* Mon Mar 3 2008 Conrad Meyer - 3.0.2-1 -- Initial package. +%autochangelog From 9030ba30a001a894dd8996828c43e1d549ccf260 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 16 Sep 2024 15:17:59 +0200 Subject: [PATCH 56/67] Use %autosetup --- jna.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/jna.spec b/jna.spec index 963a085..246052e 100644 --- a/jna.spec +++ b/jna.spec @@ -85,15 +85,8 @@ This package contains the contributed examples for %{name}. %prep -%setup -q +%autosetup -p1 cp %{SOURCE1} . -%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 From e70d9bb85500cb521206d8d7011bcccbdfa91fe3 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 17 Sep 2024 10:27:19 +0200 Subject: [PATCH 57/67] Remove double newlines --- jna.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/jna.spec b/jna.spec index 246052e..bbe6049 100644 --- a/jna.spec +++ b/jna.spec @@ -83,7 +83,6 @@ BuildArch: noarch %description contrib This package contains the contributed examples for %{name}. - %prep %autosetup -p1 cp %{SOURCE1} . @@ -118,7 +117,6 @@ ln -s $(xmvn-resolve org.reflections:reflections) lib/test/reflections.jar cp lib/native/aix-ppc64.jar lib/clover.jar - %build # We pass -Ddynlink.native which comes from our patch because # upstream doesn't want to default to dynamic linking. @@ -129,7 +127,6 @@ ant -Drelease -Dcompatibility=1.8 -Dplatform.compatibility=1.8\ # remove compiled contribs find contrib -name build -exec rm -rf {} \; || : - %install # NOTE: JNA has highly custom code to look for native jars in this # directory. Since this roughly matches the jpackage guidelines, @@ -147,7 +144,6 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %mvn_install -J doc/javadoc - %files -f .mfiles %doc OTHERS README.md CHANGES.md TODO %license LICENSE LGPL2.1 AL2.0 @@ -158,6 +154,5 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %files contrib -f .mfiles-contrib - %changelog %autochangelog From fc54409f825a04a99f78027d2eb9a51335868ee4 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 17 Sep 2024 10:28:35 +0200 Subject: [PATCH 58/67] Update to upstream version 5.15.0 --- .gitignore | 1 + jna.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ff411bc..988bc06 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ jna-3.2.7.tar.bz2 /jna-5.12.1-clean.tar.xz /jna-5.13.0-clean.tar.xz /jna-5.14.0-clean.tar.xz +/jna-5.15.0-clean.tar.xz diff --git a/jna.spec b/jna.spec index bbe6049..064cade 100644 --- a/jna.spec +++ b/jna.spec @@ -6,7 +6,7 @@ %endif Name: jna -Version: 5.14.0 +Version: 5.15.0 Release: %autorelease Summary: Pure Java access to native libraries # Most of code is dual-licensed under either LGPL 2.1+ only or Apache diff --git a/sources b/sources index 15beb3c..706645c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-5.14.0-clean.tar.xz) = 26b1d222f155f7fb785552592f863ad72ac2b04fcfe3c6ea8ad85d16f7d77ae33d5b3f2d17684f0ea612c8680c12e1cd98f699f35ec514dbd044ba19bb4aa9c8 +SHA512 (jna-5.15.0-clean.tar.xz) = 321586504c7ae1769334bd73c4415c6b94bf2f3b56f269d21bb5e6aa0f2aebe32a3b1ac201531d0a033ba51b99d5fede3a4defd92c60c62d871d4781200f7a19 From f322d4e136085e80b0560177d01ebde946c9867e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 24 Sep 2024 14:13:04 +0200 Subject: [PATCH 59/67] Rebuild to regenerate auto-requires From 0e670222747187f84c1e7f83e4bafc5400a29f55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:56:47 +0000 Subject: [PATCH 60/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6ca981057a7a76856a3f71f47d5a335c634ca810 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 61/67] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 1e5c8de..36643ec 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: main execute: how: tmt From 053bc923a578f81177dc8706fc8f3e86e2558155 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 4 Jun 2025 13:34:11 +0200 Subject: [PATCH 62/67] Drop javadoc subpackage --- jna.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/jna.spec b/jna.spec index 064cade..b04b40e 100644 --- a/jna.spec +++ b/jna.spec @@ -59,6 +59,9 @@ BuildRequires: hamcrest BuildRequires: reflections %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 5.15.0-4 + %description JNA provides Java programs easy access to native shared libraries (DLLs on Windows) without writing anything but Java code. JNA's @@ -67,13 +70,6 @@ minimum of effort. No boilerplate or generated code is required. While some attention is paid to performance, correctness and ease of use take priority. -%package javadoc -Summary: Javadocs for %{name} -BuildArch: noarch - -%description javadoc -This package contains the javadocs for %{name}. - %package contrib Summary: Contrib for %{name} License: LGPLv2+ or ASL 2.0 @@ -142,16 +138,13 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %mvn_artifact pom-jna.xml build/jna-min.jar %mvn_artifact pom-jna-platform.xml contrib/platform/dist/jna-platform.jar -%mvn_install -J doc/javadoc +%mvn_install %files -f .mfiles %doc OTHERS README.md CHANGES.md TODO %license LICENSE LGPL2.1 AL2.0 %{_libdir}/%{name} -%files javadoc -f .mfiles-javadoc -%license LICENSE LGPL2.1 AL2.0 - %files contrib -f .mfiles-contrib %changelog From f4f2c93a14eec9f01575099b0397d71999fd6765 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 4 Jun 2025 14:31:07 +0200 Subject: [PATCH 63/67] Update to upstream version 5.17.0 --- .gitignore | 1 + 0004-Fix-javadoc-build.patch | 10 +++++----- generate-tarball.sh | 12 +++++------- jna.spec | 14 ++++++++------ sources | 2 +- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 988bc06..9d587c1 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ jna-3.2.7.tar.bz2 /jna-5.13.0-clean.tar.xz /jna-5.14.0-clean.tar.xz /jna-5.15.0-clean.tar.xz +/jna-5.17.0.tar.zst diff --git a/0004-Fix-javadoc-build.patch b/0004-Fix-javadoc-build.patch index dc5ab54..b2bc537 100644 --- a/0004-Fix-javadoc-build.patch +++ b/0004-Fix-javadoc-build.patch @@ -8,17 +8,17 @@ Subject: [PATCH 4/6] Fix javadoc build 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index 835c02b..cecafd0 100644 +index 8f5733a..fb8d544 100644 --- a/build.xml +++ b/build.xml -@@ -1307,6 +1307,7 @@ cd .. +@@ -1343,6 +1343,7 @@ cd .. + - - +