This commit is contained in:
parent
5c9c66541b
commit
5b2e22d685
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Upgrade to upstream version 1.10.7
|
||||||
|
- Modified patches:
|
||||||
|
* apache-ant-bootstrap.patch
|
||||||
|
* apache-ant-no-test-jar.patch
|
||||||
|
* apache-ant-xml-apis.patch
|
||||||
|
* reproducible-build-manifest.patch
|
||||||
|
+ rediff
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -18,14 +18,13 @@
|
|||||||
|
|
||||||
|
|
||||||
%global ant_home %{_datadir}/ant
|
%global ant_home %{_datadir}/ant
|
||||||
%global major_version 1.9
|
|
||||||
##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####
|
##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####
|
||||||
%bcond_with bootstrap
|
%bcond_with bootstrap
|
||||||
%bcond_with junit
|
%bcond_with junit
|
||||||
%bcond_with junit5
|
%bcond_with junit5
|
||||||
%bcond_without antlr
|
%bcond_without antlr
|
||||||
Name: ant-antlr
|
Name: ant-antlr
|
||||||
Version: 1.10.5
|
Version: 1.10.7
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Antlr Task for ant
|
Summary: Antlr Task for ant
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -283,6 +282,17 @@ Requires: regexp
|
|||||||
%description -n ant-apache-xalan2
|
%description -n ant-apache-xalan2
|
||||||
Optional apache xalan2 tasks for %{name}.
|
Optional apache xalan2 tasks for %{name}.
|
||||||
|
|
||||||
|
%package -n ant-imageio
|
||||||
|
Summary: Optional imageio tasks for ant
|
||||||
|
License: Apache-2.0
|
||||||
|
Group: Development/Tools/Building
|
||||||
|
%requires_eq ant
|
||||||
|
|
||||||
|
%description -n ant-imageio
|
||||||
|
Apache Ant is a Java-based build tool.
|
||||||
|
|
||||||
|
This package contains optional imageio tasks for Apache Ant.
|
||||||
|
|
||||||
%package -n ant-javamail
|
%package -n ant-javamail
|
||||||
Summary: Optional javamail tasks for ant
|
Summary: Optional javamail tasks for ant
|
||||||
License: CDDL-1.0
|
License: CDDL-1.0
|
||||||
@ -403,7 +413,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
|||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
||||||
export JAVA_HOME="%{java_home}"
|
export JAVA_HOME="%{java_home}"
|
||||||
export BOOTJAVAC_OPTS="-source 8 -target 8"
|
|
||||||
sh -x ./build.sh --noconfig jars
|
sh -x ./build.sh --noconfig jars
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
@ -441,14 +450,14 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
|
|||||||
for jar in build/lib/*.jar
|
for jar in build/lib/*.jar
|
||||||
do
|
do
|
||||||
jarname=$(basename $jar .jar)
|
jarname=$(basename $jar .jar)
|
||||||
pomname="JPP.ant-${jarname}.pom"
|
pomname="${jarname}.pom"
|
||||||
|
|
||||||
#Determine where to put it
|
#Determine where to put it
|
||||||
case $jarname in
|
case $jarname in
|
||||||
#These go into %%{_javadir}, pom files have different names
|
#These go into %%{_javadir}, pom files have different names
|
||||||
ant | ant-bootstrap | ant-launcher)
|
ant | ant-bootstrap | ant-launcher)
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
destdir="%{buildroot}%{_javadir}"; destname="";pomname="JPP-$jarname.pom"
|
destdir="%{buildroot}%{_javadir}/ant"; destname="ant/";pomname="$jarname.pom"
|
||||||
%else
|
%else
|
||||||
continue
|
continue
|
||||||
%endif
|
%endif
|
||||||
@ -557,6 +566,7 @@ echo "log4j12/log4j-12 ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/
|
|||||||
echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
|
echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
|
||||||
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp
|
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp
|
||||||
echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2
|
echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2
|
||||||
|
echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
|
||||||
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
|
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
|
||||||
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
|
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
|
||||||
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
|
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
|
||||||
@ -579,9 +589,8 @@ rm -rf %{buildroot}%{_bindir}/ant.orig
|
|||||||
|
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
pushd %{buildroot}%{_javadir}
|
pushd %{buildroot}%{_javadir}
|
||||||
mkdir -p ant
|
for i in ant-bootstrap ant-launcher ant; do
|
||||||
for i in ant*.jar; do
|
ln -sf ant/${i}.jar ${i}.jar
|
||||||
ln -sf ../${i} ant/${i}
|
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -591,10 +600,9 @@ popd
|
|||||||
%config(noreplace) %{_sysconfdir}/%{name}.conf
|
%config(noreplace) %{_sysconfdir}/%{name}.conf
|
||||||
%attr(0755,root,root) %{_bindir}/ant
|
%attr(0755,root,root) %{_bindir}/ant
|
||||||
%attr(0755,root,root) %{_bindir}/antRun
|
%attr(0755,root,root) %{_bindir}/antRun
|
||||||
%{_javadir}/%{name}/%{name}.jar
|
%{_javadir}/%{name}.jar
|
||||||
%{_javadir}/%{name}/%{name}-launcher.jar
|
%{_javadir}/%{name}-launcher.jar
|
||||||
%{_javadir}/%{name}-bootstrap.jar
|
%{_javadir}/%{name}-bootstrap.jar
|
||||||
%{_javadir}/%{name}/%{name}-bootstrap.jar
|
|
||||||
%dir %{_javadir}/%{name}
|
%dir %{_javadir}/%{name}
|
||||||
%dir %{ant_home}
|
%dir %{ant_home}
|
||||||
%dir %{ant_home}%{_sysconfdir}
|
%dir %{ant_home}%{_sysconfdir}
|
||||||
@ -623,8 +631,8 @@ popd
|
|||||||
%{_javadir}/ant/ant-xz.jar
|
%{_javadir}/ant/ant-xz.jar
|
||||||
%{ant_home}/lib/ant-xz.jar
|
%{ant_home}/lib/ant-xz.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/antlr
|
%config(noreplace) %{_sysconfdir}/ant.d/antlr
|
||||||
%{_mavenpomdir}/JPP.ant-ant-antlr.pom
|
%{_mavenpomdir}/ant-antlr.pom
|
||||||
%{_mavenpomdir}/JPP.ant-ant-xz.pom
|
%{_mavenpomdir}/ant-xz.pom
|
||||||
%if %{defined _maven_repository}
|
%if %{defined _maven_repository}
|
||||||
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr
|
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr
|
||||||
%else
|
%else
|
||||||
@ -669,42 +677,42 @@ popd
|
|||||||
%{_javadir}/ant/ant-apache-bsf.jar
|
%{_javadir}/ant/ant-apache-bsf.jar
|
||||||
%{ant_home}/lib/ant-apache-bsf.jar
|
%{ant_home}/lib/ant-apache-bsf.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-bsf.pom
|
%{_mavenpomdir}/ant-apache-bsf.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-resolver
|
%files -n ant-apache-resolver
|
||||||
%{_javadir}/ant/ant-apache-resolver.jar
|
%{_javadir}/ant/ant-apache-resolver.jar
|
||||||
%{ant_home}/lib/ant-apache-resolver.jar
|
%{ant_home}/lib/ant-apache-resolver.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-resolver.pom
|
%{_mavenpomdir}/ant-apache-resolver.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-commons-logging
|
%files -n ant-commons-logging
|
||||||
%{_javadir}/ant/ant-commons-logging.jar
|
%{_javadir}/ant/ant-commons-logging.jar
|
||||||
%{ant_home}/lib/ant-commons-logging.jar
|
%{ant_home}/lib/ant-commons-logging.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/commons-logging
|
%config(noreplace) %{_sysconfdir}/ant.d/commons-logging
|
||||||
%{_mavenpomdir}/JPP.ant-ant-commons-logging.pom
|
%{_mavenpomdir}/ant-commons-logging.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-commons-net
|
%files -n ant-commons-net
|
||||||
%{_javadir}/ant/ant-commons-net.jar
|
%{_javadir}/ant/ant-commons-net.jar
|
||||||
%{ant_home}/lib/ant-commons-net.jar
|
%{ant_home}/lib/ant-commons-net.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/commons-net
|
%config(noreplace) %{_sysconfdir}/ant.d/commons-net
|
||||||
%{_mavenpomdir}/JPP.ant-ant-commons-net.pom
|
%{_mavenpomdir}/ant-commons-net.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-bcel
|
%files -n ant-apache-bcel
|
||||||
%{_javadir}/ant/ant-apache-bcel.jar
|
%{_javadir}/ant/ant-apache-bcel.jar
|
||||||
%{ant_home}/lib/ant-apache-bcel.jar
|
%{ant_home}/lib/ant-apache-bcel.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-bcel.pom
|
%{_mavenpomdir}/ant-apache-bcel.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-log4j
|
%files -n ant-apache-log4j
|
||||||
%{_javadir}/ant/ant-apache-log4j.jar
|
%{_javadir}/ant/ant-apache-log4j.jar
|
||||||
%{ant_home}/lib/ant-apache-log4j.jar
|
%{ant_home}/lib/ant-apache-log4j.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-log4j.pom
|
%{_mavenpomdir}/ant-apache-log4j.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-oro
|
%files -n ant-apache-oro
|
||||||
@ -712,28 +720,35 @@ popd
|
|||||||
%{ant_home}/lib/ant-apache-oro.jar
|
%{ant_home}/lib/ant-apache-oro.jar
|
||||||
%{ant_home}%{_sysconfdir}/maudit-frames.xsl
|
%{ant_home}%{_sysconfdir}/maudit-frames.xsl
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-oro
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-oro
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-oro.pom
|
%{_mavenpomdir}/ant-apache-oro.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-regexp
|
%files -n ant-apache-regexp
|
||||||
%{_javadir}/ant/ant-apache-regexp.jar
|
%{_javadir}/ant/ant-apache-regexp.jar
|
||||||
%{ant_home}/lib/ant-apache-regexp.jar
|
%{ant_home}/lib/ant-apache-regexp.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-regexp.pom
|
%{_mavenpomdir}/ant-apache-regexp.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-xalan2
|
%files -n ant-apache-xalan2
|
||||||
%{_javadir}/ant/ant-apache-xalan2.jar
|
%{_javadir}/ant/ant-apache-xalan2.jar
|
||||||
%{ant_home}/lib/ant-apache-xalan2.jar
|
%{ant_home}/lib/ant-apache-xalan2.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-xalan2.pom
|
%{_mavenpomdir}/ant-apache-xalan2.pom
|
||||||
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
|
%files -n ant-imageio
|
||||||
|
%{_javadir}/ant/ant-imageio.jar
|
||||||
|
%{ant_home}/lib/ant-imageio.jar
|
||||||
|
%config(noreplace) %{_sysconfdir}/ant.d/imageio
|
||||||
|
%{_mavenpomdir}/ant-imageio.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-javamail
|
%files -n ant-javamail
|
||||||
%{_javadir}/ant/ant-javamail.jar
|
%{_javadir}/ant/ant-javamail.jar
|
||||||
%{ant_home}/lib/ant-javamail.jar
|
%{ant_home}/lib/ant-javamail.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/javamail
|
%config(noreplace) %{_sysconfdir}/ant.d/javamail
|
||||||
%{_mavenpomdir}/JPP.ant-ant-javamail.pom
|
%{_mavenpomdir}/ant-javamail.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-jdepend
|
%files -n ant-jdepend
|
||||||
@ -742,21 +757,21 @@ popd
|
|||||||
%config(noreplace) %{_sysconfdir}/ant.d/jdepend
|
%config(noreplace) %{_sysconfdir}/ant.d/jdepend
|
||||||
%{ant_home}%{_sysconfdir}/jdepend.xsl
|
%{ant_home}%{_sysconfdir}/jdepend.xsl
|
||||||
%{ant_home}%{_sysconfdir}/jdepend-frames.xsl
|
%{ant_home}%{_sysconfdir}/jdepend-frames.xsl
|
||||||
%{_mavenpomdir}/JPP.ant-ant-jdepend.pom
|
%{_mavenpomdir}/ant-jdepend.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-jsch
|
%files -n ant-jsch
|
||||||
%{_javadir}/ant/ant-jsch.jar
|
%{_javadir}/ant/ant-jsch.jar
|
||||||
%{ant_home}/lib/ant-jsch.jar
|
%{ant_home}/lib/ant-jsch.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/jsch
|
%config(noreplace) %{_sysconfdir}/ant.d/jsch
|
||||||
%{_mavenpomdir}/JPP.ant-ant-jsch.pom
|
%{_mavenpomdir}/ant-jsch.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-testutil
|
%files -n ant-testutil
|
||||||
%{_javadir}/ant/ant-testutil.jar
|
%{_javadir}/ant/ant-testutil.jar
|
||||||
%{ant_home}/lib/ant-testutil.jar
|
%{ant_home}/lib/ant-testutil.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/testutil
|
%config(noreplace) %{_sysconfdir}/ant.d/testutil
|
||||||
%{_mavenpomdir}/JPP.ant-ant-testutil.pom
|
%{_mavenpomdir}/ant-testutil.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-manual
|
%files -n ant-manual
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Upgrade to upstream version 1.10.7
|
||||||
|
- Modified patches:
|
||||||
|
* apache-ant-bootstrap.patch
|
||||||
|
* apache-ant-no-test-jar.patch
|
||||||
|
* apache-ant-xml-apis.patch
|
||||||
|
* reproducible-build-manifest.patch
|
||||||
|
+ rediff
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -18,14 +18,13 @@
|
|||||||
|
|
||||||
|
|
||||||
%global ant_home %{_datadir}/ant
|
%global ant_home %{_datadir}/ant
|
||||||
%global major_version 1.9
|
|
||||||
##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####
|
##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####
|
||||||
%bcond_with bootstrap
|
%bcond_with bootstrap
|
||||||
%bcond_without junit
|
%bcond_without junit
|
||||||
%bcond_with junit5
|
%bcond_with junit5
|
||||||
%bcond_with antlr
|
%bcond_with antlr
|
||||||
Name: ant-junit
|
Name: ant-junit
|
||||||
Version: 1.10.5
|
Version: 1.10.7
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Optional junit tasks for ant
|
Summary: Optional junit tasks for ant
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -283,6 +282,17 @@ Requires: regexp
|
|||||||
%description -n ant-apache-xalan2
|
%description -n ant-apache-xalan2
|
||||||
Optional apache xalan2 tasks for %{name}.
|
Optional apache xalan2 tasks for %{name}.
|
||||||
|
|
||||||
|
%package -n ant-imageio
|
||||||
|
Summary: Optional imageio tasks for ant
|
||||||
|
License: Apache-2.0
|
||||||
|
Group: Development/Tools/Building
|
||||||
|
%requires_eq ant
|
||||||
|
|
||||||
|
%description -n ant-imageio
|
||||||
|
Apache Ant is a Java-based build tool.
|
||||||
|
|
||||||
|
This package contains optional imageio tasks for Apache Ant.
|
||||||
|
|
||||||
%package -n ant-javamail
|
%package -n ant-javamail
|
||||||
Summary: Optional javamail tasks for ant
|
Summary: Optional javamail tasks for ant
|
||||||
License: CDDL-1.0
|
License: CDDL-1.0
|
||||||
@ -403,7 +413,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
|||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
||||||
export JAVA_HOME="%{java_home}"
|
export JAVA_HOME="%{java_home}"
|
||||||
export BOOTJAVAC_OPTS="-source 8 -target 8"
|
|
||||||
sh -x ./build.sh --noconfig jars
|
sh -x ./build.sh --noconfig jars
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
@ -441,14 +450,14 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
|
|||||||
for jar in build/lib/*.jar
|
for jar in build/lib/*.jar
|
||||||
do
|
do
|
||||||
jarname=$(basename $jar .jar)
|
jarname=$(basename $jar .jar)
|
||||||
pomname="JPP.ant-${jarname}.pom"
|
pomname="${jarname}.pom"
|
||||||
|
|
||||||
#Determine where to put it
|
#Determine where to put it
|
||||||
case $jarname in
|
case $jarname in
|
||||||
#These go into %%{_javadir}, pom files have different names
|
#These go into %%{_javadir}, pom files have different names
|
||||||
ant | ant-bootstrap | ant-launcher)
|
ant | ant-bootstrap | ant-launcher)
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
destdir="%{buildroot}%{_javadir}"; destname="";pomname="JPP-$jarname.pom"
|
destdir="%{buildroot}%{_javadir}/ant"; destname="ant/";pomname="$jarname.pom"
|
||||||
%else
|
%else
|
||||||
continue
|
continue
|
||||||
%endif
|
%endif
|
||||||
@ -557,6 +566,7 @@ echo "log4j12/log4j-12 ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/
|
|||||||
echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
|
echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
|
||||||
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp
|
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp
|
||||||
echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2
|
echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2
|
||||||
|
echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
|
||||||
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
|
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
|
||||||
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
|
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
|
||||||
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
|
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
|
||||||
@ -579,9 +589,8 @@ rm -rf %{buildroot}%{_bindir}/ant.orig
|
|||||||
|
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
pushd %{buildroot}%{_javadir}
|
pushd %{buildroot}%{_javadir}
|
||||||
mkdir -p ant
|
for i in ant-bootstrap ant-launcher ant; do
|
||||||
for i in ant*.jar; do
|
ln -sf ant/${i}.jar ${i}.jar
|
||||||
ln -sf ../${i} ant/${i}
|
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -591,10 +600,9 @@ popd
|
|||||||
%config(noreplace) %{_sysconfdir}/%{name}.conf
|
%config(noreplace) %{_sysconfdir}/%{name}.conf
|
||||||
%attr(0755,root,root) %{_bindir}/ant
|
%attr(0755,root,root) %{_bindir}/ant
|
||||||
%attr(0755,root,root) %{_bindir}/antRun
|
%attr(0755,root,root) %{_bindir}/antRun
|
||||||
%{_javadir}/%{name}/%{name}.jar
|
%{_javadir}/%{name}.jar
|
||||||
%{_javadir}/%{name}/%{name}-launcher.jar
|
%{_javadir}/%{name}-launcher.jar
|
||||||
%{_javadir}/%{name}-bootstrap.jar
|
%{_javadir}/%{name}-bootstrap.jar
|
||||||
%{_javadir}/%{name}/%{name}-bootstrap.jar
|
|
||||||
%dir %{_javadir}/%{name}
|
%dir %{_javadir}/%{name}
|
||||||
%dir %{ant_home}
|
%dir %{ant_home}
|
||||||
%dir %{ant_home}%{_sysconfdir}
|
%dir %{ant_home}%{_sysconfdir}
|
||||||
@ -623,8 +631,8 @@ popd
|
|||||||
%{_javadir}/ant/ant-xz.jar
|
%{_javadir}/ant/ant-xz.jar
|
||||||
%{ant_home}/lib/ant-xz.jar
|
%{ant_home}/lib/ant-xz.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/antlr
|
%config(noreplace) %{_sysconfdir}/ant.d/antlr
|
||||||
%{_mavenpomdir}/JPP.ant-ant-antlr.pom
|
%{_mavenpomdir}/ant-antlr.pom
|
||||||
%{_mavenpomdir}/JPP.ant-ant-xz.pom
|
%{_mavenpomdir}/ant-xz.pom
|
||||||
%if %{defined _maven_repository}
|
%if %{defined _maven_repository}
|
||||||
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr
|
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr
|
||||||
%else
|
%else
|
||||||
@ -669,42 +677,42 @@ popd
|
|||||||
%{_javadir}/ant/ant-apache-bsf.jar
|
%{_javadir}/ant/ant-apache-bsf.jar
|
||||||
%{ant_home}/lib/ant-apache-bsf.jar
|
%{ant_home}/lib/ant-apache-bsf.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-bsf.pom
|
%{_mavenpomdir}/ant-apache-bsf.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-resolver
|
%files -n ant-apache-resolver
|
||||||
%{_javadir}/ant/ant-apache-resolver.jar
|
%{_javadir}/ant/ant-apache-resolver.jar
|
||||||
%{ant_home}/lib/ant-apache-resolver.jar
|
%{ant_home}/lib/ant-apache-resolver.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-resolver.pom
|
%{_mavenpomdir}/ant-apache-resolver.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-commons-logging
|
%files -n ant-commons-logging
|
||||||
%{_javadir}/ant/ant-commons-logging.jar
|
%{_javadir}/ant/ant-commons-logging.jar
|
||||||
%{ant_home}/lib/ant-commons-logging.jar
|
%{ant_home}/lib/ant-commons-logging.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/commons-logging
|
%config(noreplace) %{_sysconfdir}/ant.d/commons-logging
|
||||||
%{_mavenpomdir}/JPP.ant-ant-commons-logging.pom
|
%{_mavenpomdir}/ant-commons-logging.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-commons-net
|
%files -n ant-commons-net
|
||||||
%{_javadir}/ant/ant-commons-net.jar
|
%{_javadir}/ant/ant-commons-net.jar
|
||||||
%{ant_home}/lib/ant-commons-net.jar
|
%{ant_home}/lib/ant-commons-net.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/commons-net
|
%config(noreplace) %{_sysconfdir}/ant.d/commons-net
|
||||||
%{_mavenpomdir}/JPP.ant-ant-commons-net.pom
|
%{_mavenpomdir}/ant-commons-net.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-bcel
|
%files -n ant-apache-bcel
|
||||||
%{_javadir}/ant/ant-apache-bcel.jar
|
%{_javadir}/ant/ant-apache-bcel.jar
|
||||||
%{ant_home}/lib/ant-apache-bcel.jar
|
%{ant_home}/lib/ant-apache-bcel.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-bcel.pom
|
%{_mavenpomdir}/ant-apache-bcel.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-log4j
|
%files -n ant-apache-log4j
|
||||||
%{_javadir}/ant/ant-apache-log4j.jar
|
%{_javadir}/ant/ant-apache-log4j.jar
|
||||||
%{ant_home}/lib/ant-apache-log4j.jar
|
%{ant_home}/lib/ant-apache-log4j.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-log4j.pom
|
%{_mavenpomdir}/ant-apache-log4j.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-oro
|
%files -n ant-apache-oro
|
||||||
@ -712,28 +720,35 @@ popd
|
|||||||
%{ant_home}/lib/ant-apache-oro.jar
|
%{ant_home}/lib/ant-apache-oro.jar
|
||||||
%{ant_home}%{_sysconfdir}/maudit-frames.xsl
|
%{ant_home}%{_sysconfdir}/maudit-frames.xsl
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-oro
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-oro
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-oro.pom
|
%{_mavenpomdir}/ant-apache-oro.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-regexp
|
%files -n ant-apache-regexp
|
||||||
%{_javadir}/ant/ant-apache-regexp.jar
|
%{_javadir}/ant/ant-apache-regexp.jar
|
||||||
%{ant_home}/lib/ant-apache-regexp.jar
|
%{ant_home}/lib/ant-apache-regexp.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-regexp.pom
|
%{_mavenpomdir}/ant-apache-regexp.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-xalan2
|
%files -n ant-apache-xalan2
|
||||||
%{_javadir}/ant/ant-apache-xalan2.jar
|
%{_javadir}/ant/ant-apache-xalan2.jar
|
||||||
%{ant_home}/lib/ant-apache-xalan2.jar
|
%{ant_home}/lib/ant-apache-xalan2.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-xalan2.pom
|
%{_mavenpomdir}/ant-apache-xalan2.pom
|
||||||
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
|
%files -n ant-imageio
|
||||||
|
%{_javadir}/ant/ant-imageio.jar
|
||||||
|
%{ant_home}/lib/ant-imageio.jar
|
||||||
|
%config(noreplace) %{_sysconfdir}/ant.d/imageio
|
||||||
|
%{_mavenpomdir}/ant-imageio.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-javamail
|
%files -n ant-javamail
|
||||||
%{_javadir}/ant/ant-javamail.jar
|
%{_javadir}/ant/ant-javamail.jar
|
||||||
%{ant_home}/lib/ant-javamail.jar
|
%{ant_home}/lib/ant-javamail.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/javamail
|
%config(noreplace) %{_sysconfdir}/ant.d/javamail
|
||||||
%{_mavenpomdir}/JPP.ant-ant-javamail.pom
|
%{_mavenpomdir}/ant-javamail.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-jdepend
|
%files -n ant-jdepend
|
||||||
@ -742,21 +757,21 @@ popd
|
|||||||
%config(noreplace) %{_sysconfdir}/ant.d/jdepend
|
%config(noreplace) %{_sysconfdir}/ant.d/jdepend
|
||||||
%{ant_home}%{_sysconfdir}/jdepend.xsl
|
%{ant_home}%{_sysconfdir}/jdepend.xsl
|
||||||
%{ant_home}%{_sysconfdir}/jdepend-frames.xsl
|
%{ant_home}%{_sysconfdir}/jdepend-frames.xsl
|
||||||
%{_mavenpomdir}/JPP.ant-ant-jdepend.pom
|
%{_mavenpomdir}/ant-jdepend.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-jsch
|
%files -n ant-jsch
|
||||||
%{_javadir}/ant/ant-jsch.jar
|
%{_javadir}/ant/ant-jsch.jar
|
||||||
%{ant_home}/lib/ant-jsch.jar
|
%{ant_home}/lib/ant-jsch.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/jsch
|
%config(noreplace) %{_sysconfdir}/ant.d/jsch
|
||||||
%{_mavenpomdir}/JPP.ant-ant-jsch.pom
|
%{_mavenpomdir}/ant-jsch.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-testutil
|
%files -n ant-testutil
|
||||||
%{_javadir}/ant/ant-testutil.jar
|
%{_javadir}/ant/ant-testutil.jar
|
||||||
%{ant_home}/lib/ant-testutil.jar
|
%{ant_home}/lib/ant-testutil.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/testutil
|
%config(noreplace) %{_sysconfdir}/ant.d/testutil
|
||||||
%{_mavenpomdir}/JPP.ant-ant-testutil.pom
|
%{_mavenpomdir}/ant-testutil.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-manual
|
%files -n ant-manual
|
||||||
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Upgrade to upstream version 1.10.7
|
||||||
|
- Modified patches:
|
||||||
|
* apache-ant-bootstrap.patch
|
||||||
|
* apache-ant-no-test-jar.patch
|
||||||
|
* apache-ant-xml-apis.patch
|
||||||
|
* reproducible-build-manifest.patch
|
||||||
|
+ rediff
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -18,14 +18,13 @@
|
|||||||
|
|
||||||
|
|
||||||
%global ant_home %{_datadir}/ant
|
%global ant_home %{_datadir}/ant
|
||||||
%global major_version 1.9
|
|
||||||
##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####
|
##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####
|
||||||
%bcond_with bootstrap
|
%bcond_with bootstrap
|
||||||
%bcond_with junit
|
%bcond_with junit
|
||||||
%bcond_without junit5
|
%bcond_without junit5
|
||||||
%bcond_with antlr
|
%bcond_with antlr
|
||||||
Name: ant-junit5
|
Name: ant-junit5
|
||||||
Version: 1.10.5
|
Version: 1.10.7
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Optional junit tasks for ant
|
Summary: Optional junit tasks for ant
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -283,6 +282,17 @@ Requires: regexp
|
|||||||
%description -n ant-apache-xalan2
|
%description -n ant-apache-xalan2
|
||||||
Optional apache xalan2 tasks for %{name}.
|
Optional apache xalan2 tasks for %{name}.
|
||||||
|
|
||||||
|
%package -n ant-imageio
|
||||||
|
Summary: Optional imageio tasks for ant
|
||||||
|
License: Apache-2.0
|
||||||
|
Group: Development/Tools/Building
|
||||||
|
%requires_eq ant
|
||||||
|
|
||||||
|
%description -n ant-imageio
|
||||||
|
Apache Ant is a Java-based build tool.
|
||||||
|
|
||||||
|
This package contains optional imageio tasks for Apache Ant.
|
||||||
|
|
||||||
%package -n ant-javamail
|
%package -n ant-javamail
|
||||||
Summary: Optional javamail tasks for ant
|
Summary: Optional javamail tasks for ant
|
||||||
License: CDDL-1.0
|
License: CDDL-1.0
|
||||||
@ -403,7 +413,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
|||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
||||||
export JAVA_HOME="%{java_home}"
|
export JAVA_HOME="%{java_home}"
|
||||||
export BOOTJAVAC_OPTS="-source 8 -target 8"
|
|
||||||
sh -x ./build.sh --noconfig jars
|
sh -x ./build.sh --noconfig jars
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
@ -441,14 +450,14 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
|
|||||||
for jar in build/lib/*.jar
|
for jar in build/lib/*.jar
|
||||||
do
|
do
|
||||||
jarname=$(basename $jar .jar)
|
jarname=$(basename $jar .jar)
|
||||||
pomname="JPP.ant-${jarname}.pom"
|
pomname="${jarname}.pom"
|
||||||
|
|
||||||
#Determine where to put it
|
#Determine where to put it
|
||||||
case $jarname in
|
case $jarname in
|
||||||
#These go into %%{_javadir}, pom files have different names
|
#These go into %%{_javadir}, pom files have different names
|
||||||
ant | ant-bootstrap | ant-launcher)
|
ant | ant-bootstrap | ant-launcher)
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
destdir="%{buildroot}%{_javadir}"; destname="";pomname="JPP-$jarname.pom"
|
destdir="%{buildroot}%{_javadir}/ant"; destname="ant/";pomname="$jarname.pom"
|
||||||
%else
|
%else
|
||||||
continue
|
continue
|
||||||
%endif
|
%endif
|
||||||
@ -557,6 +566,7 @@ echo "log4j12/log4j-12 ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/
|
|||||||
echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
|
echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
|
||||||
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp
|
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp
|
||||||
echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2
|
echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2
|
||||||
|
echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
|
||||||
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
|
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
|
||||||
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
|
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
|
||||||
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
|
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
|
||||||
@ -579,9 +589,8 @@ rm -rf %{buildroot}%{_bindir}/ant.orig
|
|||||||
|
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
pushd %{buildroot}%{_javadir}
|
pushd %{buildroot}%{_javadir}
|
||||||
mkdir -p ant
|
for i in ant-bootstrap ant-launcher ant; do
|
||||||
for i in ant*.jar; do
|
ln -sf ant/${i}.jar ${i}.jar
|
||||||
ln -sf ../${i} ant/${i}
|
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -591,10 +600,9 @@ popd
|
|||||||
%config(noreplace) %{_sysconfdir}/%{name}.conf
|
%config(noreplace) %{_sysconfdir}/%{name}.conf
|
||||||
%attr(0755,root,root) %{_bindir}/ant
|
%attr(0755,root,root) %{_bindir}/ant
|
||||||
%attr(0755,root,root) %{_bindir}/antRun
|
%attr(0755,root,root) %{_bindir}/antRun
|
||||||
%{_javadir}/%{name}/%{name}.jar
|
%{_javadir}/%{name}.jar
|
||||||
%{_javadir}/%{name}/%{name}-launcher.jar
|
%{_javadir}/%{name}-launcher.jar
|
||||||
%{_javadir}/%{name}-bootstrap.jar
|
%{_javadir}/%{name}-bootstrap.jar
|
||||||
%{_javadir}/%{name}/%{name}-bootstrap.jar
|
|
||||||
%dir %{_javadir}/%{name}
|
%dir %{_javadir}/%{name}
|
||||||
%dir %{ant_home}
|
%dir %{ant_home}
|
||||||
%dir %{ant_home}%{_sysconfdir}
|
%dir %{ant_home}%{_sysconfdir}
|
||||||
@ -623,8 +631,8 @@ popd
|
|||||||
%{_javadir}/ant/ant-xz.jar
|
%{_javadir}/ant/ant-xz.jar
|
||||||
%{ant_home}/lib/ant-xz.jar
|
%{ant_home}/lib/ant-xz.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/antlr
|
%config(noreplace) %{_sysconfdir}/ant.d/antlr
|
||||||
%{_mavenpomdir}/JPP.ant-ant-antlr.pom
|
%{_mavenpomdir}/ant-antlr.pom
|
||||||
%{_mavenpomdir}/JPP.ant-ant-xz.pom
|
%{_mavenpomdir}/ant-xz.pom
|
||||||
%if %{defined _maven_repository}
|
%if %{defined _maven_repository}
|
||||||
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr
|
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr
|
||||||
%else
|
%else
|
||||||
@ -669,42 +677,42 @@ popd
|
|||||||
%{_javadir}/ant/ant-apache-bsf.jar
|
%{_javadir}/ant/ant-apache-bsf.jar
|
||||||
%{ant_home}/lib/ant-apache-bsf.jar
|
%{ant_home}/lib/ant-apache-bsf.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-bsf.pom
|
%{_mavenpomdir}/ant-apache-bsf.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-resolver
|
%files -n ant-apache-resolver
|
||||||
%{_javadir}/ant/ant-apache-resolver.jar
|
%{_javadir}/ant/ant-apache-resolver.jar
|
||||||
%{ant_home}/lib/ant-apache-resolver.jar
|
%{ant_home}/lib/ant-apache-resolver.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-resolver.pom
|
%{_mavenpomdir}/ant-apache-resolver.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-commons-logging
|
%files -n ant-commons-logging
|
||||||
%{_javadir}/ant/ant-commons-logging.jar
|
%{_javadir}/ant/ant-commons-logging.jar
|
||||||
%{ant_home}/lib/ant-commons-logging.jar
|
%{ant_home}/lib/ant-commons-logging.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/commons-logging
|
%config(noreplace) %{_sysconfdir}/ant.d/commons-logging
|
||||||
%{_mavenpomdir}/JPP.ant-ant-commons-logging.pom
|
%{_mavenpomdir}/ant-commons-logging.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-commons-net
|
%files -n ant-commons-net
|
||||||
%{_javadir}/ant/ant-commons-net.jar
|
%{_javadir}/ant/ant-commons-net.jar
|
||||||
%{ant_home}/lib/ant-commons-net.jar
|
%{ant_home}/lib/ant-commons-net.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/commons-net
|
%config(noreplace) %{_sysconfdir}/ant.d/commons-net
|
||||||
%{_mavenpomdir}/JPP.ant-ant-commons-net.pom
|
%{_mavenpomdir}/ant-commons-net.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-bcel
|
%files -n ant-apache-bcel
|
||||||
%{_javadir}/ant/ant-apache-bcel.jar
|
%{_javadir}/ant/ant-apache-bcel.jar
|
||||||
%{ant_home}/lib/ant-apache-bcel.jar
|
%{ant_home}/lib/ant-apache-bcel.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-bcel.pom
|
%{_mavenpomdir}/ant-apache-bcel.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-log4j
|
%files -n ant-apache-log4j
|
||||||
%{_javadir}/ant/ant-apache-log4j.jar
|
%{_javadir}/ant/ant-apache-log4j.jar
|
||||||
%{ant_home}/lib/ant-apache-log4j.jar
|
%{ant_home}/lib/ant-apache-log4j.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-log4j.pom
|
%{_mavenpomdir}/ant-apache-log4j.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-oro
|
%files -n ant-apache-oro
|
||||||
@ -712,28 +720,35 @@ popd
|
|||||||
%{ant_home}/lib/ant-apache-oro.jar
|
%{ant_home}/lib/ant-apache-oro.jar
|
||||||
%{ant_home}%{_sysconfdir}/maudit-frames.xsl
|
%{ant_home}%{_sysconfdir}/maudit-frames.xsl
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-oro
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-oro
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-oro.pom
|
%{_mavenpomdir}/ant-apache-oro.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-regexp
|
%files -n ant-apache-regexp
|
||||||
%{_javadir}/ant/ant-apache-regexp.jar
|
%{_javadir}/ant/ant-apache-regexp.jar
|
||||||
%{ant_home}/lib/ant-apache-regexp.jar
|
%{ant_home}/lib/ant-apache-regexp.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-regexp.pom
|
%{_mavenpomdir}/ant-apache-regexp.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-xalan2
|
%files -n ant-apache-xalan2
|
||||||
%{_javadir}/ant/ant-apache-xalan2.jar
|
%{_javadir}/ant/ant-apache-xalan2.jar
|
||||||
%{ant_home}/lib/ant-apache-xalan2.jar
|
%{ant_home}/lib/ant-apache-xalan2.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-xalan2.pom
|
%{_mavenpomdir}/ant-apache-xalan2.pom
|
||||||
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
|
%files -n ant-imageio
|
||||||
|
%{_javadir}/ant/ant-imageio.jar
|
||||||
|
%{ant_home}/lib/ant-imageio.jar
|
||||||
|
%config(noreplace) %{_sysconfdir}/ant.d/imageio
|
||||||
|
%{_mavenpomdir}/ant-imageio.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-javamail
|
%files -n ant-javamail
|
||||||
%{_javadir}/ant/ant-javamail.jar
|
%{_javadir}/ant/ant-javamail.jar
|
||||||
%{ant_home}/lib/ant-javamail.jar
|
%{ant_home}/lib/ant-javamail.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/javamail
|
%config(noreplace) %{_sysconfdir}/ant.d/javamail
|
||||||
%{_mavenpomdir}/JPP.ant-ant-javamail.pom
|
%{_mavenpomdir}/ant-javamail.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-jdepend
|
%files -n ant-jdepend
|
||||||
@ -742,21 +757,21 @@ popd
|
|||||||
%config(noreplace) %{_sysconfdir}/ant.d/jdepend
|
%config(noreplace) %{_sysconfdir}/ant.d/jdepend
|
||||||
%{ant_home}%{_sysconfdir}/jdepend.xsl
|
%{ant_home}%{_sysconfdir}/jdepend.xsl
|
||||||
%{ant_home}%{_sysconfdir}/jdepend-frames.xsl
|
%{ant_home}%{_sysconfdir}/jdepend-frames.xsl
|
||||||
%{_mavenpomdir}/JPP.ant-ant-jdepend.pom
|
%{_mavenpomdir}/ant-jdepend.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-jsch
|
%files -n ant-jsch
|
||||||
%{_javadir}/ant/ant-jsch.jar
|
%{_javadir}/ant/ant-jsch.jar
|
||||||
%{ant_home}/lib/ant-jsch.jar
|
%{ant_home}/lib/ant-jsch.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/jsch
|
%config(noreplace) %{_sysconfdir}/ant.d/jsch
|
||||||
%{_mavenpomdir}/JPP.ant-ant-jsch.pom
|
%{_mavenpomdir}/ant-jsch.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-testutil
|
%files -n ant-testutil
|
||||||
%{_javadir}/ant/ant-testutil.jar
|
%{_javadir}/ant/ant-testutil.jar
|
||||||
%{ant_home}/lib/ant-testutil.jar
|
%{ant_home}/lib/ant-testutil.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/testutil
|
%config(noreplace) %{_sysconfdir}/ant.d/testutil
|
||||||
%{_mavenpomdir}/JPP.ant-ant-testutil.pom
|
%{_mavenpomdir}/ant-testutil.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-manual
|
%files -n ant-manual
|
||||||
|
11
ant.changes
11
ant.changes
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Upgrade to upstream version 1.10.7
|
||||||
|
- Modified patches:
|
||||||
|
* apache-ant-bootstrap.patch
|
||||||
|
* apache-ant-no-test-jar.patch
|
||||||
|
* apache-ant-xml-apis.patch
|
||||||
|
* reproducible-build-manifest.patch
|
||||||
|
+ rediff
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
1572
ant.keyring
1572
ant.keyring
File diff suppressed because it is too large
Load Diff
67
ant.spec
67
ant.spec
@ -18,13 +18,12 @@
|
|||||||
|
|
||||||
|
|
||||||
%global ant_home %{_datadir}/ant
|
%global ant_home %{_datadir}/ant
|
||||||
%global major_version 1.9
|
|
||||||
%bcond_without bootstrap
|
%bcond_without bootstrap
|
||||||
%bcond_with junit
|
%bcond_with junit
|
||||||
%bcond_with junit5
|
%bcond_with junit5
|
||||||
%bcond_with antlr
|
%bcond_with antlr
|
||||||
Name: ant
|
Name: ant
|
||||||
Version: 1.10.5
|
Version: 1.10.7
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Java-based build tool
|
Summary: Java-based build tool
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -282,6 +281,17 @@ Requires: regexp
|
|||||||
%description -n ant-apache-xalan2
|
%description -n ant-apache-xalan2
|
||||||
Optional apache xalan2 tasks for %{name}.
|
Optional apache xalan2 tasks for %{name}.
|
||||||
|
|
||||||
|
%package -n ant-imageio
|
||||||
|
Summary: Optional imageio tasks for ant
|
||||||
|
License: Apache-2.0
|
||||||
|
Group: Development/Tools/Building
|
||||||
|
%requires_eq ant
|
||||||
|
|
||||||
|
%description -n ant-imageio
|
||||||
|
Apache Ant is a Java-based build tool.
|
||||||
|
|
||||||
|
This package contains optional imageio tasks for Apache Ant.
|
||||||
|
|
||||||
%package -n ant-javamail
|
%package -n ant-javamail
|
||||||
Summary: Optional javamail tasks for ant
|
Summary: Optional javamail tasks for ant
|
||||||
License: CDDL-1.0
|
License: CDDL-1.0
|
||||||
@ -402,7 +412,6 @@ rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar
|
|||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
|
||||||
export JAVA_HOME="%{java_home}"
|
export JAVA_HOME="%{java_home}"
|
||||||
export BOOTJAVAC_OPTS="-source 8 -target 8"
|
|
||||||
sh -x ./build.sh --noconfig jars
|
sh -x ./build.sh --noconfig jars
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
@ -440,14 +449,14 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
|
|||||||
for jar in build/lib/*.jar
|
for jar in build/lib/*.jar
|
||||||
do
|
do
|
||||||
jarname=$(basename $jar .jar)
|
jarname=$(basename $jar .jar)
|
||||||
pomname="JPP.ant-${jarname}.pom"
|
pomname="${jarname}.pom"
|
||||||
|
|
||||||
#Determine where to put it
|
#Determine where to put it
|
||||||
case $jarname in
|
case $jarname in
|
||||||
#These go into %%{_javadir}, pom files have different names
|
#These go into %%{_javadir}, pom files have different names
|
||||||
ant | ant-bootstrap | ant-launcher)
|
ant | ant-bootstrap | ant-launcher)
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
destdir="%{buildroot}%{_javadir}"; destname="";pomname="JPP-$jarname.pom"
|
destdir="%{buildroot}%{_javadir}/ant"; destname="ant/";pomname="$jarname.pom"
|
||||||
%else
|
%else
|
||||||
continue
|
continue
|
||||||
%endif
|
%endif
|
||||||
@ -556,6 +565,7 @@ echo "log4j12/log4j-12 ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/
|
|||||||
echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
|
echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
|
||||||
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp
|
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp
|
||||||
echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2
|
echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2
|
||||||
|
echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
|
||||||
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
|
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
|
||||||
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
|
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
|
||||||
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
|
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
|
||||||
@ -578,9 +588,8 @@ rm -rf %{buildroot}%{_bindir}/ant.orig
|
|||||||
|
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
pushd %{buildroot}%{_javadir}
|
pushd %{buildroot}%{_javadir}
|
||||||
mkdir -p ant
|
for i in ant-bootstrap ant-launcher ant; do
|
||||||
for i in ant*.jar; do
|
ln -sf ant/${i}.jar ${i}.jar
|
||||||
ln -sf ../${i} ant/${i}
|
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -590,10 +599,9 @@ popd
|
|||||||
%config(noreplace) %{_sysconfdir}/%{name}.conf
|
%config(noreplace) %{_sysconfdir}/%{name}.conf
|
||||||
%attr(0755,root,root) %{_bindir}/ant
|
%attr(0755,root,root) %{_bindir}/ant
|
||||||
%attr(0755,root,root) %{_bindir}/antRun
|
%attr(0755,root,root) %{_bindir}/antRun
|
||||||
%{_javadir}/%{name}/%{name}.jar
|
%{_javadir}/%{name}.jar
|
||||||
%{_javadir}/%{name}/%{name}-launcher.jar
|
%{_javadir}/%{name}-launcher.jar
|
||||||
%{_javadir}/%{name}-bootstrap.jar
|
%{_javadir}/%{name}-bootstrap.jar
|
||||||
%{_javadir}/%{name}/%{name}-bootstrap.jar
|
|
||||||
%dir %{_javadir}/%{name}
|
%dir %{_javadir}/%{name}
|
||||||
%dir %{ant_home}
|
%dir %{ant_home}
|
||||||
%dir %{ant_home}%{_sysconfdir}
|
%dir %{ant_home}%{_sysconfdir}
|
||||||
@ -622,8 +630,8 @@ popd
|
|||||||
%{_javadir}/ant/ant-xz.jar
|
%{_javadir}/ant/ant-xz.jar
|
||||||
%{ant_home}/lib/ant-xz.jar
|
%{ant_home}/lib/ant-xz.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/antlr
|
%config(noreplace) %{_sysconfdir}/ant.d/antlr
|
||||||
%{_mavenpomdir}/JPP.ant-ant-antlr.pom
|
%{_mavenpomdir}/ant-antlr.pom
|
||||||
%{_mavenpomdir}/JPP.ant-ant-xz.pom
|
%{_mavenpomdir}/ant-xz.pom
|
||||||
%if %{defined _maven_repository}
|
%if %{defined _maven_repository}
|
||||||
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr
|
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr
|
||||||
%else
|
%else
|
||||||
@ -668,42 +676,42 @@ popd
|
|||||||
%{_javadir}/ant/ant-apache-bsf.jar
|
%{_javadir}/ant/ant-apache-bsf.jar
|
||||||
%{ant_home}/lib/ant-apache-bsf.jar
|
%{ant_home}/lib/ant-apache-bsf.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-bsf.pom
|
%{_mavenpomdir}/ant-apache-bsf.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-resolver
|
%files -n ant-apache-resolver
|
||||||
%{_javadir}/ant/ant-apache-resolver.jar
|
%{_javadir}/ant/ant-apache-resolver.jar
|
||||||
%{ant_home}/lib/ant-apache-resolver.jar
|
%{ant_home}/lib/ant-apache-resolver.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-resolver.pom
|
%{_mavenpomdir}/ant-apache-resolver.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-commons-logging
|
%files -n ant-commons-logging
|
||||||
%{_javadir}/ant/ant-commons-logging.jar
|
%{_javadir}/ant/ant-commons-logging.jar
|
||||||
%{ant_home}/lib/ant-commons-logging.jar
|
%{ant_home}/lib/ant-commons-logging.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/commons-logging
|
%config(noreplace) %{_sysconfdir}/ant.d/commons-logging
|
||||||
%{_mavenpomdir}/JPP.ant-ant-commons-logging.pom
|
%{_mavenpomdir}/ant-commons-logging.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-commons-net
|
%files -n ant-commons-net
|
||||||
%{_javadir}/ant/ant-commons-net.jar
|
%{_javadir}/ant/ant-commons-net.jar
|
||||||
%{ant_home}/lib/ant-commons-net.jar
|
%{ant_home}/lib/ant-commons-net.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/commons-net
|
%config(noreplace) %{_sysconfdir}/ant.d/commons-net
|
||||||
%{_mavenpomdir}/JPP.ant-ant-commons-net.pom
|
%{_mavenpomdir}/ant-commons-net.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-bcel
|
%files -n ant-apache-bcel
|
||||||
%{_javadir}/ant/ant-apache-bcel.jar
|
%{_javadir}/ant/ant-apache-bcel.jar
|
||||||
%{ant_home}/lib/ant-apache-bcel.jar
|
%{ant_home}/lib/ant-apache-bcel.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-bcel.pom
|
%{_mavenpomdir}/ant-apache-bcel.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-log4j
|
%files -n ant-apache-log4j
|
||||||
%{_javadir}/ant/ant-apache-log4j.jar
|
%{_javadir}/ant/ant-apache-log4j.jar
|
||||||
%{ant_home}/lib/ant-apache-log4j.jar
|
%{ant_home}/lib/ant-apache-log4j.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-log4j.pom
|
%{_mavenpomdir}/ant-apache-log4j.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-oro
|
%files -n ant-apache-oro
|
||||||
@ -711,28 +719,35 @@ popd
|
|||||||
%{ant_home}/lib/ant-apache-oro.jar
|
%{ant_home}/lib/ant-apache-oro.jar
|
||||||
%{ant_home}%{_sysconfdir}/maudit-frames.xsl
|
%{ant_home}%{_sysconfdir}/maudit-frames.xsl
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-oro
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-oro
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-oro.pom
|
%{_mavenpomdir}/ant-apache-oro.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-regexp
|
%files -n ant-apache-regexp
|
||||||
%{_javadir}/ant/ant-apache-regexp.jar
|
%{_javadir}/ant/ant-apache-regexp.jar
|
||||||
%{ant_home}/lib/ant-apache-regexp.jar
|
%{ant_home}/lib/ant-apache-regexp.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-regexp.pom
|
%{_mavenpomdir}/ant-apache-regexp.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-apache-xalan2
|
%files -n ant-apache-xalan2
|
||||||
%{_javadir}/ant/ant-apache-xalan2.jar
|
%{_javadir}/ant/ant-apache-xalan2.jar
|
||||||
%{ant_home}/lib/ant-apache-xalan2.jar
|
%{ant_home}/lib/ant-apache-xalan2.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2
|
%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2
|
||||||
%{_mavenpomdir}/JPP.ant-ant-apache-xalan2.pom
|
%{_mavenpomdir}/ant-apache-xalan2.pom
|
||||||
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
|
%files -n ant-imageio
|
||||||
|
%{_javadir}/ant/ant-imageio.jar
|
||||||
|
%{ant_home}/lib/ant-imageio.jar
|
||||||
|
%config(noreplace) %{_sysconfdir}/ant.d/imageio
|
||||||
|
%{_mavenpomdir}/ant-imageio.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-javamail
|
%files -n ant-javamail
|
||||||
%{_javadir}/ant/ant-javamail.jar
|
%{_javadir}/ant/ant-javamail.jar
|
||||||
%{ant_home}/lib/ant-javamail.jar
|
%{ant_home}/lib/ant-javamail.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/javamail
|
%config(noreplace) %{_sysconfdir}/ant.d/javamail
|
||||||
%{_mavenpomdir}/JPP.ant-ant-javamail.pom
|
%{_mavenpomdir}/ant-javamail.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-jdepend
|
%files -n ant-jdepend
|
||||||
@ -741,21 +756,21 @@ popd
|
|||||||
%config(noreplace) %{_sysconfdir}/ant.d/jdepend
|
%config(noreplace) %{_sysconfdir}/ant.d/jdepend
|
||||||
%{ant_home}%{_sysconfdir}/jdepend.xsl
|
%{ant_home}%{_sysconfdir}/jdepend.xsl
|
||||||
%{ant_home}%{_sysconfdir}/jdepend-frames.xsl
|
%{ant_home}%{_sysconfdir}/jdepend-frames.xsl
|
||||||
%{_mavenpomdir}/JPP.ant-ant-jdepend.pom
|
%{_mavenpomdir}/ant-jdepend.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-jsch
|
%files -n ant-jsch
|
||||||
%{_javadir}/ant/ant-jsch.jar
|
%{_javadir}/ant/ant-jsch.jar
|
||||||
%{ant_home}/lib/ant-jsch.jar
|
%{ant_home}/lib/ant-jsch.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/jsch
|
%config(noreplace) %{_sysconfdir}/ant.d/jsch
|
||||||
%{_mavenpomdir}/JPP.ant-ant-jsch.pom
|
%{_mavenpomdir}/ant-jsch.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-testutil
|
%files -n ant-testutil
|
||||||
%{_javadir}/ant/ant-testutil.jar
|
%{_javadir}/ant/ant-testutil.jar
|
||||||
%{ant_home}/lib/ant-testutil.jar
|
%{ant_home}/lib/ant-testutil.jar
|
||||||
%config(noreplace) %{_sysconfdir}/ant.d/testutil
|
%config(noreplace) %{_sysconfdir}/ant.d/testutil
|
||||||
%{_mavenpomdir}/JPP.ant-ant-testutil.pom
|
%{_mavenpomdir}/ant-testutil.pom
|
||||||
%dir %{_mavenpomdir}
|
%dir %{_mavenpomdir}
|
||||||
|
|
||||||
%files -n ant-manual
|
%files -n ant-manual
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:71a5cdd45a54901b6321d5a140d882f7580c38f766a4e4959bcc36555da9f3ac
|
|
||||||
size 4465063
|
|
@ -1,7 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iHEEABECADEWIQTOgHWiUVR77iSbwVGiEVrhX2uLcgUCW0Q7MxMcYm9kZXdpZ0Bh
|
|
||||||
cGFjaGUub3JnAAoJEKIRWuFfa4tyzhgAnjm93RxZse+OTsHXSA4m/txk26H2AKDR
|
|
||||||
0ZiH+bMOnsqyf0QiKV6KJHHk/A==
|
|
||||||
=CfJX
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
apache-ant-1.10.7-src.tar.bz2
Normal file
3
apache-ant-1.10.7-src.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:39882eff327f4a056d77605f0a973d4f30d003083e54fa0885ddab6055b6c8de
|
||||||
|
size 4530166
|
16
apache-ant-1.10.7-src.tar.bz2.asc
Normal file
16
apache-ant-1.10.7-src.tar.bz2.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEjacMAN968bDS+dx03bzBJwop0IEFAl1rY3EACgkQ3bzBJwop
|
||||||
|
0IF11g/9FL4Slu7usL4FA1biNcKxzj6Su/k+rf9EeJNy0j4pR62Uygevq4sfrSVi
|
||||||
|
bShsHGKlMFQMMbS80OCk9TXp9Q0xL5yRAQlC9RZ13k4JcCxyCLg1hKsiBcOHRHSG
|
||||||
|
rhfbkmWNj/a86JBazCu6R+uiAqC31LHN/5qrDFWCQ3bPFAIXHHVR7ZDl/L2etBlT
|
||||||
|
9mTLh1NH0Dh2tFwX7r+DWkn5UfLFXt0Mx3HJBkFcbT72FT1/PMhG3jKxdKQFri04
|
||||||
|
UEglwA5dVurcHaNt/WchO+5Bijyp5CYCnga5JV9iyIhVQrU4n8g90rqCZKgZ0Idy
|
||||||
|
WMBJ5bOBlQ5gxuZRRFmx+qrZxuo+n6cyIvPgRZE8wWWYhC2eSEPy5xH0tZZJ1Yjl
|
||||||
|
do+dRAkloEmxxEQi6ptohmU23Z6zX5IHYT3F1IC/7GQFxaB+EXuUiXLMteQ2Ydwn
|
||||||
|
EwSvMPxO/tqAs4Eev2Cqpsq4ERXmKlJLIfZRbg+z7dpD8QrszBrXd4Q8mWHVE98c
|
||||||
|
OhMCvcVWT9DqnppZx7wRCb5ku6ZuSgqJQpVJ8iCG9xs5TQBUwYzTjryF6HElyOa0
|
||||||
|
xVvrXaQEKcZUIpLkhJ6z7OZH6xtft/OoIy8VhIaphkYjc5M2ogG1k8oxm0kNNiLj
|
||||||
|
UkmpvJIImDxXX30M4A1DqmRHgHJCTaiJ1UDRy59tW21zFO1PGTQ=
|
||||||
|
=J/gx
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,13 +1,11 @@
|
|||||||
Index: apache-ant-1.9.10/bootstrap.sh
|
--- apache-ant-1.10.7/bootstrap.sh 2019-09-01 08:14:10.000000000 +0200
|
||||||
===================================================================
|
+++ apache-ant-1.10.7/bootstrap.sh 2019-10-12 12:34:23.892369973 +0200
|
||||||
--- apache-ant-1.9.10.orig/bootstrap.sh
|
@@ -143,7 +143,7 @@
|
||||||
+++ apache-ant-1.9.10/bootstrap.sh
|
echo ... Compiling Ant Classes with ${JAVAC_RELEASE_VERSION}
|
||||||
@@ -129,7 +129,7 @@ mkdir -p bin
|
fi
|
||||||
|
|
||||||
echo ... Compiling Ant Classes
|
-"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${JAVAC_RELEASE_VERSION} \
|
||||||
|
+"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} -sourcepath src/main ${JAVAC_RELEASE_VERSION} \
|
||||||
-"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
|
${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
|
||||||
+"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} -sourcepath src/main ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
|
|
||||||
${TOOLS}/ant/util/regexp/RegexpMatcher.java \
|
${TOOLS}/ant/util/regexp/RegexpMatcher.java \
|
||||||
${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
|
${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
|
||||||
${TOOLS}/ant/property/*.java \
|
|
||||||
|
@ -1,17 +1,11 @@
|
|||||||
---
|
--- apache-ant-1.10.7/build.xml 2019-09-01 08:14:10.000000000 +0200
|
||||||
build.xml | 2 +-
|
+++ apache-ant-1.10.7/build.xml 2019-10-12 12:30:11.014986025 +0200
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
@@ -976,7 +976,7 @@
|
||||||
|
|
||||||
Index: apache-ant-1.9.10/build.xml
|
|
||||||
===================================================================
|
|
||||||
--- apache-ant-1.9.10.orig/build.xml
|
|
||||||
+++ apache-ant-1.9.10/build.xml
|
|
||||||
@@ -878,7 +878,7 @@
|
|
||||||
Create the essential distribution that can run Apache Ant
|
Create the essential distribution that can run Apache Ant
|
||||||
===================================================================
|
===================================================================
|
||||||
-->
|
-->
|
||||||
- <target name="dist-lite" depends="jars,test-jar"
|
- <target name="dist-lite" depends="jars,test-jar,-ant-dist-warn-jdk9+"
|
||||||
+ <target name="dist-lite" depends="jars"
|
+ <target name="dist-lite" depends="jars,-ant-dist-warn-jdk9+"
|
||||||
description="--> creates a minimum distribution to run Apache Ant">
|
description="--> creates a minimum distribution to run Apache Ant">
|
||||||
|
|
||||||
<mkdir dir="${dist.dir}"/>
|
<mkdir dir="${dist.dir}"/>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
# variable
|
# variable
|
||||||
if $rpm_mode && [ -x /usr/bin/build-classpath ]; then
|
if $rpm_mode && [ -x /usr/bin/build-classpath ]; then
|
||||||
- LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
|
- LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
|
||||||
+ LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-apis)"
|
+ LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher)"
|
||||||
|
|
||||||
# If no optional jars have been specified then build the default list
|
# If no optional jars have been specified then build the default list
|
||||||
if [ -z "$OPT_JAR_LIST" ]; then
|
if [ -z "$OPT_JAR_LIST" ]; then
|
||||||
|
@ -18,15 +18,15 @@ not relevant).
|
|||||||
--
|
--
|
||||||
--- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java
|
--- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java
|
||||||
+++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
|
+++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
|
||||||
@@ -816,10 +816,7 @@ public class Manifest {
|
@@ -760,10 +760,7 @@
|
||||||
try {
|
defManifest);
|
||||||
insr = new InputStreamReader(in, "UTF-8");
|
}
|
||||||
Manifest defaultManifest = new Manifest(insr);
|
Manifest defaultManifest = new Manifest(new InputStreamReader(in, JAR_CHARSET));
|
||||||
- String version = System.getProperty("java.runtime.version");
|
- String version = System.getProperty("java.runtime.version");
|
||||||
- if (version == null) {
|
- if (version == null) {
|
||||||
- version = System.getProperty("java.vm.version");
|
- version = System.getProperty("java.vm.version");
|
||||||
- }
|
- }
|
||||||
+ String version = System.getProperty("java.version");
|
+ String version = System.getProperty("java.version");
|
||||||
Attribute createdBy = new Attribute("Created-By",
|
Attribute createdBy = new Attribute("Created-By", version
|
||||||
version + " ("
|
+ " (" + System.getProperty("java.vm.vendor") + ")");
|
||||||
+ System.getProperty("java.vm.vendor") + ")");
|
defaultManifest.getMainSection().storeAttribute(createdBy);
|
||||||
|
Loading…
Reference in New Issue
Block a user