diff --git a/ant.spec b/ant.spec index 597d6fd..7990325 100644 --- a/ant.spec +++ b/ant.spec @@ -36,7 +36,7 @@ Name: ant Version: 1.9.4 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 0 Summary: Build tool for java Summary(it): Tool per la compilazione di programmi java @@ -64,6 +64,8 @@ Requires: java-devel >= 1:1.8.0 Requires: xerces-j2 Requires: xml-commons-apis +Requires: %{name}-lib = %{epoch}:%{version}-%{release} + Obsoletes: %{name}-scripts < %{epoch}:%{version}-%{release} Provides: %{name}-scripts = %{epoch}:%{version}-%{release} @@ -83,6 +85,12 @@ compilazione di programmi java. Allo stato attuale viene utilizzato dai progetti apache jakarta ed apache xml. +%package lib +Summary: Core part of %{name} + +%description lib +Core part of Apache Ant that can be used as a library. + %package jmf Summary: Optional jmf tasks for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} @@ -453,18 +461,11 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{ant} test %endif -%files -f .mfiles -%files -f .mfiles-ant %files -f .mfiles-launcher %doc KEYS LICENSE NOTICE README WHATSNEW %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant %attr(0755,root,root) %{_bindir}/antRun -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-launcher.jar -%{_javadir}/%{name}-bootstrap.jar -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/%{name}-bootstrap.jar %dir %{ant_home} %dir %{ant_home}/bin %{ant_home}/bin/ant @@ -479,12 +480,18 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{ant_home}/etc/junit-frames-xalan1.xsl %{ant_home}/etc/common2master.xsl %{ant_home}/etc/printFailingTests.xsl -%dir %{ant_home}/lib -%{ant_home}/lib/%{name}.jar %{ant_home}/lib/%{name}-launcher.jar -%{ant_home}/lib/%{name}-bootstrap.jar +%{_javadir}/%{name}-launcher.jar %dir %{_sysconfdir}/%{name}.d +%files lib -f .mfiles -f .mfiles-ant +%dir %{ant_home}/lib +%{_javadir}/%{name}.jar +%{_javadir}/%{name}-bootstrap.jar +%{_javadir}/%{name}/%{name}-bootstrap.jar +%{ant_home}/lib/%{name}.jar +%{ant_home}/lib/%{name}-bootstrap.jar + %files jmf -f .mfiles-jmf %{ant_home}/lib/%{name}-jmf.jar %config(noreplace) %{_sysconfdir}/%{name}.d/jmf @@ -582,6 +589,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %changelog +* Tue Mar 31 2015 Michael Simacek - 0:1.9.4-9 +- Split library part into subpackage (rhbz#1119283) + * Wed Mar 11 2015 Mikolaj Izdebski - 0:1.9.4-8 - Add alias for ant:ant-launcher