commit 58e7ff7524f2d6987ab9d3b293e97c247757add56daee94e1d010d3e0ca15d75 Author: OBS User unknown Date: Mon Jan 15 22:51:08 2007 +0000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/README.PACKAGER b/README.PACKAGER new file mode 100644 index 0000000..e6f043e --- /dev/null +++ b/README.PACKAGER @@ -0,0 +1 @@ +Ant is splitted in two subpackages to avoid circular dependencies (see neededforbuilds of the two spec files) diff --git a/ant-1.6.5-use_system_libs.patch b/ant-1.6.5-use_system_libs.patch new file mode 100644 index 0000000..0e6acd8 --- /dev/null +++ b/ant-1.6.5-use_system_libs.patch @@ -0,0 +1,13 @@ +Index: bootstrap.sh +=================================================================== +--- bootstrap.sh ++++ bootstrap.sh +@@ -96,7 +96,7 @@ if [ -d "build" ] ; then + rm -r build + fi + +-CLASSPATH=lib/xercesImpl.jar:lib/xml-apis.jar:${CLASSPATH} ++CLASSPATH=$(/usr/bin/build-classpath jaxp_parser_impl xml-commons-apis):${CLASSPATH} + + DIRLIBS=lib/optional/*.jar + for i in ${DIRLIBS} diff --git a/ant-antlr.changes b/ant-antlr.changes new file mode 100644 index 0000000..c175c06 --- /dev/null +++ b/ant-antlr.changes @@ -0,0 +1,165 @@ +------------------------------------------------------------------- +Fri Sep 22 15:48:51 CEST 2006 - dbornkessel@suse.de + +- added source=1.4 + +------------------------------------------------------------------- +Mon May 8 14:29:41 CEST 2006 - dbornkessel@suse.de + +- changed last change (see line below): Requires are only bound to the version, not to the release anymore + --> lrupp: fix Requires for ant (#171473 describes the same for dbus-1) + +------------------------------------------------------------------- +Thu Feb 2 20:55:06 CET 2006 - dbornkessel@suse.de + +- fixed rpmlint errors and warnings + +------------------------------------------------------------------- +Tue Jan 31 17:29:45 CET 2006 - dbornkessel@suse.de + +- only ant-antlr updates + +------------------------------------------------------------------- +Fri Jan 27 12:12:48 CET 2006 - dbornkessel@suse.de + +- added four missing xsl files +- removed JAVA_HOME magic + +------------------------------------------------------------------- +Tue Jan 24 16:55:46 CET 2006 - dbornkessel@suse.de + +- Not dependend on xml-commons-apis, which are provided by xerces-j2, which does not + depend on ant package (in contrast to old dependency on + xml-commons-apis <-> ant) +- optional task are now again in extra spec file ant-antlr + + +------------------------------------------------------------------- +Thu Jan 19 14:10:18 CET 2006 - dbornkessel@suse.de + +- Integrated ant and ant-antlr again in one spec file as there is no + dependency loop ... jpackage BuildRequires were wrong. +- updated to version 1.6.5 + +------------------------------------------------------------------- +Mon Dec 19 10:46:33 CET 2005 - dbornkessel@suse.de + +- added if statement that hinders unwanted creation of a file within a for loop + +------------------------------------------------------------------- +Thu Sep 29 00:10:39 CEST 2005 - dmueller@suse.de + + - add norootforbuild + +------------------------------------------------------------------- +Fri Mar 4 13:53:08 CET 2005 - skh@suse.de + +- rely on jpackage-utils' java-functions to set JAVA_HOME correctly + +------------------------------------------------------------------- +Sun Sep 5 20:00:07 CEST 2004 - skh@suse.de + +- create and add /usr/share/java/ant to file list for optional + tasks to put their jars into + +------------------------------------------------------------------- +Thu Sep 2 15:58:19 CEST 2004 - skh@suse.de + +- renamed from apache-ant to ant +- switched to JPackage 1.5 version +- updated to version 1.6.2 +- split off optional tasks into separate package to solve build + dependency loop in JPackage + + +------------------------------------------------------------------- +Thu Feb 2 21:17:16 CET 2006 - dbornkessel@suse.de + +------------------------------------------------------------------- +Thu Feb 2 20:55:06 CET 2006 - dbornkessel@suse.de + +- fixed rpmlint errors and warnings + +------------------------------------------------------------------- +Tue Jan 31 17:29:45 CET 2006 - dbornkessel@suse.de + +- only ant-antlr updates + +------------------------------------------------------------------- +Fri Jan 27 12:12:48 CET 2006 - dbornkessel@suse.de + +- added four missing xsl files +- removed JAVA_HOME magic + +------------------------------------------------------------------- +Tue Jan 24 16:55:46 CET 2006 - dbornkessel@suse.de + +- Not dependend on xml-commons-apis, which are provided by xerces-j2, which does not + depend on ant package (in contrast to old dependency on + xml-commons-apis <-> ant) +- optional task are now again in extra spec file ant-antlr + + +------------------------------------------------------------------- +Thu Jan 19 14:10:18 CET 2006 - dbornkessel@suse.de + +- Integrated ant and ant-antlr again in one spec file as there is no + dependency loop ... jpackage BuildRequires were wrong. +- updated to version 1.6.5 + +------------------------------------------------------------------- +Mon Dec 19 10:46:33 CET 2005 - dbornkessel@suse.de + +- added if statement that hinders unwanted creation of a file within a for loop + +------------------------------------------------------------------- +Thu Sep 29 00:10:39 CEST 2005 - dmueller@suse.de + + - add norootforbuild + +------------------------------------------------------------------- +Fri Mar 4 13:53:08 CET 2005 - skh@suse.de + +- rely on jpackage-utils' java-functions to set JAVA_HOME correctly + +------------------------------------------------------------------- +Sun Sep 5 20:00:07 CEST 2004 - skh@suse.de + +- create and add /usr/share/java/ant to file list for optional + tasks to put their jars into + +------------------------------------------------------------------- +Thu Sep 2 15:58:19 CEST 2004 - skh@suse.de + +- renamed from apache-ant to ant +- switched to JPackage 1.5 version +- updated to version 1.6.2 +- split off optional tasks into separate package to solve build + dependency loop in JPackage + + +------------------------------------------------------------------- +Thu Feb 2 20:54:34 CET 2006 - dbornkessel@suse.de + +- fixed rpmlint errors and warnings + +------------------------------------------------------------------- +Tue Jan 31 17:04:03 CET 2006 - dbornkessel@suse.de + +- removed noarch due to different dependencies +- removed jsch and commons-net because we don't have the necessary packages +- ifarch'ed jai as it has a binary only dependency on a i386-only package + +------------------------------------------------------------------- +Fri Jan 27 12:12:48 CET 2006 - dbornkessel@suse.de + +- added BuildRoot +- removed JAVA_HOME magic + +------------------------------------------------------------------- + +Tue Jan 25 13:24:00 CET 2006 - dbornkessel@suse.de + +- build optional task in an extra spec file due to circular dependencies + +------------------------------------------------------------------- diff --git a/ant-antlr.spec b/ant-antlr.spec new file mode 100644 index 0000000..eec0aee --- /dev/null +++ b/ant-antlr.spec @@ -0,0 +1,534 @@ +# +# spec file for package ant-antlr (Version 1.6.5) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: ant-antlr +BuildRequires: ant antlr bcel bsf jaf jakarta-commons-logging java2-devel-packages javamail jdepend junit log4j oro regexp xalan-j2 xerces-j2 +%ifarch %ix86 +BuildRequires: jai +%endif +%define ant_home %{_datadir}/ant +%define ant_name ant +%define section free +Version: 1.6.5 +Release: 25 +URL: http://jakarta.apache.org/ +Group: Development/Tools/Building +Source0: apache-ant-%{version}-src.tar.bz2 +# Ant configuration file which is edited when each optional subpackage +# is installed/uninstalled +Summary: Optional antlr Tasks for Ant +License: Other License(s), see package, Apache +# Ant configuration file which is edited when each optional subpackage +# is installed/uninstalled +# Fix temp directory used for file containing large command strings (> 4k) +Requires: %{ant_name} = %{version} +Conflicts: ant-optional-clean, ant-optional-full +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch150: java150_build.patch + +%description +Apache Ant is a Java-based build tool. This package contains optional +antlr tasks for Apache Ant. + + + +%ifarch %ix86 +%package -n ant-jai +Summary: Optional jai tasks for ant +Group: Development/Tools/Building +Requires: jai +Provides: ant-jai = %{version}-%{release} +Requires: %{ant_name} = %{version} +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-jai +Apache Ant is a Java-based build tool. + +This package contains optional jai tasks for Apache Ant. + + + +%endif +%package -n ant-commons-logging +Summary: Optional commons logging tasks for ant +Group: Development/Tools/Building +Requires: jakarta-commons-logging +Provides: ant-commons-logging = %{version}-%{release} +Requires: %{ant_name} = %{version} +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-commons-logging +Apache Ant is a Java-based build tool. + +This package contains optional commons logging tasks for Apache Ant. + + + +%package -n ant-apache-bsf +Summary: Optional apache bsf tasks for ant +Group: Development/Tools/Building +Requires: bsf +Requires: %{ant_name} = %{version} +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-apache-bsf +Apache Ant is a Java-based build tool. + +This package contains optional apache bsf tasks for Apache Ant. + + + +%package -n ant-apache-resolver +Summary: Optional apache resolver tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Requires: xml-commons-resolver +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-apache-resolver +Apache Ant is a Java-based build tool. + +This package contains optional apache resolver tasks for Apache Ant. + + + +%package -n ant-apache-bcel +Summary: Optional apache bcel tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Requires: bcel +Provides: ant-jakarta-bcel = %{version}-%{release} +Obsoletes: ant-jakarta-bcel +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-apache-bcel +Apache Ant is a Java-based build tool. + +This package contains optional apache bcel tasks for Apache Ant. + + + +%package -n ant-apache-log4j +Summary: Optional apache log4j tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Requires: log4j +Provides: ant-jakarta-log4j = %{version}-%{release} +Obsoletes: ant-jakarta-log4j +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-apache-log4j +Apache Ant is a Java-based build tool. + +This package contains optional apache log4j tasks for Apache Ant. + + + +%package -n ant-apache-oro +Summary: Optional apache oro tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Requires: oro +Provides: ant-jakarta-oro = %{version}-%{release} +Obsoletes: ant-jakarta-oro +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-apache-oro +Apache Ant is a Java-based build tool. + +This package contains optional apache oro tasks for Apache Ant. + + + +%package -n ant-apache-regexp +Summary: Optional apache regexp tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Requires: regexp +Provides: ant-jakarta-regexp = %{version}-%{release} +Obsoletes: ant-jakarta-regexp +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-apache-regexp +Apache Ant is a Java-based build tool. + +This package contains optional apache regexp tasks for Apache Ant. + + + +%package -n ant-javamail +Summary: Optional javamail tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Requires: javamail >= 1.2-5jpp +Requires: jaf >= 1.0.1-5jpp +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-javamail +Apache Ant is a Java-based build tool. + +This package contains optional javamail tasks for Apache Ant. + + + +%package -n ant-jdepend +Summary: Optional jdepend tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Requires: jdepend +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-jdepend +Apache Ant is a Java-based build tool. + +This package contains optional jdepend tasks for Apache Ant. + + + +%package -n ant-jmf +Summary: Optional jmf tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-jmf +Apache Ant is a Java-based build tool. + +This package contains optional jmf tasks for Apache Ant. + + + +%package -n ant-junit +Summary: Optional junit tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Requires: junit +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-junit +Apache Ant is a Java-based build tool. + +This package contains optional JUnit tasks for Apache Ant. + + + +%package -n ant-nodeps +Summary: Optional tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-nodeps +Apache Ant is a Java-based build tool. + +This package contains optional tasks for Apache Ant. + + + +%package -n ant-swing +Summary: Optional swing tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-swing +Apache Ant is a Java-based build tool. + +This package contains optional swing tasks for Apache Ant. + + + +%package -n ant-trax +Summary: Optional trax tasks for ant +Group: Development/Tools/Building +Requires: %{ant_name} = %{version} +Requires: jaxp_transform_impl +# The ant-xalan jar has been merged into the ant-trax one +Obsoletes: ant-xalan2 +Provides: ant-xalan2 +Conflicts: ant-optional-clean, ant-optional-full + +%description -n ant-trax +Apache Ant is a Java-based build tool. + +This package contains optional trax tasks for Apache Ant. + + + +%prep +%setup -q -n apache-ant-%{version} +# Fix temp directory used for file containing large command strings (> 4k) +# clean jar files +%patch150 -p1 +find . -name "*.jar" -exec rm -f {} \; +# ----------------------------------------------------------------------------- + +%build +%ifarch %ix86 +export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging jai/jai_codec jai/jai_core bsf xml-commons-resolver regexp regexp javamail xml-commons-resolver jakarta-commons-logging jdepend xalan-j2) +%else +export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging bsf xml-commons-resolver regexp regexp javamail xml-commons-resolver jakarta-commons-logging jdepend ) +%endif +# perform bootstrap and build without jjp or user configs, +# (except JAVA_HOME as required by build script) +#[ -n "$JAVA_HOME" ] && unset JAVA_HOME +#[ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf +#[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java +export JAVA_HOME +sh build.sh --noconfig jars javadocs + +%install +# jars +mkdir -p $RPM_BUILD_ROOT%{_javadir} +# optional jars +mkdir -p $RPM_BUILD_ROOT%{_javadir}/ant +cp -p build/lib/%{ant_name}-antlr.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-antlr-%{version}.jar +cp -p build/lib/%{ant_name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-apache-bsf-%{version}.jar +cp -p build/lib/%{ant_name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-apache-resolver-%{version}.jar +cp -p build/lib/%{ant_name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-apache-bcel-%{version}.jar +cp -p build/lib/%{ant_name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-apache-log4j-%{version}.jar +cp -p build/lib/%{ant_name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-apache-oro-%{version}.jar +cp -p build/lib/%{ant_name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-apache-regexp-%{version}.jar +cp -p build/lib/%{ant_name}-javamail.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-javamail-%{version}.jar +cp -p build/lib/%{ant_name}-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-jdepend-%{version}.jar +cp -p build/lib/%{ant_name}-jmf.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-jmf-%{version}.jar +cp -p build/lib/%{ant_name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-commons-logging-%{version}.jar +#cp -p build/lib/% {ant_name}-commons-net.jar $RPM_BUILD_ROOT% {_javadir}/% {ant_name}/% {ant_name}-commons-net-% {version}.jar +cp -p build/lib/%{ant_name}-junit.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-junit-%{version}.jar +#cp -p build/lib/% {ant_name}-jsch.jar $RPM_BUILD_ROOT% {_javadir}/% {ant_name}/% {ant_name}-jsch-% {version}.jar +%ifarch %ix86 +cp -p build/lib/%{ant_name}-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{ant_name}/%{ant_name}-jai-%{version}.jar +%endif +cp -p build/lib/%{ant_name}-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{ant_name}/%{ant_name}-nodeps-%{version}.jar +cp -p build/lib/%{ant_name}-swing.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-swing-%{version}.jar +cp -p build/lib/%{ant_name}-trax.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-trax-%{version}.jar +# jar aliases +(cd $RPM_BUILD_ROOT%{_javadir} && for jar in `ls *-%{version}.jar`; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +(cd $RPM_BUILD_ROOT%{_javadir}/ant && for jar in `ls *-%{version}.jar`; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +# XSLs +mkdir -p $RPM_BUILD_ROOT%{ant_home}/etc +cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc/ +rm $RPM_BUILD_ROOT%{ant_home}/etc/ant-update.xsl +rm $RPM_BUILD_ROOT%{ant_home}/etc/changelog.xsl +rm $RPM_BUILD_ROOT%{ant_home}/etc/log.xsl +rm $RPM_BUILD_ROOT%{ant_home}/etc/tagdiff.xsl +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d +# OPT_JAR_LIST fragments +echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/antlr +echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-bsf +echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-resolver +echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/commons-logging +#echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT% {_sysconfdir}/% {ant_name}.d/commons-net +%ifarch %ix86 +echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/jai +%endif +echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-bcel +echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-log4j +echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-oro +echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-regexp +echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/javamail +echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/jdepend +echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/jmf +#echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT% {_sysconfdir}/% {ant_name}.d/jsch +echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/junit +echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/nodeps +echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/swing +echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/trax + +%files +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-antlr.jar +%{_javadir}/%{ant_name}/%{ant_name}-antlr-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/antlr + +%files -n ant-apache-bsf +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-apache-bsf.jar +%{_javadir}/%{ant_name}/%{ant_name}-apache-bsf-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/apache-bsf + +%files -n ant-apache-resolver +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-apache-resolver.jar +%{_javadir}/%{ant_name}/%{ant_name}-apache-resolver-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/apache-resolver + +%files -n ant-commons-logging +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-commons-logging.jar +%{_javadir}/%{ant_name}/%{ant_name}-commons-logging-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/commons-logging +#% files -n ant-commons-net +#% defattr(0644,root,root,0755) +#% {_javadir}/% {ant_name}/% {ant_name}-commons-net.jar +#% {_javadir}/% {ant_name}/% {ant_name}-commons-net-% {version}.jar +#% {_sysconfdir}/% {ant_name}.d/commons-net +%ifarch %ix86 + +%files -n ant-jai +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-jai.jar +%{_javadir}/%{ant_name}/%{ant_name}-jai-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/jai +%endif + +%files -n ant-apache-bcel +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-apache-bcel.jar +%{_javadir}/%{ant_name}/%{ant_name}-apache-bcel-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/apache-bcel + +%files -n ant-apache-log4j +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-apache-log4j.jar +%{_javadir}/%{ant_name}/%{ant_name}-apache-log4j-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/apache-log4j + +%files -n ant-apache-oro +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-apache-oro.jar +%{_javadir}/%{ant_name}/%{ant_name}-apache-oro-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/apache-oro +%dir %{ant_home}/etc/ +%{ant_home}/etc/maudit-frames.xsl + +%files -n ant-apache-regexp +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-apache-regexp.jar +%{_javadir}/%{ant_name}/%{ant_name}-apache-regexp-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/apache-regexp + +%files -n ant-javamail +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-javamail.jar +%{_javadir}/%{ant_name}/%{ant_name}-javamail-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/javamail + +%files -n ant-jdepend +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-jdepend.jar +%{_javadir}/%{ant_name}/%{ant_name}-jdepend-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/jdepend +%dir %{ant_home}/etc/ +%{ant_home}/etc/jdepend.xsl +%{ant_home}/etc/jdepend-frames.xsl + +%files -n ant-jmf +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-jmf.jar +%{_javadir}/%{ant_name}/%{ant_name}-jmf-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/jmf +#% files -n ant-jsch +#% defattr(0644,root,root,0755) +#% {_javadir}/% {ant_name}/% {ant_name}-jsch.jar +#% {_javadir}/% {ant_name}/% {ant_name}-jsch-% {version}.jar +#% {_sysconfdir}/% {ant_name}.d/jsch + +%files -n ant-junit +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-junit.jar +%{_javadir}/%{ant_name}/%{ant_name}-junit-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/junit +%dir %{ant_home}/etc/ +%{ant_home}/etc/junit-frames.xsl +%{ant_home}/etc/junit-noframes.xsl +%{ant_home}/etc/junit-frames-xalan1.xsl + +%files -n ant-nodeps +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-nodeps.jar +%{_javadir}/%{ant_name}/%{ant_name}-nodeps-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/nodeps + +%files -n ant-swing +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-swing.jar +%{_javadir}/%{ant_name}/%{ant_name}-swing-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/swing + +%files -n ant-trax +%defattr(0644,root,root,0755) +%{_javadir}/%{ant_name}/%{ant_name}-trax.jar +%{_javadir}/%{ant_name}/%{ant_name}-trax-%{version}.jar +%config %{_sysconfdir}/%{ant_name}.d/trax +%dir %{ant_home}/etc/ +%{ant_home}/etc/mmetrics-frames.xsl +%{ant_home}/etc/coverage-frames.xsl + +%changelog -n ant-antlr +* Fri Sep 22 2006 - dbornkessel@suse.de +- added source=1.4 +* Mon May 08 2006 - dbornkessel@suse.de +- changed last change (see line below): Requires are only bound to the version, not to the release anymore +--> lrupp: fix Requires for ant (#171473 describes the same for dbus-1) +* Thu Feb 02 2006 - dbornkessel@suse.de +* Thu Feb 02 2006 - dbornkessel@suse.de +- fixed rpmlint errors and warnings +- fixed rpmlint errors and warnings +* Thu Feb 02 2006 - dbornkessel@suse.de +- fixed rpmlint errors and warnings +* Tue Jan 31 2006 - dbornkessel@suse.de +- only ant-antlr updates +- only ant-antlr updates +* Tue Jan 31 2006 - dbornkessel@suse.de +- removed noarch due to different dependencies +- removed jsch and commons-net because we don't have the necessary packages +- ifarch'ed jai as it has a binary only dependency on a i386-only package +* Fri Jan 27 2006 - dbornkessel@suse.de +- added four missing xsl files +- removed JAVA_HOME magic +- added four missing xsl files +- removed JAVA_HOME magic +- added BuildRoot +- removed JAVA_HOME magic +* Wed Jan 25 2006 - dbornkessel@suse.de +- build optional task in an extra spec file due to circular dependencies +* Tue Jan 24 2006 - dbornkessel@suse.de +- Not dependend on xml-commons-apis, which are provided by xerces-j2, which does not + depend on ant package (in contrast to old dependency on + xml-commons-apis <-> ant) +- optional task are now again in extra spec file ant-antlr +- Not dependend on xml-commons-apis, which are provided by xerces-j2, which does not + depend on ant package (in contrast to old dependency on + xml-commons-apis <-> ant) +- optional task are now again in extra spec file ant-antlr +* Thu Jan 19 2006 - dbornkessel@suse.de +- Integrated ant and ant-antlr again in one spec file as there is no + dependency loop ... jpackage BuildRequires were wrong. +- updated to version 1.6.5 +- Integrated ant and ant-antlr again in one spec file as there is no + dependency loop ... jpackage BuildRequires were wrong. +- updated to version 1.6.5 +* Mon Dec 19 2005 - dbornkessel@suse.de +- added if statement that hinders unwanted creation of a file within a for loop +- added if statement that hinders unwanted creation of a file within a for loop +* Thu Sep 29 2005 - dmueller@suse.de +- add norootforbuild +- add norootforbuild +* Fri Mar 04 2005 - skh@suse.de +- rely on jpackage-utils' java-functions to set JAVA_HOME correctly +- rely on jpackage-utils' java-functions to set JAVA_HOME correctly +* Sun Sep 05 2004 - skh@suse.de +- create and add /usr/share/java/ant to file list for optional + tasks to put their jars into +- create and add /usr/share/java/ant to file list for optional + tasks to put their jars into +* Thu Sep 02 2004 - skh@suse.de +- renamed from apache-ant to ant +- switched to JPackage 1.5 version +- updated to version 1.6.2 +- split off optional tasks into separate package to solve build + dependency loop in JPackage +- renamed from apache-ant to ant +- switched to JPackage 1.5 version +- updated to version 1.6.2 +- split off optional tasks into separate package to solve build + dependency loop in JPackage diff --git a/ant.changes b/ant.changes new file mode 100644 index 0000000..e7ca803 --- /dev/null +++ b/ant.changes @@ -0,0 +1,74 @@ +------------------------------------------------------------------- +Fri Sep 22 14:34:40 CEST 2006 - dbornkessel@suse.de + +- read in properties in /etc/ant.conf +- added source=1.4 + +------------------------------------------------------------------- +Mon May 8 14:54:11 CEST 2006 - dbornkessel@suse.de + +- only ant-antlr updates + + +------------------------------------------------------------------- +Thu Feb 2 20:55:06 CET 2006 - dbornkessel@suse.de + +- fixed rpmlint errors and warnings + +------------------------------------------------------------------- +Tue Jan 31 17:29:45 CET 2006 - dbornkessel@suse.de + +- only ant-antlr updates + +------------------------------------------------------------------- +Fri Jan 27 12:12:48 CET 2006 - dbornkessel@suse.de + +- added four missing xsl files +- removed JAVA_HOME magic + +------------------------------------------------------------------- +Tue Jan 24 16:55:46 CET 2006 - dbornkessel@suse.de + +- Not dependend on xml-commons-apis, which are provided by xerces-j2, which does not + depend on ant package (in contrast to old dependency on + xml-commons-apis <-> ant) +- optional task are now again in extra spec file ant-antlr + + +------------------------------------------------------------------- +Thu Jan 19 14:10:18 CET 2006 - dbornkessel@suse.de + +- Integrated ant and ant-antlr again in one spec file as there is no + dependency loop ... jpackage BuildRequires were wrong. +- updated to version 1.6.5 + +------------------------------------------------------------------- +Mon Dec 19 10:46:33 CET 2005 - dbornkessel@suse.de + +- added if statement that hinders unwanted creation of a file within a for loop + +------------------------------------------------------------------- +Thu Sep 29 00:10:39 CEST 2005 - dmueller@suse.de + + - add norootforbuild + +------------------------------------------------------------------- +Fri Mar 4 13:53:08 CET 2005 - skh@suse.de + +- rely on jpackage-utils' java-functions to set JAVA_HOME correctly + +------------------------------------------------------------------- +Sun Sep 5 20:00:07 CEST 2004 - skh@suse.de + +- create and add /usr/share/java/ant to file list for optional + tasks to put their jars into + +------------------------------------------------------------------- +Thu Sep 2 15:58:19 CEST 2004 - skh@suse.de + +- renamed from apache-ant to ant +- switched to JPackage 1.5 version +- updated to version 1.6.2 +- split off optional tasks into separate package to solve build + dependency loop in JPackage + diff --git a/ant.spec b/ant.spec new file mode 100644 index 0000000..acb4841 --- /dev/null +++ b/ant.spec @@ -0,0 +1,259 @@ +# +# spec file for package ant (Version 1.6.5) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: ant +BuildRequires: java2-devel-packages xerces-j2 +%define ant_home %{_datadir}/ant +%define section free +%define cvs_name apache-%{name} +Version: 1.6.5 +Release: 25 +Summary: A Java-Based Build Tool +License: Other License(s), see package, Apache +URL: http://jakarta.apache.org/ +Group: Development/Tools/Building +Source0: %{cvs_name}-%{version}-src.tar.bz2 +Source2: %{cvs_name}-1.6.5.ant.conf +# Ant configuration file which is edited when each optional subpackage +# is installed/uninstalled +# Fix temp directory used for file containing large command strings (> 4k) +Patch0: %{name}-%{version}-use_system_libs.patch +Patch1: %{cvs_name}-%{version}-rpm.patch +Patch150: java150_build.patch +Requires: xerces-j2 >= 2.7.1-2 +Requires: jaxp_parser_impl +Requires: xml-commons-apis +Requires: xml-commons-resolver +Requires: jpackage-utils >= 1.5 +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Obsoletes: apache-ant +Provides: apache-ant + +%description +Apache Ant is a Java-based build tool. In theory, it is kind of like +Make, but without Make's wrinkles. + +Why another build tool when there is already make, gnumake, nmake, jam, +and others? Because all those tools have limitations that Ant's +original author could not live with when developing software across +multiple platforms. Make-like tools are inherently shell-based--they +evaluate a set of dependencies then execute commands, not unlike what +you would issue in a shell. This means that you can easily extend these +tools by using or writing any program for the OS that you are working +on. However, this also means that you limit yourself to the OS, or at +least the OS type, such as Unix, that you are working on. + +Makefiles are inherently evil as well. Anybody who has worked on them +for any time has run into the dreaded tab problem. "Is my command not +executing because I have a space in front of my tab???" said the +original author of Ant way too many times. Tools like Jam took care of +this to a great degree, but still have yet another format to use and +remember. + +Ant is different. Instead of a model where it is extended with +shell-based commands, Ant is extended using Java classes. Instead of +writing shell commands, the configuration files are XML-based, calling +out a target tree where various tasks are executed. Each task is run by +an object that implements a particular task interface. + +Granted, this removes some of the expressive power that is inherent by +being able to construct a shell command such as `find . -name foo -exec +rm {}`, but it gives you the ability to be cross-platform--to work +anywhere and everywhere. If you really need to execute a shell command, +Ant has an task that allows different commands to be executed +based on the OS used. + + + +%package manual +Summary: Manual for ant +Group: Development/Tools/Building + +%description manual +Apache Ant is a Java-based build tool. + +This package contains the manual for Apache Ant. + + + +%package javadoc +Summary: Javadoc for ant +Group: Development/Tools/Building +PreReq: coreutils + +%description javadoc +Apache Ant is a Java-based build tool. + +This package contains the javadoc documentation for Apache Ant. + + + +%package scripts +Summary: Additional scripts for ant +Group: Development/Tools/Building +#AutoReqProv: no +Requires: ant = %{version} +Requires: /usr/bin/perl +Requires: /usr/bin/python + +%description scripts +Apache Ant is a Java-based build tool. + +This package contains additional perl and python scripts for Apache +Ant. + + + +%prep +%setup -q -n apache-ant-%{version} +%patch0 +%patch1 +%patch150 -p1 +# Fix temp directory used for file containing large command strings (> 4k) +# clean jar files +find . -name "*.jar" -exec rm -f {} \; +# ----------------------------------------------------------------------------- + +%build +find . -name "*.jar" -delete +# classpath selects optional components to build +export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis) +#[ -n "$JAVA_HOME" ] && unset JAVA_HOME +#[ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf +#[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java +#. /usr/share/java-utils/java-functions +export JAVA_HOME +sh bootstrap.sh +sh build.sh --noconfig jars javadocs +# ----------------------------------------------------------------------------- + +%install +rm -rf $RPM_BUILD_ROOT +rm src/script/ant.orig +# ANT_HOME and subdirs +mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin} +# jars +mkdir -p $RPM_BUILD_ROOT%{_javadir} +cp -p build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +cp -p build/lib/%{name}-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launcher-%{version}.jar +# where optional tasks will put their stuff +mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name} +# jar aliases +(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do if [ -e ${jar} ]; then ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; fi; done) +(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do if [ -e ${jar} ]; then ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; fi; done) +# scripts: remove dos and os/2 scripts +rm -f src/script/*.bat +rm -f src/script/*.cmd +# install everything else +mkdir -p $RPM_BUILD_ROOT%{_bindir} +cp -p src/script/* $RPM_BUILD_ROOT%{_bindir} +rm $RPM_BUILD_ROOT%{_bindir}/antRun* +cp -p src/script/antRun* $RPM_BUILD_ROOT%{ant_home}/bin +# default ant.conf +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d +# ----------------------------------------------------------------------------- +# javadoc +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/ant-%{version} +cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/ant-%{version} +# fix link between manual and javadoc +pushd docs/manual +ln -sf ../../../../../ant-%{version} api +popd +# ----------------------------------------------------------------------------- + +cp src/etc/ant-update.xsl $RPM_BUILD_ROOT%{ant_home}/etc +cp src/etc/changelog.xsl $RPM_BUILD_ROOT%{ant_home}/etc +cp src/etc/junit-frames-xalan1.xsl $RPM_BUILD_ROOT%{ant_home}/etc +cp src/etc/log.xsl $RPM_BUILD_ROOT%{ant_home}/etc +cp src/etc/tagdiff.xsl $RPM_BUILD_ROOT%{ant_home}/etc +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d + +%clean +rm -rf $RPM_BUILD_ROOT +# ----------------------------------------------------------------------------- + +%files +%defattr(0644,root,root,0755) +%doc KEYS LICENSE README WHATSNEW +%attr(0755,root,root) %{_bindir}/ant +#% attr(0755,root,root) % {_bindir}/complete-ant-cmd.pl +#% attr(0755,root,root) % {_bindir}/runant.pl +#% attr(0755,root,root) % {_bindir}/runant.py +%attr(0755,root,root) %{ant_home}/bin +%dir %{_javadir}/%{name} +%{_javadir}/%{name}.jar +%{_javadir}/%{name}-launcher.jar +%{_javadir}/%{name}-%{version}.jar +%{_javadir}/%{name}-launcher-%{version}.jar +%dir %{ant_home} +%dir %{_sysconfdir}/%{name}.d +%config %dir %{_sysconfdir}/%{name}.conf +%exclude %{_bindir}/*.pl +%exclude %{_bindir}/*.py +%dir %{ant_home}/lib +%{ant_home}/etc +# ----------------------------------------------------------------------------- + +%files scripts +%defattr(0755,root,root,0755) +%{_bindir}/*.pl +%{_bindir}/*.py + +%files manual +%defattr(0644,root,root,0755) +%doc docs/* + +%files javadoc +%defattr(0644,root,root,0755) +%{_javadocdir}/ant-%{version} +# ----------------------------------------------------------------------------- + +%changelog -n ant +* Fri Sep 22 2006 - dbornkessel@suse.de +- read in properties in /etc/ant.conf +- added source=1.4 +* Mon May 08 2006 - dbornkessel@suse.de +- only ant-antlr updates +* Thu Feb 02 2006 - dbornkessel@suse.de +- fixed rpmlint errors and warnings +* Tue Jan 31 2006 - dbornkessel@suse.de +- only ant-antlr updates +* Fri Jan 27 2006 - dbornkessel@suse.de +- added four missing xsl files +- removed JAVA_HOME magic +* Tue Jan 24 2006 - dbornkessel@suse.de +- Not dependend on xml-commons-apis, which are provided by xerces-j2, which does not + depend on ant package (in contrast to old dependency on + xml-commons-apis <-> ant) +- optional task are now again in extra spec file ant-antlr +* Thu Jan 19 2006 - dbornkessel@suse.de +- Integrated ant and ant-antlr again in one spec file as there is no + dependency loop ... jpackage BuildRequires were wrong. +- updated to version 1.6.5 +* Mon Dec 19 2005 - dbornkessel@suse.de +- added if statement that hinders unwanted creation of a file within a for loop +* Thu Sep 29 2005 - dmueller@suse.de +- add norootforbuild +* Fri Mar 04 2005 - skh@suse.de +- rely on jpackage-utils' java-functions to set JAVA_HOME correctly +* Sun Sep 05 2004 - skh@suse.de +- create and add /usr/share/java/ant to file list for optional + tasks to put their jars into +* Thu Sep 02 2004 - skh@suse.de +- renamed from apache-ant to ant +- switched to JPackage 1.5 version +- updated to version 1.6.2 +- split off optional tasks into separate package to solve build + dependency loop in JPackage diff --git a/apache-ant-1.6.5-rpm.patch b/apache-ant-1.6.5-rpm.patch new file mode 100644 index 0000000..fe5bda7 --- /dev/null +++ b/apache-ant-1.6.5-rpm.patch @@ -0,0 +1,31 @@ +--- src/script/ant 2004-07-16 08:56:50.000000000 +0100 ++++ src/script/ant 2004-11-05 15:14:23.000000000 +0000 +@@ -159,6 +159,28 @@ + # variable + if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then + LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)" ++ ++ # If no optional jars have been specified then build the default list ++ if [ -z "$OPT_JAR_LIST" ] ; then ++ for file in /etc/ant.d/*; do ++ if [ -f "$file" ]; then ++ case "$file" in ++ *~) ;; ++ *#*) ;; ++ *.rpmsave) ;; ++ *.rpmnew) ;; ++ *) ++ for dep in `cat "$file"`; do ++ case "$OPT_JAR_LIST" in ++ *"$dep"*) ;; ++ *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep" ++ esac ++ done ++ esac ++ fi ++ done ++ fi ++ + # If the user requested to try to add some other jars to the classpath + if [ -n "$OPT_JAR_LIST" ] ; then + _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)" diff --git a/apache-ant-1.6.5-src.tar.bz2 b/apache-ant-1.6.5-src.tar.bz2 new file mode 100644 index 0000000..4e86aa0 --- /dev/null +++ b/apache-ant-1.6.5-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59 +size 6283500 diff --git a/apache-ant-1.6.5.ant.conf b/apache-ant-1.6.5.ant.conf new file mode 100644 index 0000000..ad59290 --- /dev/null +++ b/apache-ant-1.6.5.ant.conf @@ -0,0 +1,53 @@ +# +# ant.conf (Ant 1.6.x) +# JPackage Project +# + +# Validate --noconfig setting in case being invoked +# from pre Ant 1.6.x environment +if [ -z "$no_config" ] ; then + no_config=true +fi + +# Setup ant configuration +if $no_config ; then + # Disable RPM layout + rpm_mode=false +else + # Use RPM layout + rpm_mode=true + # + # If no optional jars have been specified then build the default list + if [ -z "$OPT_JAR_LIST" ] ; then + for file in /etc/ant.d/*; do + if [ -f "$file" ]; then + case "$file" in + *~) ;; + *#*) ;; + *.rpmsave) ;; + *.rpmnew) ;; + *) + for dep in `cat "$file"`; do + case "$OPT_JAR_LIST" in + *"$dep"*) ;; + *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep" + esac + done + esac + fi + done + fi + + # ANT_HOME for rpm layout + ANT_HOME=/usr/share/ant + + # Optional jars list + if [ -z "$OPT_JAR_LIST" ] ; then + # RPM installed ant optional packages normally + # require one or more other dependencies to be listed + # as well, (e.g. "ant-junit" requires "junit"): + # OPT_JAR_LIST="$OPT_JAR_LIST junit ant/ant-junit" + + OPT_JAR_LIST="$OPT_JAR_LIST" # RPM DO NOT EDIT OR REMOVE THIS LINE + fi +fi diff --git a/java150_build.patch b/java150_build.patch new file mode 100644 index 0000000..66c87fa --- /dev/null +++ b/java150_build.patch @@ -0,0 +1,80 @@ +Index: apache-ant-1.6.5/src/etc/testcases/core/loaderref/loaderref.xml +=================================================================== +--- apache-ant-1.6.5.orig/src/etc/testcases/core/loaderref/loaderref.xml ++++ apache-ant-1.6.5/src/etc/testcases/core/loaderref/loaderref.xml +@@ -17,7 +17,7 @@ This build file is intended to be used f + + + +- ++ + + + +Index: apache-ant-1.6.5/src/etc/testcases/core/taskcontainer.xml +=================================================================== +--- apache-ant-1.6.5.orig/src/etc/testcases/core/taskcontainer.xml ++++ apache-ant-1.6.5/src/etc/testcases/core/taskcontainer.xml +@@ -17,7 +17,7 @@ + + + +- ++ + + + +@@ -45,4 +45,4 @@ + + + +- +\ No newline at end of file ++ +Index: apache-ant-1.6.5/src/etc/testcases/taskdefs/available.xml +=================================================================== +--- apache-ant-1.6.5.orig/src/etc/testcases/taskdefs/available.xml ++++ apache-ant-1.6.5/src/etc/testcases/taskdefs/available.xml +@@ -135,7 +135,7 @@ + + + +- ++ + + +Index: apache-ant-1.6.5/src/etc/testcases/taskdefs/optional/depend/depend.xml +=================================================================== +--- apache-ant-1.6.5.orig/src/etc/testcases/taskdefs/optional/depend/depend.xml ++++ apache-ant-1.6.5/src/etc/testcases/taskdefs/optional/depend/depend.xml +@@ -50,7 +50,7 @@ + + + +- ++ + + + +@@ -135,7 +135,7 @@ + + + +- + + +Index: apache-ant-1.6.5/src/etc/testcases/types/assertions.xml +=================================================================== +--- apache-ant-1.6.5.orig/src/etc/testcases/types/assertions.xml ++++ apache-ant-1.6.5/src/etc/testcases/types/assertions.xml +@@ -14,6 +14,7 @@ + +