From 7a644e58d40e00a69f869e4e9ae4591d47815b08 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Aug 2023 15:55:14 +0200 Subject: [PATCH] Enable JPMS provides and JAR transformation in ELN --- ...le-JPMS-provides-and-JAR-transformer.patch | 39 +++++++++++++++++++ xmvn-generator.spec | 10 ++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 0001-Enable-JPMS-provides-and-JAR-transformer.patch diff --git a/0001-Enable-JPMS-provides-and-JAR-transformer.patch b/0001-Enable-JPMS-provides-and-JAR-transformer.patch new file mode 100644 index 0000000..2d0e424 --- /dev/null +++ b/0001-Enable-JPMS-provides-and-JAR-transformer.patch @@ -0,0 +1,39 @@ +From a0ee0464f305aa6b776abb629ed2a9783490192b Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 30 Aug 2023 15:53:26 +0200 +Subject: [PATCH] Enable JPMS provides and JAR transformer + +--- + src/main/rpm/macros.xmvngen | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/main/rpm/macros.xmvngen b/src/main/rpm/macros.xmvngen +index 4ff3f22..ca1e3bb 100644 +--- a/src/main/rpm/macros.xmvngen ++++ b/src/main/rpm/macros.xmvngen +@@ -1,6 +1,6 @@ + # Debug enable flag. + # Setting this to non-empty value enables debugging output. +-%__xmvngen_debug %{nil} ++%__xmvngen_debug 1 + + # Path to JVM library (libjvm.so). Java 17 or newer is required. + %__xmvngen_libjvm %{_jvmdir}/jre-17-openjdk/lib/server/libjvm.so +@@ -15,7 +15,7 @@ + # generator factories (classes implementing GeneratorFactory interface). + # Available hook factories are: + # * org.fedoraproject.xmvn.generator.jpms.JPMSGeneratorFactory +-%__xmvngen_provides_generators %{nil} ++%__xmvngen_provides_generators org.fedoraproject.xmvn.generator.jpms.JPMSGeneratorFactory + %__xmvngen_requires_generators %{nil} + + # Specify which post-install hooks should be ran. +@@ -23,4 +23,4 @@ + # hook factories (classes implementing HookFactory interface). + # Available hook factories are: + # * org.fedoraproject.xmvn.generator.transformer.TransformerHookFactory +-%__xmvngen_post_install_hooks %{nil} ++%__xmvngen_post_install_hooks org.fedoraproject.xmvn.generator.transformer.TransformerHookFactory +-- +2.41.0 + diff --git a/xmvn-generator.spec b/xmvn-generator.spec index 6e58d24..bdb9202 100644 --- a/xmvn-generator.spec +++ b/xmvn-generator.spec @@ -3,7 +3,7 @@ Name: xmvn-generator Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RPM dependency generator for Java License: Apache-2.0 URL: https://github.com/fedora-java/xmvn-generator @@ -11,6 +11,8 @@ ExclusiveArch: %{java_arches} Source0: https://github.com/fedora-java/xmvn-generator/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: 0001-Enable-JPMS-provides-and-JAR-transformer.patch + BuildRequires: gcc BuildRequires: rpm-devel %if %{with bootstrap} @@ -37,6 +39,9 @@ from Lua. %prep %setup -q +%if !0%{?fedora} +%patch0 -p1 +%endif %mvn_file : %{name} %build @@ -58,6 +63,9 @@ install -D -p -m 644 src/main/rpm/xmvngen.attr %{buildroot}%{_fileattrsdir}/xmvn %doc README.md %changelog +* Wed Aug 30 2023 Mikolaj Izdebski - 1.2.1-4 +- Enable JPMS provides and JAR transformation in ELN + * Sat Jul 22 2023 Fedora Release Engineering - 1.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild