diff --git a/plexus-languages-atinject.patch b/plexus-languages-atinject.patch new file mode 100644 index 0000000..c7f8ebd --- /dev/null +++ b/plexus-languages-atinject.patch @@ -0,0 +1,10 @@ +--- plexus-languages-1.1.1/plexus-java/src/main/java9/module-info.java 2024-04-10 11:00:25.596880353 +0200 ++++ plexus-languages-1.1.1/plexus-java/src/main/java9/module-info.java 2024-04-10 11:00:57.827095904 +0200 +@@ -20,6 +20,7 @@ + { + requires com.thoughtworks.qdox; + requires org.objectweb.asm; ++ requires java.inject; + + exports org.codehaus.plexus.languages.java.jpms; + exports org.codehaus.plexus.languages.java.version; diff --git a/plexus-languages.changes b/plexus-languages.changes index b8ffa0e..12f7e3c 100644 --- a/plexus-languages.changes +++ b/plexus-languages.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 10 09:07:44 UTC 2024 - Fridrich Strba + +- Added patch: + * plexus-languages-atinject.patch + + Fix against multirelease version of atinject + ------------------------------------------------------------------- Sat Mar 12 07:26:31 UTC 2022 - Fridrich Strba diff --git a/plexus-languages.spec b/plexus-languages.spec index 0975afa..dc4bcdb 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-languages # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ URL: https://github.com/codehaus-plexus/plexus-languages Source0: %{name}-%{version}.tar.xz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source100: plexus-java-build.xml +Patch0: plexus-languages-atinject.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes @@ -53,6 +54,7 @@ API documentation for %{name}. %prep %setup -q +%patch -P 0 -p1 cp %{SOURCE1} . cp %{SOURCE100} plexus-java/build.xml