Add the bsf subpackage since we now ship bsf
This commit is contained in:
parent
9cdb1f5eaa
commit
8813aa5285
26
ant.spec
26
ant.spec
@ -66,6 +66,21 @@ Optional antlr tasks for %{name}.
|
||||
%description antlr -l fr
|
||||
Taches antlr optionelles pour %{name}.
|
||||
|
||||
%package apache-bsf
|
||||
Summary: Optional apache bsf tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: bsf
|
||||
BuildRequires: bsf
|
||||
Provides: ant-apache-bsf = %{epoch}:%{version}-%{release}
|
||||
Conflicts: ant-optional-clean, ant-optional-full
|
||||
|
||||
%description apache-bsf
|
||||
Optional apache bsf tasks for %{name}.
|
||||
|
||||
%description apache-bsf -l fr
|
||||
Taches apache bsf optionelles pour %{name}.
|
||||
|
||||
%package apache-resolver
|
||||
Summary: Optional apache resolver tasks for %{name}
|
||||
Group: Development/Build Tools
|
||||
@ -384,6 +399,7 @@ cp -p build/lib/%{name}-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launcher
|
||||
# optional jars
|
||||
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
|
||||
cp -p build/lib/%{name}-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
|
||||
cp -p build/lib/%{name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
|
||||
cp -p build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
|
||||
cp -p build/lib/%{name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
|
||||
cp -p build/lib/%{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
|
||||
@ -435,6 +451,7 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
|
||||
# OPT_JAR_LIST fragments
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
|
||||
echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr
|
||||
echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf
|
||||
echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
|
||||
echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging
|
||||
echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel
|
||||
@ -516,6 +533,12 @@ fi
|
||||
%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/antlr
|
||||
|
||||
%files apache-bsf
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-apache-bsf.jar
|
||||
%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
|
||||
%{_sysconfdir}/%{name}.d/apache-bsf
|
||||
|
||||
%files apache-resolver
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}/%{name}-apache-resolver.jar
|
||||
@ -627,6 +650,9 @@ fi
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com>
|
||||
- Add the bsf subpackage since we now ship bsf.
|
||||
|
||||
* Mon Jun 6 2005 Gary Benson <gbenson at redhat.com>
|
||||
- Make the javah task fall back to executing javah if
|
||||
com.sun.tools.javah.Main cannot be found.
|
||||
|
Loading…
Reference in New Issue
Block a user