Sync from SUSE:SLFO:Main plexus-interactivity revision 174bcff80eac4ede9d078f667cfd5271
This commit is contained in:
parent
b06fef49ed
commit
808a98a289
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 20 15:00:51 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Use %patch -P N instead of deprecated %patchN.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Mar 20 17:37:26 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Sun Mar 20 17:37:26 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package plexus-interactivity
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -37,7 +37,7 @@ Patch1: %{name}-dependencies.patch
|
|||||||
Patch2: %{name}-jline2.patch
|
Patch2: %{name}-jline2.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local >= 6
|
||||||
BuildRequires: jline >= 2
|
BuildRequires: jline >= 2
|
||||||
BuildRequires: plexus-component-api
|
BuildRequires: plexus-component-api
|
||||||
BuildRequires: plexus-utils
|
BuildRequires: plexus-utils
|
||||||
@ -60,8 +60,6 @@ This package provides %{summary}.
|
|||||||
%package api
|
%package api
|
||||||
Summary: API for %{name}
|
Summary: API for %{name}
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
Requires: mvn(org.codehaus.plexus:plexus-component-api)
|
|
||||||
Requires: mvn(org.codehaus.plexus:plexus-utils)
|
|
||||||
|
|
||||||
%description api
|
%description api
|
||||||
API module for %{name}.
|
API module for %{name}.
|
||||||
@ -69,24 +67,18 @@ API module for %{name}.
|
|||||||
%package jline
|
%package jline
|
||||||
Summary: jline module for %{name}
|
Summary: jline module for %{name}
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
Requires: plexus-interactivity-api = %{version}
|
Requires: %{name}-api = %{version}
|
||||||
Requires: mvn(jline:jline)
|
|
||||||
|
|
||||||
%description jline
|
%description jline
|
||||||
jline module for %{name}.
|
jline module for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{namedversion} -a100
|
%setup -q -n %{name}-%{namedversion} -a100
|
||||||
%patch1 -p1
|
%patch -P 1 -p1
|
||||||
%patch2 -p1
|
%patch -P 2 -p1
|
||||||
|
|
||||||
cp %{SOURCE1} .
|
cp %{SOURCE1} .
|
||||||
|
|
||||||
for i in api jline; do
|
|
||||||
%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId>" %{name}-${i}
|
|
||||||
%pom_remove_parent %{name}-${i}
|
|
||||||
done
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir -p lib
|
mkdir -p lib
|
||||||
build-jar-repository -s lib jline plexus-component-api plexus/utils
|
build-jar-repository -s lib jline plexus-component-api plexus/utils
|
||||||
@ -101,7 +93,7 @@ done
|
|||||||
# pom
|
# pom
|
||||||
install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
|
install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
|
||||||
for i in api jline; do
|
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}
|
%add_maven_depmap plexus/interactivity-${i}.pom plexus/interactivity-${i}.jar -f ${i}
|
||||||
done
|
done
|
||||||
# javadoc
|
# javadoc
|
||||||
|
Loading…
Reference in New Issue
Block a user