|
|
@ -31,14 +31,14 @@
|
|
|
|
%global ant_home %{_datadir}/ant
|
|
|
|
%global ant_home %{_datadir}/ant
|
|
|
|
|
|
|
|
|
|
|
|
Name: ant
|
|
|
|
Name: ant
|
|
|
|
Version: 1.10.9
|
|
|
|
Version: 1.10.7
|
|
|
|
Release: 1%{?dist}
|
|
|
|
Release: 2%{?dist}
|
|
|
|
Summary: Java build tool
|
|
|
|
Summary: Java build tool
|
|
|
|
Summary(it): Tool per la compilazione di programmi java
|
|
|
|
Summary(it): Tool per la compilazione di programmi java
|
|
|
|
Summary(fr): Outil de compilation pour java
|
|
|
|
Summary(fr): Outil de compilation pour java
|
|
|
|
License: ASL 2.0
|
|
|
|
License: ASL 2.0
|
|
|
|
URL: https://ant.apache.org/
|
|
|
|
URL: https://ant.apache.org/
|
|
|
|
Source0: https://archive.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
|
|
|
|
Source0: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
|
|
|
|
Source2: apache-ant-1.8.ant.conf
|
|
|
|
Source2: apache-ant-1.8.ant.conf
|
|
|
|
# manpage
|
|
|
|
# manpage
|
|
|
|
Source3: ant.asciidoc
|
|
|
|
Source3: ant.asciidoc
|
|
|
@ -62,6 +62,7 @@ BuildRequires: mvn(commons-net:commons-net)
|
|
|
|
BuildRequires: mvn(javax.mail:mail)
|
|
|
|
BuildRequires: mvn(javax.mail:mail)
|
|
|
|
BuildRequires: mvn(jdepend:jdepend)
|
|
|
|
BuildRequires: mvn(jdepend:jdepend)
|
|
|
|
BuildRequires: mvn(junit:junit)
|
|
|
|
BuildRequires: mvn(junit:junit)
|
|
|
|
|
|
|
|
BuildRequires: mvn(log4j:log4j:1.2.13)
|
|
|
|
BuildRequires: mvn(org.tukaani:xz)
|
|
|
|
BuildRequires: mvn(org.tukaani:xz)
|
|
|
|
BuildRequires: mvn(oro:oro)
|
|
|
|
BuildRequires: mvn(oro:oro)
|
|
|
|
BuildRequires: mvn(regexp:regexp)
|
|
|
|
BuildRequires: mvn(regexp:regexp)
|
|
|
@ -196,6 +197,16 @@ Optional apache bcel tasks for %{name}.
|
|
|
|
%description apache-bcel -l fr
|
|
|
|
%description apache-bcel -l fr
|
|
|
|
Taches apache bcel optionelles pour %{name}.
|
|
|
|
Taches apache bcel optionelles pour %{name}.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%package apache-log4j
|
|
|
|
|
|
|
|
Summary: Optional apache log4j tasks for %{name}
|
|
|
|
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%description apache-log4j
|
|
|
|
|
|
|
|
Optional apache log4j tasks for %{name}.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%description apache-log4j -l fr
|
|
|
|
|
|
|
|
Taches apache log4j optionelles pour %{name}.
|
|
|
|
|
|
|
|
|
|
|
|
%package apache-oro
|
|
|
|
%package apache-oro
|
|
|
|
Summary: Optional apache oro tasks for %{name}
|
|
|
|
Summary: Optional apache oro tasks for %{name}
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
@ -322,7 +333,7 @@ Javadoc pour %{name}.
|
|
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
%prep
|
|
|
|
%setup -q -n apache-ant-%{version}
|
|
|
|
%setup -q -n apache-ant-%{version}
|
|
|
|
%patch0 -p0
|
|
|
|
%patch0 -p1
|
|
|
|
|
|
|
|
|
|
|
|
# clean jar files
|
|
|
|
# clean jar files
|
|
|
|
find . -name "*.jar" | xargs -t rm
|
|
|
|
find . -name "*.jar" | xargs -t rm
|
|
|
@ -339,7 +350,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
|
|
|
|
src/tests/junit/org/apache/tools/mail/MailMessageTest.java
|
|
|
|
src/tests/junit/org/apache/tools/mail/MailMessageTest.java
|
|
|
|
|
|
|
|
|
|
|
|
#install jars
|
|
|
|
#install jars
|
|
|
|
build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j
|
|
|
|
build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j
|
|
|
|
|
|
|
|
|
|
|
|
# fix hardcoded paths in ant script and conf
|
|
|
|
# fix hardcoded paths in ant script and conf
|
|
|
|
cp -p %{SOURCE2} %{name}.conf
|
|
|
|
cp -p %{SOURCE2} %{name}.conf
|
|
|
@ -362,11 +373,6 @@ mv LICENSE.utf8 LICENSE
|
|
|
|
# We want a hard dep on antlr
|
|
|
|
# We want a hard dep on antlr
|
|
|
|
%pom_xpath_remove pom:optional src/etc/poms/ant-antlr/pom.xml
|
|
|
|
%pom_xpath_remove pom:optional src/etc/poms/ant-antlr/pom.xml
|
|
|
|
|
|
|
|
|
|
|
|
# Disable tests comparing exception message
|
|
|
|
|
|
|
|
sed -i /'public void testFailOnError()'/i@org.junit.Ignore src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
rm src/main/org/apache/tools/ant/listener/Log4jListener.java
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
%build
|
|
|
|
%{ant} jars test-jar javadocs
|
|
|
|
%{ant} jars test-jar javadocs
|
|
|
|
|
|
|
|
|
|
|
@ -379,8 +385,6 @@ xmlto man man/%{name}.xml -o man
|
|
|
|
rm -fr build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
|
|
|
rm -fr build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
rm -fr build/lib/ant-apache-log4j.jar
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
%install
|
|
|
|
# ANT_HOME and subdirs
|
|
|
|
# ANT_HOME and subdirs
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin}
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin}
|
|
|
@ -449,6 +453,7 @@ echo "apache-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_syscon
|
|
|
|
echo "apache-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
|
|
|
|
echo "apache-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
|
|
|
|
#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name}.d/jai
|
|
|
|
#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name}.d/jai
|
|
|
|
echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel
|
|
|
|
echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel
|
|
|
|
|
|
|
|
echo "log4j12 ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j
|
|
|
|
echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro
|
|
|
|
echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro
|
|
|
|
echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp
|
|
|
|
echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp
|
|
|
|
echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2
|
|
|
|
echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2
|
|
|
@ -538,6 +543,10 @@ export LC_ALL=C.UTF-8
|
|
|
|
%{ant_home}/lib/%{name}-apache-bcel.jar
|
|
|
|
%{ant_home}/lib/%{name}-apache-bcel.jar
|
|
|
|
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
|
|
|
|
%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
|
|
|
|
%files apache-oro -f .mfiles-apache-oro
|
|
|
|
%{ant_home}/lib/%{name}-apache-oro.jar
|
|
|
|
%{ant_home}/lib/%{name}-apache-oro.jar
|
|
|
|
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
|
|
|
|
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
|
|
|
@ -603,9 +612,6 @@ export LC_ALL=C.UTF-8
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
* Tue Jan 30 2024 Marián Konček <mkoncek@redhat.com> - 1.10.9-1
|
|
|
|
|
|
|
|
- Update to upstream version 1.10.9
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.7-2
|
|
|
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.7-2
|
|
|
|
- Mass rebuild for javapackages-tools 201902
|
|
|
|
- Mass rebuild for javapackages-tools 201902
|
|
|
|
|
|
|
|
|
|
|
|