SHA256
1
0
forked from pool/jsch

Accepting request 732197 from Java:packages

Make actually work with maven

OBS-URL: https://build.opensuse.org/request/show/732197
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jsch?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2019-09-25 05:47:01 +00:00 committed by Git OBS Bridge
commit 76dcd46398
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 20 13:37:00 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Remove reference to the parent from pom file, since we are not
building with maven
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 8 08:31:01 UTC 2017 - fstrba@suse.com Fri Sep 8 08:31:01 UTC 2017 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package jsch # spec file for package jsch
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# 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
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -31,7 +31,6 @@ Patch0: jsch-0.1.54-sourcetarget.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel >= 1.6.0 BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: jzlib BuildRequires: jzlib
BuildRequires: unzip BuildRequires: unzip
BuildRequires: zip BuildRequires: zip
@ -65,6 +64,8 @@ functionality into your own Java programs.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
cp %{SOURCE3} pom.xml
%pom_remove_parent
%build %build
export CLASSPATH=$(build-classpath jzlib) export CLASSPATH=$(build-classpath jzlib)
@ -93,7 +94,7 @@ cp -pr examples/* %{buildroot}%{_datadir}/%{name}
# POM and depmap # POM and depmap
install -d -m 755 %{buildroot}%{_mavenpomdir} install -d -m 755 %{buildroot}%{_mavenpomdir}
install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap %add_maven_depmap
%files %files