commit a7cfc27e405e9a4440e89441a5bb19f553af2477
Author: gil <puntogil(a)libero.it>
Date: Tue Jul 2 14:19:10 2013 +0200
build with XMvn
.gitignore | 1 +
sources | 2 +-
sshj.spec | 70 +++++++++++++++++++----------------------------------------
3 files changed, 25 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f68548..6ab6f5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/sshj-0.8.0.tar.xz
/sshj-0.8.1.tar.xz
+/v0.8.1.tar.gz
diff --git a/sources b/sources
index c1553d4..3353549 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8da50e2c5f5c93bd1603dcc7d196488 sshj-0.8.1.tar.xz
+2fe8c45001e3c229a8370885503b9e82 v0.8.1.tar.gz
diff --git a/sshj.spec b/sshj.spec
index bcae826..5c78df2 100644
--- a/sshj.spec
+++ b/sshj.spec
@@ -1,93 +1,69 @@
Name: sshj
Version: 0.8.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: SSHv2 library for Java
-Group: Development/Libraries
License: ASL 2.0
URL:
http://schmizz.net/sshj/
-# git clone
git://github.com/shikhar/sshj.git sshj-0.8.1
-# cd sshj-0.8.1 && git archive --format=tar --prefix=sshj-0.8.1/ v0.8.1 | xz >
sshj-0.8.1.tar.xz
-Source0: %{name}-%{version}.tar.xz
-
-Patch0: %{name}-0.8.0-use-jzlib-as-system-dependency.patch
-
+Source0:
https://github.com/shikhar/sshj/archive/v%{version}.tar.gz
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: apache-sshd
-BuildRequires: bouncycastle
-BuildRequires: jzlib
-BuildRequires: slf4j
+BuildRequires: mvn(com.jcraft:jzlib) >= 1.1.0-2
+BuildRequires: mvn(org.bouncycastle:bcprov-jdk16)
+BuildRequires: mvn(org.slf4j:slf4j-api)
# test deps
-BuildRequires: junit
-BuildRequires: logback
-BuildRequires: mockito
+BuildRequires: mvn(ch.qos.logback:logback-classic)
+BuildRequires: mvn(ch.qos.logback:logback-core)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.mina:mina-core)
+BuildRequires: mvn(org.apache.sshd:sshd-core)
+BuildRequires: mvn(org.mockito:mockito-all)
BuildRequires: maven-local
BuildRequires: maven-assembly-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
BuildRequires: maven-source-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
-Requires: apache-sshd
-Requires: bouncycastle
-Requires: jzlib
-Requires: slf4j
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
SSH, scp and sftp library for Java.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
%prep
%setup -q
-%patch0 -p0
+
+# SmokeTest.setUp:37 ? NoClassDefFound org/apache/mina/core/service/IoHandler
+%pom_add_dep org.apache.mina:mina-core::test
# Some classes moved from JUnit to hamcrest
sed -i -e 's/org.junit.internal.matchers/org.hamcrest.core/'
src/test/java/net/schmizz/sshj/transport/verification/OpenSSHKnownHostsTest.java
+%mvn_file :%{name} %{name}
%build
-mvn-rpmbuild -D_javadir=%{_javadir} install javadoc:aggregate
+%mvn_build
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc CONTRIBUTORS LICENSE NOTICE README.rst
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
+* Tue Jul 02 2013 gil cattaneo <puntogil(a)libero.it> 0.8.1-5
+- build with XMvn
+- minor changes to adapt to current guideline
+
* Mon Apr 22 2013 Tomas Radej <tradej(a)redhat.com> - 0.8.1-4
- Fixed tests for new JUnit and hamcrest