diff --git a/jsch-agent-proxy-0.0.7-build.tar.xz b/jsch-agent-proxy-0.0.7-build.tar.xz new file mode 100644 index 0000000..576041d --- /dev/null +++ b/jsch-agent-proxy-0.0.7-build.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c30553d712bb4b2236374e3c8fe30413c37a9edadda2cc03b6b1e629f2488aa +size 3360 diff --git a/jsch-agent-proxy.spec b/jsch-agent-proxy.spec index 11d86cb..47aa12a 100644 --- a/jsch-agent-proxy.spec +++ b/jsch-agent-proxy.spec @@ -16,7 +16,6 @@ # -%bcond_without jp_minimal Name: jsch-agent-proxy Version: 0.0.7 Release: 0 @@ -25,18 +24,16 @@ License: BSD-3-Clause Group: Development/Libraries/Java URL: http://www.jcraft.com/jsch-agent-proxy/ Source0: https://github.com/ymnk/jsch-agent-proxy/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: %{name}-%{version}-build.tar.xz +BuildRequires: ant BuildRequires: fdupes -BuildRequires: maven-local -BuildRequires: mvn(com.jcraft:jsch) -BuildRequires: mvn(com.trilead:trilead-ssh2) -BuildRequires: mvn(net.java.dev.jna:jna) -BuildRequires: mvn(net.java.dev.jna:platform) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +BuildRequires: javapackages-local +BuildRequires: java-devel +BuildRequires: jna +BuildRequires: jsch +BuildRequires: sonatype-oss-parent +BuildRequires: trilead-ssh2 BuildArch: noarch -%if %{without jp_minimal} -BuildRequires: mvn(net.schmizz:sshj) -%endif %description jsch-agent-proxy is a proxy program to OpenSSH ssh-agent and Pageant @@ -81,20 +78,11 @@ Group: Development/Libraries/Java %description sshagent %{summary}. -%if %{without jp_minimal} -%package sshj -Summary: sshj connector for jsch-agent-proxy -Group: Development/Libraries/Java - -%description sshj -%{summary}. -%endif - -%package trilead-ssh2 +%package svnkit-trilead-ssh2 Summary: trilead-ssh2 connector for jsch-agent-proxy Group: Development/Libraries/Java -%description trilead-ssh2 +%description svnkit-trilead-ssh2 %{summary}. %package usocket-jna @@ -119,49 +107,59 @@ Group: Documentation/HTML This package provides %{summary}. %prep -%setup -q - -# Put parent POM together with core module -%{mvn_package} :jsch.agentproxy jsch.agentproxy.core +%setup -q -a1 # Unnecessary for RPM builds %pom_remove_plugin ":maven-javadoc-plugin" %pom_remove_plugin ":maven-source-plugin" %pom_xpath_remove pom:build/pom:extensions - -%if %{with jp_minimal} %pom_disable_module jsch-agent-proxy-sshj -%endif %build -%{mvn_build} -s -- -Dsource=8 +mkdir lib +build-jar-repository -s lib jna jna-platform jsch trilead-ssh2 + +%{ant} \ + -Dtest.skip=true \ + package javadoc %install -%mvn_install +install -dm 0755 %{buildroot}/usr/share/java +install -dm 0755 %{buildroot}%{_mavenpomdir} + +for package in connector-factory core jsch pageant sshagent \ + svnkit-trilead-ssh2 usocket-jna usocket-nc; do + install -pm 0644 %{name}-${package}/target/jsch.agentproxy.${package}-%{version}.jar %{buildroot}/usr/share/java/jsch.agentproxy.${package}.jar + install -pm 0644 %{name}-${package}/pom.xml %{buildroot}%{_mavenpomdir}/jsch.agentproxy.${package}.pom + %add_maven_depmap jsch.agentproxy.${package}.pom jsch.agentproxy.${package}.jar -f ${package} + + # javadoc + install -dm 0755 %{buildroot}%{_javadocdir}/%{name}-${package} + cp -pr %{name}-${package}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-${package}/ +done + %fdupes -s %{buildroot}%{_javadocdir} -%files core -f .mfiles-jsch.agentproxy.core +%files core -f .mfiles-core %doc README README.md %license LICENSE.txt -%files connector-factory -f .mfiles-jsch.agentproxy.connector-factory +%files connector-factory -f .mfiles-connector-factory -%files jsch -f .mfiles-jsch.agentproxy.jsch +%files jsch -f .mfiles-jsch -%files pageant -f .mfiles-jsch.agentproxy.pageant +%files pageant -f .mfiles-pageant -%files sshagent -f .mfiles-jsch.agentproxy.sshagent -%if %{without jp_minimal} -%files sshj -f .mfiles-jsch.agentproxy.sshj -%endif +%files sshagent -f .mfiles-sshagent -%files trilead-ssh2 -f .mfiles-jsch.agentproxy.svnkit-trilead-ssh2 +%files svnkit-trilead-ssh2 -f .mfiles-svnkit-trilead-ssh2 -%files usocket-jna -f .mfiles-jsch.agentproxy.usocket-jna +%files usocket-jna -f .mfiles-usocket-jna -%files usocket-nc -f .mfiles-jsch.agentproxy.usocket-nc +%files usocket-nc -f .mfiles-usocket-nc -%files javadoc -f .mfiles-javadoc +%files javadoc %license LICENSE.txt +%{_javadocdir} %changelog