From 6177fe7a8b03a7d1a06dd08dbc3e11ad63029ba2 Mon Sep 17 00:00:00 2001 From: gbenson Date: Mar 29 2005 12:37:16 +0000 Subject: Add the jsch subpackage since we now ship jsch --- diff --git a/ant.spec b/ant.spec index 3e8197c..847cf69 100644 --- a/ant.spec +++ b/ant.spec @@ -205,6 +205,21 @@ Optional jmf tasks for %{name}. %description jmf -l fr Taches jmf optionelles pour %{name}. +%package jsch +Summary: Optional jsch tasks for %{name} +Group: Development/Build Tools +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: jsch +BuildRequires: jsch +Provides: ant-jsch = %{epoch}:%{version}-%{release} +Conflicts: ant-optional-clean, ant-optional-full + +%description jsch +Optional jsch tasks for %{name}. + +%description jsch -l fr +Taches jsch optionelles pour %{name}. + %package junit Summary: Optional junit tasks for %{name} Group: Development/Build Tools @@ -317,7 +332,7 @@ find . -name "*.jar" -exec rm -f {} \; %build # classpath selects optional components to build -export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging xml-commons-resolver) +export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging jsch xml-commons-resolver) # perform bootstrap and build without jjp or user configs, # (except JAVA_HOME as required by build script) @@ -356,6 +371,7 @@ ln -sf %{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jaka cp -p build/lib/%{name}-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar cp -p build/lib/%{name}-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar cp -p build/lib/%{name}-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmf-%{version}.jar +cp -p build/lib/%{name}-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsch-%{version}.jar cp -p build/lib/%{name}-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-junit-%{version}.jar cp -p build/lib/%{name}-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar cp -p build/lib/%{name}-swing.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swing-%{version}.jar @@ -392,6 +408,7 @@ echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/ap echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf +echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing @@ -515,6 +532,12 @@ fi %{_javadir}/%{name}/%{name}-jmf-%{version}.jar %{_sysconfdir}/%{name}.d/jmf +%files jsch +%defattr(0644,root,root,0755) +%{_javadir}/%{name}/%{name}-jsch.jar +%{_javadir}/%{name}/%{name}-jsch-%{version}.jar +%{_sysconfdir}/%{name}.d/jsch + %files junit %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-junit.jar @@ -562,6 +585,7 @@ fi * Tue Mar 29 2005 Gary Benson 0:1.6.2-3jpp_3fc - Add NOTICE file as per Apache License version 2.0. - Remove some now unnecessary gcj workarounds. +- Add the jsch subpackage since we now ship jsch. * Thu Jan 20 2005 Gary Benson 0:1.6.2-3jpp_2fc - Use jdtcore.jar instead of ecj.jar when running under libgcj.