diff --git a/plexus-interactivity-build.tar.xz b/plexus-interactivity-build.tar.xz index 555dd2f..0a2b75e 100644 --- a/plexus-interactivity-build.tar.xz +++ b/plexus-interactivity-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4147c4df0818994b6149b9aa509278cd48bc063c417182f93017cb3d09f4cab5 -size 1848 +oid sha256:d694076b24d21c75c79550fec93dbf52ec55bd65ef31f0306342df0d01f9bf96 +size 1832 diff --git a/plexus-interactivity.changes b/plexus-interactivity.changes index 3cf92d5..df3a120 100644 --- a/plexus-interactivity.changes +++ b/plexus-interactivity.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 15:00:51 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Sun Mar 20 17:37:26 UTC 2022 - Fridrich Strba diff --git a/plexus-interactivity.spec b/plexus-interactivity.spec index 3f85061..aec8b3f 100644 --- a/plexus-interactivity.spec +++ b/plexus-interactivity.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-interactivity # -# 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 @@ -37,7 +37,7 @@ Patch1: %{name}-dependencies.patch Patch2: %{name}-jline2.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: jline >= 2 BuildRequires: plexus-component-api BuildRequires: plexus-utils @@ -60,8 +60,6 @@ This package provides %{summary}. %package api Summary: API for %{name} Group: Development/Libraries/Java -Requires: mvn(org.codehaus.plexus:plexus-component-api) -Requires: mvn(org.codehaus.plexus:plexus-utils) %description api API module for %{name}. @@ -69,24 +67,18 @@ API module for %{name}. %package jline Summary: jline module for %{name} Group: Development/Libraries/Java -Requires: plexus-interactivity-api = %{version} -Requires: mvn(jline:jline) +Requires: %{name}-api = %{version} %description jline jline module for %{name}. %prep %setup -q -n %{name}-%{namedversion} -a100 -%patch1 -p1 -%patch2 -p1 +%patch -P 1 -p1 +%patch -P 2 -p1 cp %{SOURCE1} . -for i in api jline; do - %pom_xpath_inject "pom:project" "org.codehaus.plexus" %{name}-${i} - %pom_remove_parent %{name}-${i} -done - %build mkdir -p lib build-jar-repository -s lib jline plexus-component-api plexus/utils @@ -101,7 +93,7 @@ done # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus for i in api jline; do - install -pm 0644 %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/plexus/interactivity-${i}.pom + %{mvn_install_pom} %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/plexus/interactivity-${i}.pom %add_maven_depmap plexus/interactivity-${i}.pom plexus/interactivity-${i}.jar -f ${i} done # javadoc