Accepting request 693084 from Java:packages

- Remove the reference to parent from pom file, since we are not
  building using maven.

OBS-URL: https://build.opensuse.org/request/show/693084
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-ivy?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2019-04-14 10:20:16 +00:00 committed by Git OBS Bridge
commit a850d6afe1
2 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 8 18:12:07 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Remove the reference to parent from pom file, since we are not
building using maven.
-------------------------------------------------------------------
Thu Feb 7 14:48:24 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -34,7 +34,6 @@ BuildRequires: commons-httpclient
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: jsch
BuildRequires: oro
Provides: ivy = %{version}-%{release}
@ -51,8 +50,7 @@ reporting and publication.
%package javadoc
Summary: API Documentation for ivy
Group: Development/Tools/Building
Requires: %{name} = %{version}-%{release}
Group: Documentation/HTML
%description javadoc
JavaDoc documentation for %{name}
@ -62,6 +60,10 @@ JavaDoc documentation for %{name}
%patch0 -p1
%patch1 -p1
cp %{SOURCE2} pom.xml
%pom_remove_parent .
#TODO: return back when bouncycastle-pgp will be available
rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle
@ -94,7 +96,7 @@ install -p -m644 build/artifact/jars/ivy.jar %{buildroot}%{_javadir}/ivy.jar
ln -sf ../ivy.jar %{buildroot}%{_javadir}/%{name}/ivy.jar
install -d -m 0755 %{buildroot}/%{_mavenpomdir}/
install -m 0644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-ivy.pom
install -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ivy.pom
# Maven depmap
%add_maven_depmap JPP-ivy.pom ivy.jar