!3 splite ant pack

Merge pull request !3 from compile_success/master

ant.spec

@@ -1,72 +1,187 @@
 %bcond_with tests
+%global ant_home %{_datadir}/ant
 
 Name:           ant
 Summary:        A Java-based build tool
 Version:        1.10.5
-Release:        6
+Release:        7
 Epoch:          0
 License:        ASL 2.0
 URL:            https://ant.apache.org/
 Source0:        https://archive.apache.org/dist/ant/source/apache-ant-1.10.5-src.tar.bz2
 Source2:        apache-ant-1.8.ant.conf
 
-BuildRequires:  xmlto mvn(org.hamcrest:hamcrest-library) ant >= 1.10.2 junit5
+BuildRequires:  javapackages-local java-devel >= 1:1.8.0 ant >= 1.10.2
-BuildRequires:  mvn(commons-net:commons-net) mvn(bcel:bcel) mvn(bsf:bsf) javapackages-local
+BuildRequires:  ant-junit xmlto mvn(antlr:antlr) mvn(bcel:bcel)
-BuildRequires:  mvn(commons-logging:commons-logging-api) mvn(antlr:antlr) mvn(com.jcraft:jsch)
+BuildRequires:  mvn(bsf:bsf) mvn(com.jcraft:jsch) mvn(commons-logging:commons-logging-api)
-BuildRequires:  mvn(javax.mail:mail) mvn(jdepend:jdepend) mvn(junit:junit) java-devel >= 1:1.8.0
+BuildRequires:  mvn(commons-net:commons-net) mvn(javax.mail:mail) mvn(jdepend:jdepend)
-BuildRequires:  mvn(org.tukaani:xz) mvn(log4j:log4j:1.2.13) mvn(xalan:xalan) mvn(regexp:regexp)
+BuildRequires:  mvn(junit:junit) mvn(log4j:log4j:1.2.13) mvn(org.tukaani:xz)
-BuildRequires:  mvn(xml-resolver:xml-resolver) mvn(org.hamcrest:hamcrest-core) mvn(oro:oro)
+BuildRequires:  mvn(oro:oro) mvn(regexp:regexp) mvn(xalan:xalan)
-
+BuildRequires:  mvn(xml-resolver:xml-resolver) mvn(org.hamcrest:hamcrest-core)
-Requires:       javapackages-tools java-devel >= 1:1.8.0
+BuildRequires:  mvn(org.hamcrest:hamcrest-library) junit5
 
+Recommends: java-devel >= 1:1.8.0
+Requires:       %{name}-lib = %{epoch}:%{version}-%{release} javapackages-tools
 BuildArch:      noarch
 
-Obsoletes: %{name}-lib < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-swing < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-antlr < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-apache-bsf < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-apache-resolver < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-commons-logging < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-commons-net < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-apache-bcel < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-apache-log4j < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-apache-oro < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-apache-regexp < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-apache-xalan2 < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-javamail < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-jdepend < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-jsch < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-junit < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-testutil < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-xz < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-jmf < %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-junit5 < %{epoch}:%{version}-%{release}
-
-Provides: %{name}-lib = %{epoch}:%{version}-%{release}
-Provides: %{name}-swing = %{epoch}:%{version}-%{release}
-Provides: %{name}-antlr = %{epoch}:%{version}-%{release}
-Provides: %{name}-apache-bsf = %{epoch}:%{version}-%{release}
-Provides: %{name}-apache-resolver = %{epoch}:%{version}-%{release}
-Provides: %{name}-commons-logging = %{epoch}:%{version}-%{release}
-Provides: %{name}-commons-net = %{epoch}:%{version}-%{release}
-Provides: %{name}-apache-bcel = %{epoch}:%{version}-%{release}
-Provides: %{name}-apache-log4j = %{epoch}:%{version}-%{release}
-Provides: %{name}-apache-oro = %{epoch}:%{version}-%{release}
-Provides: %{name}-apache-regexp = %{epoch}:%{version}-%{release}
-Provides: %{name}-apache-xalan2 = %{epoch}:%{version}-%{release}
-Provides: %{name}-javamail = %{epoch}:%{version}-%{release}
-Provides: %{name}-jdepend = %{epoch}:%{version}-%{release}
-Provides: %{name}-jsch = %{epoch}:%{version}-%{release}
-Provides: %{name}-junit = %{epoch}:%{version}-%{release}
-Provides: %{name}-testutil = %{epoch}:%{version}-%{release}
-Provides: %{name}-xz = %{epoch}:%{version}-%{release}
-Provides: %{name}-jmf = %{epoch}:%{version}-%{release}
-Provides: %{name}-junit5 = %{epoch}:%{version}-%{release}
-
 %description
 Ant is a Java based build tool. In theory it is kind of like "make"
 without makes wrinkles and with the full portability of pure java code.
 
+%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}
+
+%description jmf
+Optional jmf tasks for %{name}.
+
+
+%package swing
+Summary:        Optional swing tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description swing
+Optional swing tasks for %{name}.
+
+
+%package antlr
+Summary:        Optional antlr tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description antlr
+Optional antlr tasks for %{name}.
+
+
+%package apache-bsf
+Summary:        Optional apache bsf tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description apache-bsf
+Optional apache bsf tasks for %{name}.
+
+
+%package apache-resolver
+Summary:        Optional apache resolver tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description apache-resolver
+Optional apache resolver tasks for %{name}.
+
+
+%package commons-logging
+Summary:        Optional commons logging tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description commons-logging
+Optional commons logging tasks for %{name}.
+
+
+%package commons-net
+Summary:        Optional commons net tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description commons-net
+Optional commons net tasks for %{name}.
+
+%package apache-bcel
+Summary:        Optional apache bcel tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description apache-bcel
+Optional apache bcel tasks for %{name}.
+
+
+%package apache-log4j
+Summary:        Optional apache log4j tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description apache-log4j
+Optional apache log4j tasks for %{name}.
+
+
+%package apache-oro
+Summary:        Optional apache oro tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description apache-oro
+Optional apache oro tasks for %{name}.
+
+
+%package apache-regexp
+Summary:        Optional apache regexp tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description apache-regexp
+Optional apache regexp tasks for %{name}.
+
+
+%package apache-xalan2
+Summary:        Optional apache xalan2 tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description apache-xalan2
+Optional apache xalan2 tasks for %{name}.
+
+
+%package javamail
+Summary:        Optional javamail tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description javamail
+Optional javamail tasks for %{name}.
+
+
+%package jdepend
+Summary:        Optional jdepend tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description jdepend
+Optional jdepend tasks for %{name}.
+
+%package jsch
+Summary:        Optional jsch tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description jsch
+Optional jsch tasks for %{name}.
+
+
+%package junit
+Summary:        Optional junit tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description junit
+Optional junit tasks for %{name}.
+
+
+%package junit5
+Summary:        Optional junit5 tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description junit5
+Optional junit5 tasks for %{name}.
+
+
+%package testutil
+Summary:        Test utility classes for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description testutil
+Test utility tasks for %{name}.
+
+%package xz
+Summary:        Optional xz tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description xz
+Optional xz tasks for %{name}.
+
 %package        help
 Summary:        Documents for %{name}
 Buildarch:      noarch
@@ -179,20 +294,113 @@ LC_ALL=en_US.utf8 %{ant} test
 %files
 %license LICENSE NOTICE
 %config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/%{name}.d/*
+%attr(0755,root,root) %{_bindir}/ant
-%attr(0755,root,root) %{_bindir}/%{name}
+%dir %{ant_home}/bin
-%attr(0755,root,root) %{_datadir}/%{name}/bin/antRun
+%{ant_home}/bin/ant
-%dir %{_datadir}/%{name}
+%attr(0755,root,root) %{ant_home}/bin/antRun
-%dir %{_datadir}/%{name}/*
+%dir %{ant_home}/etc
+%{ant_home}/etc/ant-update.xsl
+%{ant_home}/etc/changelog.xsl
+%{ant_home}/etc/coverage-frames.xsl
+%{ant_home}/etc/mmetrics-frames.xsl
+%{ant_home}/etc/log.xsl
+%{ant_home}/etc/tagdiff.xsl
+%{ant_home}/etc/common2master.xsl
+%{ant_home}/etc/printFailingTests.xsl
 %dir %{_sysconfdir}/%{name}.d
-%{_datadir}/%{name}/bin/%{name}
+
-%{_datadir}/%{name}/lib/%{name}*
+%files lib -f .mfiles-lib
-%{_datadir}/%{name}/etc/*
+%dir %{ant_home}
-%{_datadir}/java/%{name}*jar
+%dir %{ant_home}/lib
-%{_datadir}/java/%{name}/%{name}*
+%{ant_home}/lib/%{name}.jar
-%{_datadir}/maven-metadata/%{name}-*
+%{ant_home}/lib/%{name}-launcher.jar
-%{_datadir}/maven-poms/%{name}*pom
+%{ant_home}/lib/%{name}-bootstrap.jar
-%{_datadir}/maven-poms/%{name}/%{name}*
+
+%files jmf -f .mfiles-jmf
+%{ant_home}/lib/%{name}-jmf.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/jmf
+
+%files swing -f .mfiles-swing
+%{ant_home}/lib/%{name}-swing.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/swing
+
+%files antlr -f .mfiles-antlr
+%{ant_home}/lib/%{name}-antlr.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/antlr
+
+%files apache-bsf -f .mfiles-apache-bsf
+%{ant_home}/lib/%{name}-apache-bsf.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf
+
+%files apache-resolver -f .mfiles-apache-resolver
+%{ant_home}/lib/%{name}-apache-resolver.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver
+
+%files commons-logging -f .mfiles-commons-logging
+%{ant_home}/lib/%{name}-commons-logging.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging
+
+%files commons-net -f .mfiles-commons-net
+%{ant_home}/lib/%{name}-commons-net.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
+
+%files apache-bcel -f .mfiles-apache-bcel
+%{ant_home}/lib/%{name}-apache-bcel.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
+
+%files apache-log4j -f .mfiles-apache-log4j
+%{ant_home}/lib/%{name}-apache-log4j.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
+
+%files apache-oro -f .mfiles-apache-oro
+%{ant_home}/lib/%{name}-apache-oro.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
+%{ant_home}/etc/maudit-frames.xsl
+
+%files apache-regexp -f .mfiles-apache-regexp
+%{ant_home}/lib/%{name}-apache-regexp.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp
+
+%files apache-xalan2 -f .mfiles-apache-xalan2
+%{ant_home}/lib/%{name}-apache-xalan2.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/apache-xalan2
+
+%files javamail -f .mfiles-javamail
+%{ant_home}/lib/%{name}-javamail.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/javamail
+
+%files jdepend -f .mfiles-jdepend
+%{ant_home}/lib/%{name}-jdepend.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/jdepend
+%{ant_home}/etc/jdepend.xsl
+%{ant_home}/etc/jdepend-frames.xsl
+
+%files jsch -f .mfiles-jsch
+%{ant_home}/lib/%{name}-jsch.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/jsch
+
+%files junit -f .mfiles-junit
+%{ant_home}/lib/%{name}-junit.jar
+%{ant_home}/lib/%{name}-junit4.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/junit
+%config(noreplace) %{_sysconfdir}/%{name}.d/junit4
+%{ant_home}/etc/junit-frames.xsl
+%{ant_home}/etc/junit-noframes.xsl
+%{ant_home}/etc/junit-frames-xalan1.xsl
+%{ant_home}/etc/junit-frames-saxon.xsl
+%{ant_home}/etc/junit-noframes-saxon.xsl
+
+%files junit5 -f .mfiles-junitlauncher
+%{ant_home}/lib/%{name}-junitlauncher.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/junitlauncher
+
+%files testutil -f .mfiles-testutil
+%{ant_home}/lib/%{name}-testutil.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/testutil
+
+%files xz -f .mfiles-xz
+%{ant_home}/lib/%{name}-xz.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/xz
 
 %files help
 %license LICENSE NOTICE
@@ -201,5 +409,8 @@ LC_ALL=en_US.utf8 %{ant} test
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Mar 14 2020 zhujunhao<zhujunhao5@huawei.com> - 0:1.10.5-7
+- Split ant pack into subpackets
+
 * Fri Feb 14 2020 gulining<gulining1@huawei.com> - 0:1.10.5-6
 - Package init