diff --git a/ant-SLE_11.spec b/ant-SLE_11.spec deleted file mode 100644 index 1f1b6d3..0000000 --- a/ant-SLE_11.spec +++ /dev/null @@ -1,851 +0,0 @@ -# -# spec file for package ant -# -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2000-2009, JPackage Project -# All rights reserved. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -%global bootstrap 1 - -# disable javadoc build on arm platform - it delays a build a lot -# mvyskocil: ifarch does not work for noarch packages ... -%if %{_arch} != arm -%global build_javadoc 1 -%else -%global build_javadoc 0 -%endif - -%global ant_home %{_datadir}/ant - -%global major_version 1.9 - -Name: ant -Version: 1.9.3 -Release: 0 -Summary: Antlr Task for ant -License: Apache-2.0 -Group: Development/Tools/Building -Url: http://ant.apache.org/ -Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 -Source1: apache-ant-1.8.ant.conf -Source1000: pre_checkin.sh -Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc -Source1002: ant.keyring - -Patch0: apache-ant-no-test-jar.patch -Patch1: apache-ant-class-path-in-manifest.patch - -%if %bootstrap -BuildRequires: java-devel -%else -BuildRequires: java-devel >= 1.5.0 -%endif -BuildRequires: antlr-bootstrap -BuildRequires: javapackages-tools -BuildRequires: unzip -#BuildRequires: xerces-j2-bootstrap -#!BuildIgnore: xerces-j2-bootstrap -BuildRequires: xml-commons-apis-bootstrap -%if ! %bootstrap -BuildRequires: ant = %{version} -BuildRequires: junit4 -BuildRequires: xalan-j2 -BuildRequires: xerces-j2 -BuildRequires: xml-commons-apis -#!BuildIgnore: antlr -%endif -%if %bootstrap -Requires: java-devel >= 1.5.0 -Requires: javapackages-tools -Requires: jaxp_parser_impl -#Requires: xerces-j2 >= 2.7.1-2 -Requires: xml-commons-apis -Requires: xml-commons-resolver -Obsoletes: apache-ant < %{version} -Provides: apache-ant = %{version} -Obsoletes: ant-nodeps < %{version} -Provides: ant-nodeps = %{version} -Obsoletes: ant-trax < %{version} -Provides: ant-trax = %{version} -%else -# ant-antlr requires -Requires: antlr -%requires_eq ant -Provides: ant-antlr = %{version}-%{release} -%endif -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%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. - - -%if %bootstrap - -%package -n ant-jmf -Summary: Optional jmf tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: ant = %{version} -Provides: ant-jmf = %{version}-%{release} - -%description -n ant-jmf -Apache Ant is a Java-based build tool. - -This package contains optional jmf tasks for Apache Ant. - - - - - - -%package -n ant-swing -Summary: Optional swing tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: ant = %{version} -Provides: ant-swing = %{version}-%{release} - -%description -n ant-swing -Apache Ant is a Java-based build tool. - -This package contains optional swing tasks for Apache Ant. - - - - - -%package -n ant-scripts -Summary: Additional scripts for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: %{_bindir}/perl -Requires: %{_bindir}/python -Requires: ant = %{version} - -%description -n ant-scripts -Apache Ant is a Java-based build tool. - -This package contains additional perl and python scripts for Apache -Ant. - - - -%endif #if bootstrap -%if ! %bootstrap - -%package -n ant-apache-bsf -Summary: Optional apache bsf tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: bsf -%requires_eq ant -BuildRequires: bsf -Provides: ant-apache-bsf = %{version}-%{release} - -%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 -License: Apache-2.0 -Group: Development/Tools/Building -Requires: xml-commons-resolver -%requires_eq ant -BuildRequires: xml-commons-resolver -Provides: ant-apache-resolver = %{version}-%{release} - -%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-commons-logging -Summary: Optional commons logging tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jakarta-commons-logging -%requires_eq ant -BuildRequires: jakarta-commons-logging -Provides: ant-commons-logging = %{version}-%{release} - -%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-commons-net -Summary: Optional commons net tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jakarta-commons-net -%requires_eq ant -BuildRequires: jakarta-commons-net -Provides: ant-commons-net = %{version}-%{release} - -%description -n ant-commons-net -Apache Ant is a Java-based build tool. - -This package contains optional commons net tasks for Apache Ant. - - - -# Disable because we don't ship the dependencies -%if 0 - -%package -n ant-jai - -Summary: Optional jai tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jai -%requires_eq ant -BuildRequires: jai -Provides: ant-jai = %{version}-%{release} - -%description -n ant-jai -Optional jai tasks for ant. -%endif - -%package -n ant-apache-bcel -Summary: Optional apache bcel tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: bcel -%requires_eq ant -BuildRequires: bcel -Provides: ant-apache-bcel = %{version} -Provides: ant-jakarta-bcel = %{version} -Obsoletes: ant-jakarta-bcel < %{version} - -%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 -License: Apache-2.0 -Group: Development/Tools/Building -Requires: log4j -%requires_eq ant -BuildRequires: log4j-mini -Provides: ant-apache-log4j = %{version} -Provides: ant-jakarta-log4j = %{version} -Obsoletes: ant-jakarta-log4j < %{version} - -%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 -License: Apache-2.0 -Group: Development/Tools/Building -Requires: oro -%requires_eq ant -BuildRequires: oro -Provides: ant-apache-oro = %{version} -Provides: ant-jakarta-oro = %{version} -Obsoletes: ant-jakarta-oro < %{version} - -%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 -License: Apache-2.0 -Group: Development/Tools/Building -Requires: regexp -%requires_eq ant -BuildRequires: regexp -Provides: ant-apache-regexp = %{version} -Provides: ant-jakarta-regexp = %{version} -Obsoletes: ant-jakarta-regexp < %{version} - -%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-apache-xalan2 -Summary: Optional apache xalan2 tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -BuildRequires: regexp -Requires: regexp -%requires_eq ant -Provides: ant-apache-xalan2 = %{version} - -%description -n ant-apache-xalan2 -Optional apache xalan2 tasks for %{name}. - - -%package -n ant-javamail -Summary: Optional javamail tasks for ant -License: CDDL-1.0 -Group: Development/Tools/Building -BuildRequires: javamail >= 1.2-5jpp -Requires: javamail >= 1.2-5jpp -%requires_eq ant -Provides: ant-javamail = %{version} - -%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 -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jdepend -%requires_eq ant -BuildRequires: jdepend -Provides: ant-jdepend = %{version} - -%description -n ant-jdepend -Apache Ant is a Java-based build tool. - -This package contains optional jdepend tasks for Apache Ant. - - - -%package -n ant-jsch -Summary: Optional jsch tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jsch -%requires_eq ant -BuildRequires: jsch -Provides: ant-jsch = %{version} - -%description -n ant-jsch -Apache Ant is a Java-based build tool. - -This package contains optional jsch tasks for Apache Ant. - - - -%package -n ant-junit -Summary: Optional junit tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: junit4 -%requires_eq ant -Provides: ant-junit = %{version} - -%description -n ant-junit -Apache Ant is a Java-based build tool. - -This package contains optional JUnit tasks for Apache Ant. - -%package -n ant-testutil -Summary: Test utility classes for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: junit4 -%requires_eq ant -Provides: ant-testutil = %{version} - -%description -n ant-testutil -Test utility tasks for %{name}. - - - -%package -n ant-manual -Summary: Manual for ant -License: Apache-2.0 -Group: Development/Tools/Building - -%description -n ant-manual -Apache Ant is a Java-based build tool. - -This package contains the manual for Apache Ant. - - -%if 0%{?build_javadoc} - -%package -n ant-javadoc -Summary: Javadoc for ant -License: Apache-2.0 -Group: Development/Tools/Building - -%description -n ant-javadoc -Apache Ant is a Java-based build tool. - -This package contains the javadoc documentation for Apache Ant. -%endif #javadoc - -%endif - -%prep -%setup -q -n apache-ant-%{version} -#Fixup version -find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// - -# When bootstrapping, we don't have junit -%if %bootstrap -%patch0 -p1 -%endif - -# Fix class-path-in-manifest rpmlint warning -%patch1 - -# clean jar files -%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm - -# failing testcases. TODO see why -rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \ - src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \ - src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \ - src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ - src/tests/junit/org/apache/tools/mail/MailMessageTest.java - -#FIXME: need newer junit4 package -#rm src/tests/junit/org/example/junit/JUnit4Skippable.java - -#install jars -%if ! %bootstrap -build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver -%endif - -# Fix file-not-utf8 rpmlint warning -iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8 -mv KEYS.utf8 KEYS -iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8 -mv LICENSE.utf8 LICENSE -# ----------------------------------------------------------------------------- - -%build -export OPT_JAR_LIST=: - -%if ! %bootstrap -%{ant} -Dbuild.sysclasspath=first jars test-jar - -#remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. -rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar - -%if 0%{?build_javadoc} -export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) -%{ant} javadocs -%endif - -%else - -export GC_MAXIMUM_HEAP_SIZE="134217728" #128M -export JAVA_HOME=%{java_home} -export CLASSPATH=$JAVA_HOME/lib/tools.jar -sh -x ./build.sh --noconfig jars - -%endif - -%install -# ANT_HOME and subdirs -mkdir -p %{buildroot}%{ant_home}/{lib,etc} -# jars -install -d -m 755 %{buildroot}%{_javadir}/ant -install -d -m 755 %{buildroot}%{_mavenpomdir} - -for jar in build/lib/*.jar -do - jarname=$(basename $jar .jar) - pomname="JPP.ant-${jarname}.pom" - - #Determine where to put it - case $jarname in -#These go into %%{_javadir}, pom files have different names - ant | ant-bootstrap | ant-launcher) -%if %bootstrap - destdir=%{buildroot}%{_javadir}; destname="";pomname="JPP-$jarname.pom" -%else - continue -%endif - ;; - ant-jmf|ant-swing) -%if %bootstrap - destdir=%{buildroot}%{_javadir}/ant; destname="ant/"; -%else - continue -%endif - ;; -#Bootstracp builds an incomplete ant-foo jars, don't ship them - *) -%if %bootstrap - continue -%else -#These go into %%{_javadir}/ant - destdir=%{buildroot}%{_javadir}/ant; destname="ant/"; -%endif - ;; - esac - - #instal jar - install -m 644 ${jar} ${destdir}/${jarname}.jar - # jar aliases - ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar - - #bootstrap does not have a pom - [ $jarname == ant-bootstrap ] && continue - - #install pom - install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} - echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" - %add_maven_depmap ${pomname} ${destname}${jarname}.jar -done - -%if %bootstrap -#ant-parent pom -install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -# % add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent -%add_maven_depmap JPP-ant-parent.pom - -# scripts: remove dos and os/2 scripts -rm -f src/script/*.bat -rm -f src/script/*.cmd - -# XSLs -cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc -rm -f %{buildroot}%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl -%else -cp -p src/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %{buildroot}%{ant_home}/etc -%endif - -%if %bootstrap -# install everything else -mkdir -p %{buildroot}%{_bindir} -cp -p src/script/* %{buildroot}%{_bindir}/ -mkdir -p %{buildroot}%{_datadir}/%{name}/bin/ -ln -sf %{_bindir}/antRun %{buildroot}/%{_datadir}/%{name}/bin/antRun -%endif -%if %bootstrap -# default ant.conf -mkdir -p %{buildroot}%{_sysconfdir} -cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ant.conf - -# OPT_JAR_LIST fragments -mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d -echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf -echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing -%else -mkdir -p %{buildroot}%{_sysconfdir}/ant.d -echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr -echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf -echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver -echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging -echo "jakarta-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net -#echo "jai ant/ant-jai" > %{buildroot}%{_sysconfdir}/ant.d/jai -echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel -echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j -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 "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2 -echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail -echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend -echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch -echo "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit -echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil -%endif -%if ! %bootstrap - -%if 0%{?build_javadoc} -mkdir -p %{buildroot}%{_javadocdir}/ant -cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant -%endif #javadoc - -%endif - -%if 0%{?build_javadoc} -# fix link between manual and javadoc -(cd manual; ln -sf %{_javadocdir}/%{name} api) -%endif #javadoc - -%if %bootstrap -find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ - -a ! -name ant-update.xsl \ - -a ! -name changelog.xsl \ - -a ! -name coverage-frames.xsl \ - -a ! -name junit-frames-xalan1.xsl \ - -a ! -name log.xsl \ - -a ! -name mmetrics-frames.xsl \ - -a ! -name tagdiff.xsl \ - | xargs -t rm -%endif - -%if %bootstrap - -%files -%defattr(0644,root,root,0755) -%doc KEYS LICENSE NOTICE README WHATSNEW -%config(noreplace) %{_sysconfdir}/%{name}.conf -%attr(0755,root,root) %{_bindir}/ant -%attr(0755,root,root) %{_bindir}/antRun -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-launcher.jar -%{_javadir}/%{name}-bootstrap.jar -%dir %{_javadir}/%{name} -%dir %{ant_home} -%dir %{ant_home}/etc -%{ant_home}/bin -%{ant_home}/etc/ant-update.xsl -%{ant_home}/etc/changelog.xsl -%{ant_home}/etc/coverage-frames.xsl -%{ant_home}/etc/mmetrics-frames.xsl -%{ant_home}/etc/log.xsl -%{ant_home}/etc/tagdiff.xsl -%{ant_home}/etc/junit-frames-xalan1.xsl -# % {ant_home}/etc/common2master.xsl -# % {ant_home}/etc/printFailingTests.xsl -%dir %{ant_home}/lib -%dir %{_sysconfdir}/%{name}.d -%{ant_home}/lib/ant.jar -%{ant_home}/lib/ant-bootstrap.jar -%{ant_home}/lib/ant-launcher.jar -%dir %{_sysconfdir}/ant.d -%{_mavenpomdir}/JPP-ant-launcher.pom -%{_mavenpomdir}/JPP-ant-parent.pom -%{_mavenpomdir}/JPP-ant.pom -%config(noreplace) %{_mavendepmapfragdir}/* -%dir %{_mavenpomdir} - -%else -# ant-antlr filelist - -%files -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-antlr.jar -%{ant_home}/lib/ant-antlr.jar -%config(noreplace) %{_sysconfdir}/ant.d/antlr -%{_mavenpomdir}/JPP.ant-ant-antlr.pom -%config %{_mavendepmapfragdir}/ant-antlr -%dir %{_mavenpomdir} -%endif - -### Basic ant subpackages -%if %bootstrap - -%files -n ant-jmf -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-jmf.jar -%{ant_home}/lib/ant-jmf.jar -%config(noreplace) %{_sysconfdir}/ant.d/jmf -%{_mavenpomdir}/JPP.ant-ant-jmf.pom - -%files -n ant-swing -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-swing.jar -%{ant_home}/lib/ant-swing.jar -%config(noreplace) %{_sysconfdir}/ant.d/swing -%{_mavenpomdir}/JPP.ant-ant-swing.pom -%dir %{_mavenpomdir} - -%files -n ant-scripts -%defattr(0755,root,root,0755) -%{_bindir}/*.pl -%{_bindir}/*.py* -%endif #if bootstrap - -%if ! %bootstrap - -%files -n ant-apache-bsf -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-apache-bsf.jar -%{ant_home}/lib/ant-apache-bsf.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf -%{_mavenpomdir}/JPP.ant-ant-apache-bsf.pom -%dir %{_mavenpomdir} - -%files -n ant-apache-resolver -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-apache-resolver.jar -%{ant_home}/lib/ant-apache-resolver.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver -%{_mavenpomdir}/JPP.ant-ant-apache-resolver.pom -%dir %{_mavenpomdir} - -%files -n ant-commons-logging -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-commons-logging.jar -%{ant_home}/lib/ant-commons-logging.jar -%config(noreplace) %{_sysconfdir}/ant.d/commons-logging -%{_mavenpomdir}/JPP.ant-ant-commons-logging.pom -%dir %{_mavenpomdir} - -%files -n ant-commons-net -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-commons-net.jar -%{ant_home}/lib/ant-commons-net.jar -%config(noreplace) %{_sysconfdir}/ant.d/commons-net -%{_mavenpomdir}/JPP.ant-ant-commons-net.pom -%dir %{_mavenpomdir} -# Disable as we dont ship the dependencies -%if 0 - -%files -n ant-jai -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-jai.jar -%{ant_home}/lib/ant-jai.jar -%config(noreplace) %{_sysconfdir}/ant.d/jai -%endif - -%files -n ant-apache-bcel -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-apache-bcel.jar -%{ant_home}/lib/ant-apache-bcel.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel -%{_mavenpomdir}/JPP.ant-ant-apache-bcel.pom -%dir %{_mavenpomdir} - -%files -n ant-apache-log4j -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-apache-log4j.jar -%{ant_home}/lib/ant-apache-log4j.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j -%{_mavenpomdir}/JPP.ant-ant-apache-log4j.pom -%dir %{_mavenpomdir} - -%files -n ant-apache-oro -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-apache-oro.jar -%{ant_home}/lib/ant-apache-oro.jar -%{ant_home}/etc/maudit-frames.xsl -%config(noreplace) %{_sysconfdir}/ant.d/apache-oro -%{_mavenpomdir}/JPP.ant-ant-apache-oro.pom -%dir %{_mavenpomdir} - -%files -n ant-apache-regexp -%defattr(-,root,root,-) -%{_javadir}/ant/ant-apache-regexp.jar -%{ant_home}/lib/ant-apache-regexp.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp -%{_mavenpomdir}/JPP.ant-ant-apache-regexp.pom -%dir %{_mavenpomdir} - -%files -n ant-apache-xalan2 -%defattr(-,root,root,-) -%{_javadir}/ant/ant-apache-xalan2.jar -%{ant_home}/lib/ant-apache-xalan2.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2 -%{_mavenpomdir}/JPP.ant-ant-apache-xalan2.pom -%dir %{_mavenpomdir} - -%files -n ant-javamail -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-javamail.jar -%{ant_home}/lib/ant-javamail.jar -%config(noreplace) %{_sysconfdir}/ant.d/javamail -%{_mavenpomdir}/JPP.ant-ant-javamail.pom -%dir %{_mavenpomdir} - -%files -n ant-jdepend -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-jdepend.jar -%{ant_home}/lib/ant-jdepend.jar -%config(noreplace) %{_sysconfdir}/ant.d/jdepend -%{ant_home}/etc/jdepend.xsl -%{ant_home}/etc/jdepend-frames.xsl -%{_mavenpomdir}/JPP.ant-ant-jdepend.pom -%dir %{_mavenpomdir} - -%files -n ant-jsch -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-jsch.jar -%{ant_home}/lib/ant-jsch.jar -%config(noreplace) %{_sysconfdir}/ant.d/jsch -%{_mavenpomdir}/JPP.ant-ant-jsch.pom -%dir %{_mavenpomdir} - -%files -n ant-junit -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-junit*.jar -%{ant_home}/lib/ant-junit*.jar -%config(noreplace) %{_sysconfdir}/ant.d/junit -%{ant_home}/etc/junit-frames.xsl -%{ant_home}/etc/junit-noframes.xsl -%{_mavenpomdir}/JPP.ant-ant-junit*.pom -%dir %{_mavenpomdir} - -%files -n ant-testutil -%defattr(-,root,root,-) -%{_javadir}/ant/ant-testutil.jar -%{ant_home}/lib/ant-testutil.jar -%config(noreplace) %{_sysconfdir}/ant.d/testutil -%{_mavenpomdir}/JPP.ant-ant-testutil.pom -%dir %{_mavenpomdir} - -%files -n ant-manual -%defattr(0644,root,root,0755) -%doc manual/* - -%if 0%{?build_javadoc} - -%files -n ant-javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/ant -%endif #javadoc -%endif - -%changelog diff --git a/ant-antlr-SLE_11.spec b/ant-antlr-SLE_11.spec deleted file mode 100644 index 9b0da56..0000000 --- a/ant-antlr-SLE_11.spec +++ /dev/null @@ -1,855 +0,0 @@ -# -# spec file for package ant-antlr -# -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2000-2009, JPackage Project -# All rights reserved. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! ##### -%global bootstrap 0 - -# disable javadoc build on arm platform - it delays a build a lot -# mvyskocil: ifarch does not work for noarch packages ... -%if %{_arch} != arm -%global build_javadoc 1 -%else -%global build_javadoc 0 -%endif - -%global ant_home %{_datadir}/ant - -%global major_version 1.9 - -Name: ant-antlr -Version: 1.9.3 -Release: 0 -Summary: Antlr Task for ant -License: Apache-2.0 -Group: Development/Tools/Building -Url: http://ant.apache.org/ -Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 -Source1: apache-ant-1.8.ant.conf -Source1000: pre_checkin.sh -Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc -Source1002: ant.keyring - -Patch0: apache-ant-no-test-jar.patch -Patch1: apache-ant-class-path-in-manifest.patch - -%if %bootstrap -BuildRequires: java-1_5_0-gcj-compat-devel -#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel -#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel -%else -BuildRequires: java-devel >= 1.5.0 -%endif -BuildRequires: antlr-bootstrap -BuildRequires: javapackages-tools -BuildRequires: unzip -#BuildRequires: xerces-j2-bootstrap -#!BuildIgnore: xerces-j2-bootstrap -BuildRequires: xml-commons-apis-bootstrap -%if ! %bootstrap -BuildRequires: ant = %{version} -BuildRequires: junit4 -BuildRequires: xalan-j2 -BuildRequires: xerces-j2 -BuildRequires: xml-commons-apis -#!BuildIgnore: antlr -%endif -%if %bootstrap -Requires: java-devel >= 1.5.0 -Requires: javapackages-tools -Requires: jaxp_parser_impl -#Requires: xerces-j2 >= 2.7.1-2 -Requires: xml-commons-apis -Requires: xml-commons-resolver -Obsoletes: apache-ant < %{version} -Provides: apache-ant = %{version} -Obsoletes: ant-nodeps < %{version} -Provides: ant-nodeps = %{version} -Obsoletes: ant-trax < %{version} -Provides: ant-trax = %{version} -%else -# ant-antlr requires -Requires: antlr -%requires_eq ant -Provides: ant-antlr = %{version}-%{release} -%endif -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%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. - - -%if %bootstrap - -%package -n ant-jmf -Summary: Optional jmf tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: ant = %{version} -Provides: ant-jmf = %{version}-%{release} - -%description -n ant-jmf -Apache Ant is a Java-based build tool. - -This package contains optional jmf tasks for Apache Ant. - - - - - - -%package -n ant-swing -Summary: Optional swing tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: ant = %{version} -Provides: ant-swing = %{version}-%{release} - -%description -n ant-swing -Apache Ant is a Java-based build tool. - -This package contains optional swing tasks for Apache Ant. - - - - - -%package -n ant-scripts -Summary: Additional scripts for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: %{_bindir}/perl -Requires: %{_bindir}/python -Requires: ant = %{version} - -%description -n ant-scripts -Apache Ant is a Java-based build tool. - -This package contains additional perl and python scripts for Apache -Ant. - - - -%endif #if bootstrap -%if ! %bootstrap - -%package -n ant-apache-bsf -Summary: Optional apache bsf tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: bsf -%requires_eq ant -BuildRequires: bsf -Provides: ant-apache-bsf = %{version}-%{release} - -%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 -License: Apache-2.0 -Group: Development/Tools/Building -Requires: xml-commons-resolver -%requires_eq ant -BuildRequires: xml-commons-resolver -Provides: ant-apache-resolver = %{version}-%{release} - -%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-commons-logging -Summary: Optional commons logging tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jakarta-commons-logging -%requires_eq ant -BuildRequires: jakarta-commons-logging -Provides: ant-commons-logging = %{version}-%{release} - -%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-commons-net -Summary: Optional commons net tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jakarta-commons-net -%requires_eq ant -BuildRequires: jakarta-commons-net -Provides: ant-commons-net = %{version}-%{release} - -%description -n ant-commons-net -Apache Ant is a Java-based build tool. - -This package contains optional commons net tasks for Apache Ant. - - - -# Disable because we don't ship the dependencies -%if 0 - -%package -n ant-jai - -Summary: Optional jai tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jai -%requires_eq ant -BuildRequires: jai -Provides: ant-jai = %{version}-%{release} - -%description -n ant-jai -Optional jai tasks for ant. -%endif - -%package -n ant-apache-bcel -Summary: Optional apache bcel tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: bcel -%requires_eq ant -BuildRequires: bcel -Provides: ant-apache-bcel = %{version} -Provides: ant-jakarta-bcel = %{version} -Obsoletes: ant-jakarta-bcel < %{version} - -%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 -License: Apache-2.0 -Group: Development/Tools/Building -Requires: log4j -%requires_eq ant -BuildRequires: log4j-mini -Provides: ant-apache-log4j = %{version} -Provides: ant-jakarta-log4j = %{version} -Obsoletes: ant-jakarta-log4j < %{version} - -%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 -License: Apache-2.0 -Group: Development/Tools/Building -Requires: oro -%requires_eq ant -BuildRequires: oro -Provides: ant-apache-oro = %{version} -Provides: ant-jakarta-oro = %{version} -Obsoletes: ant-jakarta-oro < %{version} - -%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 -License: Apache-2.0 -Group: Development/Tools/Building -Requires: regexp -%requires_eq ant -BuildRequires: regexp -Provides: ant-apache-regexp = %{version} -Provides: ant-jakarta-regexp = %{version} -Obsoletes: ant-jakarta-regexp < %{version} - -%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-apache-xalan2 -Summary: Optional apache xalan2 tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -BuildRequires: regexp -Requires: regexp -%requires_eq ant -Provides: ant-apache-xalan2 = %{version} - -%description -n ant-apache-xalan2 -Optional apache xalan2 tasks for %{name}. - - -%package -n ant-javamail -Summary: Optional javamail tasks for ant -License: CDDL-1.0 -Group: Development/Tools/Building -BuildRequires: javamail >= 1.2-5jpp -Requires: javamail >= 1.2-5jpp -%requires_eq ant -Provides: ant-javamail = %{version} - -%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 -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jdepend -%requires_eq ant -BuildRequires: jdepend -Provides: ant-jdepend = %{version} - -%description -n ant-jdepend -Apache Ant is a Java-based build tool. - -This package contains optional jdepend tasks for Apache Ant. - - - -%package -n ant-jsch -Summary: Optional jsch tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: jsch -%requires_eq ant -BuildRequires: jsch -Provides: ant-jsch = %{version} - -%description -n ant-jsch -Apache Ant is a Java-based build tool. - -This package contains optional jsch tasks for Apache Ant. - - - -%package -n ant-junit -Summary: Optional junit tasks for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: junit4 -%requires_eq ant -Provides: ant-junit = %{version} - -%description -n ant-junit -Apache Ant is a Java-based build tool. - -This package contains optional JUnit tasks for Apache Ant. - -%package -n ant-testutil -Summary: Test utility classes for ant -License: Apache-2.0 -Group: Development/Tools/Building -Requires: junit4 -%requires_eq ant -Provides: ant-testutil = %{version} - -%description -n ant-testutil -Test utility tasks for %{name}. - - - -%package -n ant-manual -Summary: Manual for ant -License: Apache-2.0 -Group: Development/Tools/Building - -%description -n ant-manual -Apache Ant is a Java-based build tool. - -This package contains the manual for Apache Ant. - - -%if 0%{?build_javadoc} - -%package -n ant-javadoc -Summary: Javadoc for ant -License: Apache-2.0 -Group: Development/Tools/Building - -%description -n ant-javadoc -Apache Ant is a Java-based build tool. - -This package contains the javadoc documentation for Apache Ant. -%endif #javadoc - -%endif - -%prep -%setup -q -n apache-ant-%{version} -#Fixup version -find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// - -# When bootstrapping, we don't have junit -%if %bootstrap -%patch0 -p1 -%endif - -# Fix class-path-in-manifest rpmlint warning -%patch1 - -# clean jar files -%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm - -# failing testcases. TODO see why -rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \ - src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \ - src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \ - src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ - src/tests/junit/org/apache/tools/mail/MailMessageTest.java - -#FIXME: need newer junit4 package -#rm src/tests/junit/org/example/junit/JUnit4Skippable.java - -#install jars -%if ! %bootstrap -build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver -%endif - -# Fix file-not-utf8 rpmlint warning -iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8 -mv KEYS.utf8 KEYS -iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8 -mv LICENSE.utf8 LICENSE -# ----------------------------------------------------------------------------- - -%build -export OPT_JAR_LIST=: - -%if ! %bootstrap -%{ant} -Dbuild.sysclasspath=first jars test-jar - -#remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. -rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar - -%if 0%{?build_javadoc} -export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) -%{ant} javadocs -%endif - -%else - -export GC_MAXIMUM_HEAP_SIZE="134217728" #128M -export JAVA_HOME=%{java_home} -export CLASSPATH=$JAVA_HOME/lib/tools.jar -export BOOTJAVAC_OPTS="-C -Wno-deprecated" -sh -x ./build.sh --noconfig jars - -%endif - -%install -# ANT_HOME and subdirs -mkdir -p %{buildroot}%{ant_home}/{lib,etc} -# jars -install -d -m 755 %{buildroot}%{_javadir}/ant -install -d -m 755 %{buildroot}%{_mavenpomdir} - -for jar in build/lib/*.jar -do - jarname=$(basename $jar .jar) - pomname="JPP.ant-${jarname}.pom" - - #Determine where to put it - case $jarname in -#These go into %%{_javadir}, pom files have different names - ant | ant-bootstrap | ant-launcher) -%if %bootstrap - destdir=%{buildroot}%{_javadir}; destname="";pomname="JPP-$jarname.pom" -%else - continue -%endif - ;; - ant-jmf|ant-swing) -%if %bootstrap - destdir=%{buildroot}%{_javadir}/ant; destname="ant/"; -%else - continue -%endif - ;; -#Bootstracp builds an incomplete ant-foo jars, don't ship them - *) -%if %bootstrap - continue -%else -#These go into %%{_javadir}/ant - destdir=%{buildroot}%{_javadir}/ant; destname="ant/"; -%endif - ;; - esac - - #instal jar - install -m 644 ${jar} ${destdir}/${jarname}.jar - # jar aliases - ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar - - #bootstrap does not have a pom - [ $jarname == ant-bootstrap ] && continue - - #install pom - install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} - echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" - %add_maven_depmap ${pomname} ${destname}${jarname}.jar -done - -%if %bootstrap -#ant-parent pom -install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -# % add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent -%add_maven_depmap JPP-ant-parent.pom - -# scripts: remove dos and os/2 scripts -rm -f src/script/*.bat -rm -f src/script/*.cmd - -# XSLs -cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc -rm -f %{buildroot}%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl -%else -cp -p src/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %{buildroot}%{ant_home}/etc -%endif - -%if %bootstrap -# install everything else -mkdir -p %{buildroot}%{_bindir} -cp -p src/script/* %{buildroot}%{_bindir}/ -mkdir -p %{buildroot}%{_datadir}/%{name}/bin/ -ln -sf %{_bindir}/antRun %{buildroot}/%{_datadir}/%{name}/bin/antRun -%endif -%if %bootstrap -# default ant.conf -mkdir -p %{buildroot}%{_sysconfdir} -cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ant.conf - -# OPT_JAR_LIST fragments -mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d -echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf -echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing -%else -mkdir -p %{buildroot}%{_sysconfdir}/ant.d -echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr -echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf -echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver -echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging -echo "jakarta-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net -#echo "jai ant/ant-jai" > %{buildroot}%{_sysconfdir}/ant.d/jai -echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel -echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j -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 "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2 -echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail -echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend -echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch -echo "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit -echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil -%endif -%if ! %bootstrap - -%if 0%{?build_javadoc} -mkdir -p %{buildroot}%{_javadocdir}/ant -cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant -%endif #javadoc - -%endif - -%if 0%{?build_javadoc} -# fix link between manual and javadoc -(cd manual; ln -sf %{_javadocdir}/%{name} api) -%endif #javadoc - -%if %bootstrap -find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ - -a ! -name ant-update.xsl \ - -a ! -name changelog.xsl \ - -a ! -name coverage-frames.xsl \ - -a ! -name junit-frames-xalan1.xsl \ - -a ! -name log.xsl \ - -a ! -name mmetrics-frames.xsl \ - -a ! -name tagdiff.xsl \ - | xargs -t rm -%endif - -%if %bootstrap - -%files -%defattr(0644,root,root,0755) -%doc KEYS LICENSE NOTICE README WHATSNEW -%config(noreplace) %{_sysconfdir}/%{name}.conf -%attr(0755,root,root) %{_bindir}/ant -%attr(0755,root,root) %{_bindir}/antRun -%{_javadir}/%{name}.jar -%{_javadir}/%{name}-launcher.jar -%{_javadir}/%{name}-bootstrap.jar -%dir %{_javadir}/%{name} -%dir %{ant_home} -%dir %{ant_home}/etc -%{ant_home}/bin -%{ant_home}/etc/ant-update.xsl -%{ant_home}/etc/changelog.xsl -%{ant_home}/etc/coverage-frames.xsl -%{ant_home}/etc/mmetrics-frames.xsl -%{ant_home}/etc/log.xsl -%{ant_home}/etc/tagdiff.xsl -%{ant_home}/etc/junit-frames-xalan1.xsl -# % {ant_home}/etc/common2master.xsl -# % {ant_home}/etc/printFailingTests.xsl -%dir %{ant_home}/lib -%dir %{_sysconfdir}/%{name}.d -%{ant_home}/lib/ant.jar -%{ant_home}/lib/ant-bootstrap.jar -%{ant_home}/lib/ant-launcher.jar -%dir %{_sysconfdir}/ant.d -%{_mavenpomdir}/JPP-ant-launcher.pom -%{_mavenpomdir}/JPP-ant-parent.pom -%{_mavenpomdir}/JPP-ant.pom -%config(noreplace) %{_mavendepmapfragdir}/* -%dir %{_mavenpomdir} - -%else -# ant-antlr filelist - -%files -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-antlr.jar -%{ant_home}/lib/ant-antlr.jar -%config(noreplace) %{_sysconfdir}/ant.d/antlr -%{_mavenpomdir}/JPP.ant-ant-antlr.pom -%config %{_mavendepmapfragdir}/ant-antlr -%dir %{_mavenpomdir} -%endif - -### Basic ant subpackages -%if %bootstrap - -%files -n ant-jmf -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-jmf.jar -%{ant_home}/lib/ant-jmf.jar -%config(noreplace) %{_sysconfdir}/ant.d/jmf -%{_mavenpomdir}/JPP.ant-ant-jmf.pom - -%files -n ant-swing -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-swing.jar -%{ant_home}/lib/ant-swing.jar -%config(noreplace) %{_sysconfdir}/ant.d/swing -%{_mavenpomdir}/JPP.ant-ant-swing.pom -%dir %{_mavenpomdir} - -%files -n ant-scripts -%defattr(0755,root,root,0755) -%{_bindir}/*.pl -%{_bindir}/*.py* -%endif #if bootstrap - -%if ! %bootstrap - -%files -n ant-apache-bsf -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-apache-bsf.jar -%{ant_home}/lib/ant-apache-bsf.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf -%{_mavenpomdir}/JPP.ant-ant-apache-bsf.pom -%dir %{_mavenpomdir} - -%files -n ant-apache-resolver -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-apache-resolver.jar -%{ant_home}/lib/ant-apache-resolver.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver -%{_mavenpomdir}/JPP.ant-ant-apache-resolver.pom -%dir %{_mavenpomdir} - -%files -n ant-commons-logging -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-commons-logging.jar -%{ant_home}/lib/ant-commons-logging.jar -%config(noreplace) %{_sysconfdir}/ant.d/commons-logging -%{_mavenpomdir}/JPP.ant-ant-commons-logging.pom -%dir %{_mavenpomdir} - -%files -n ant-commons-net -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-commons-net.jar -%{ant_home}/lib/ant-commons-net.jar -%config(noreplace) %{_sysconfdir}/ant.d/commons-net -%{_mavenpomdir}/JPP.ant-ant-commons-net.pom -%dir %{_mavenpomdir} -# Disable as we dont ship the dependencies -%if 0 - -%files -n ant-jai -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-jai.jar -%{ant_home}/lib/ant-jai.jar -%config(noreplace) %{_sysconfdir}/ant.d/jai -%endif - -%files -n ant-apache-bcel -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-apache-bcel.jar -%{ant_home}/lib/ant-apache-bcel.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel -%{_mavenpomdir}/JPP.ant-ant-apache-bcel.pom -%dir %{_mavenpomdir} - -%files -n ant-apache-log4j -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-apache-log4j.jar -%{ant_home}/lib/ant-apache-log4j.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j -%{_mavenpomdir}/JPP.ant-ant-apache-log4j.pom -%dir %{_mavenpomdir} - -%files -n ant-apache-oro -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-apache-oro.jar -%{ant_home}/lib/ant-apache-oro.jar -%{ant_home}/etc/maudit-frames.xsl -%config(noreplace) %{_sysconfdir}/ant.d/apache-oro -%{_mavenpomdir}/JPP.ant-ant-apache-oro.pom -%dir %{_mavenpomdir} - -%files -n ant-apache-regexp -%defattr(-,root,root,-) -%{_javadir}/ant/ant-apache-regexp.jar -%{ant_home}/lib/ant-apache-regexp.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp -%{_mavenpomdir}/JPP.ant-ant-apache-regexp.pom -%dir %{_mavenpomdir} - -%files -n ant-apache-xalan2 -%defattr(-,root,root,-) -%{_javadir}/ant/ant-apache-xalan2.jar -%{ant_home}/lib/ant-apache-xalan2.jar -%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2 -%{_mavenpomdir}/JPP.ant-ant-apache-xalan2.pom -%dir %{_mavenpomdir} - -%files -n ant-javamail -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-javamail.jar -%{ant_home}/lib/ant-javamail.jar -%config(noreplace) %{_sysconfdir}/ant.d/javamail -%{_mavenpomdir}/JPP.ant-ant-javamail.pom -%dir %{_mavenpomdir} - -%files -n ant-jdepend -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-jdepend.jar -%{ant_home}/lib/ant-jdepend.jar -%config(noreplace) %{_sysconfdir}/ant.d/jdepend -%{ant_home}/etc/jdepend.xsl -%{ant_home}/etc/jdepend-frames.xsl -%{_mavenpomdir}/JPP.ant-ant-jdepend.pom -%dir %{_mavenpomdir} - -%files -n ant-jsch -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-jsch.jar -%{ant_home}/lib/ant-jsch.jar -%config(noreplace) %{_sysconfdir}/ant.d/jsch -%{_mavenpomdir}/JPP.ant-ant-jsch.pom -%dir %{_mavenpomdir} - -%files -n ant-junit -%defattr(0644,root,root,0755) -%{_javadir}/ant/ant-junit*.jar -%{ant_home}/lib/ant-junit*.jar -%config(noreplace) %{_sysconfdir}/ant.d/junit -%{ant_home}/etc/junit-frames.xsl -%{ant_home}/etc/junit-noframes.xsl -%{_mavenpomdir}/JPP.ant-ant-junit*.pom -%dir %{_mavenpomdir} - -%files -n ant-testutil -%defattr(-,root,root,-) -%{_javadir}/ant/ant-testutil.jar -%{ant_home}/lib/ant-testutil.jar -%config(noreplace) %{_sysconfdir}/ant.d/testutil -%{_mavenpomdir}/JPP.ant-ant-testutil.pom -%dir %{_mavenpomdir} - -%files -n ant-manual -%defattr(0644,root,root,0755) -%doc manual/* - -%if 0%{?build_javadoc} - -%files -n ant-javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/ant -%endif #javadoc -%endif - -%changelog diff --git a/ant-antlr.changes b/ant-antlr.changes index 90d40c8..77126f4 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jul 4 11:54:48 UTC 2014 - tchvatal@suse.com + +- Update to 1.9.4: + * Read WHATSNEW file for full changelist + * initial support for Java 1.9 + * has now a threads attribute allowing to run the tests in + several threads. Bugzilla Report 55925 + * TarInputStream will now read archives created by tar + implementations that encode big numbers by not adding a trailing + NUL. + ------------------------------------------------------------------- Fri May 2 09:01:15 UTC 2014 - tchvatal@suse.com diff --git a/ant-antlr.spec b/ant-antlr.spec index 9b0da56..363cf96 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -34,7 +34,7 @@ %global major_version 1.9 Name: ant-antlr -Version: 1.9.3 +Version: 1.9.4 Release: 0 Summary: Antlr Task for ant License: Apache-2.0 @@ -45,10 +45,8 @@ Source1: apache-ant-1.8.ant.conf Source1000: pre_checkin.sh Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc Source1002: ant.keyring - Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch - %if %bootstrap BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel @@ -64,7 +62,7 @@ BuildRequires: unzip BuildRequires: xml-commons-apis-bootstrap %if ! %bootstrap BuildRequires: ant = %{version} -BuildRequires: junit4 +BuildRequires: junit BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis @@ -74,7 +72,6 @@ BuildRequires: xml-commons-apis Requires: java-devel >= 1.5.0 Requires: javapackages-tools Requires: jaxp_parser_impl -#Requires: xerces-j2 >= 2.7.1-2 Requires: xml-commons-apis Requires: xml-commons-resolver Obsoletes: apache-ant < %{version} @@ -86,7 +83,7 @@ Provides: ant-trax = %{version} %else # ant-antlr requires Requires: antlr -%requires_eq ant +%requires_eq ant Provides: ant-antlr = %{version}-%{release} %endif BuildArch: noarch @@ -128,9 +125,8 @@ based on the OS used. %if %bootstrap - %package -n ant-jmf -Summary: Optional jmf tasks for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: ant = %{version} @@ -141,13 +137,8 @@ Apache Ant is a Java-based build tool. This package contains optional jmf tasks for Apache Ant. - - - - - %package -n ant-swing -Summary: Optional swing tasks for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: ant = %{version} @@ -158,12 +149,8 @@ Apache Ant is a Java-based build tool. This package contains optional swing tasks for Apache Ant. - - - - %package -n ant-scripts -Summary: Additional scripts for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: %{_bindir}/perl @@ -176,100 +163,82 @@ Apache Ant is a Java-based build tool. This package contains additional perl and python scripts for Apache Ant. - - %endif #if bootstrap %if ! %bootstrap %package -n ant-apache-bsf -Summary: Optional apache bsf tasks for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: bsf -%requires_eq ant +%requires_eq ant BuildRequires: bsf -Provides: ant-apache-bsf = %{version}-%{release} %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 +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: xml-commons-resolver -%requires_eq ant +%requires_eq ant BuildRequires: xml-commons-resolver -Provides: ant-apache-resolver = %{version}-%{release} %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-commons-logging -Summary: Optional commons logging tasks for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: jakarta-commons-logging -%requires_eq ant +%requires_eq ant BuildRequires: jakarta-commons-logging -Provides: ant-commons-logging = %{version}-%{release} %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-commons-net -Summary: Optional commons net tasks for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: jakarta-commons-net -%requires_eq ant +%requires_eq ant BuildRequires: jakarta-commons-net -Provides: ant-commons-net = %{version}-%{release} %description -n ant-commons-net Apache Ant is a Java-based build tool. This package contains optional commons net tasks for Apache Ant. - - # Disable because we don't ship the dependencies %if 0 - %package -n ant-jai - -Summary: Optional jai tasks for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: jai -%requires_eq ant +%requires_eq ant BuildRequires: jai -Provides: ant-jai = %{version}-%{release} %description -n ant-jai Optional jai tasks for ant. %endif %package -n ant-apache-bcel -Summary: Optional apache bcel tasks for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: bcel -%requires_eq ant +%requires_eq ant BuildRequires: bcel -Provides: ant-apache-bcel = %{version} Provides: ant-jakarta-bcel = %{version} Obsoletes: ant-jakarta-bcel < %{version} @@ -278,16 +247,13 @@ 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 +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: log4j -%requires_eq ant +%requires_eq ant BuildRequires: log4j-mini -Provides: ant-apache-log4j = %{version} Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -296,16 +262,13 @@ 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 +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: oro -%requires_eq ant +%requires_eq ant BuildRequires: oro -Provides: ant-apache-oro = %{version} Provides: ant-jakarta-oro = %{version} Obsoletes: ant-jakarta-oro < %{version} @@ -314,16 +277,13 @@ 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 +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: regexp -%requires_eq ant +%requires_eq ant BuildRequires: regexp -Provides: ant-apache-regexp = %{version} Provides: ant-jakarta-regexp = %{version} Obsoletes: ant-jakarta-regexp < %{version} @@ -333,73 +293,61 @@ Apache Ant is a Java-based build tool. This package contains optional apache regexp tasks for Apache Ant. %package -n ant-apache-xalan2 -Summary: Optional apache xalan2 tasks for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building BuildRequires: regexp Requires: regexp -%requires_eq ant -Provides: ant-apache-xalan2 = %{version} +%requires_eq ant %description -n ant-apache-xalan2 Optional apache xalan2 tasks for %{name}. - %package -n ant-javamail -Summary: Optional javamail tasks for ant +Summary: Antlr Task for ant License: CDDL-1.0 Group: Development/Tools/Building BuildRequires: javamail >= 1.2-5jpp Requires: javamail >= 1.2-5jpp -%requires_eq ant -Provides: ant-javamail = %{version} +%requires_eq ant %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 +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: jdepend -%requires_eq ant +%requires_eq ant BuildRequires: jdepend -Provides: ant-jdepend = %{version} %description -n ant-jdepend Apache Ant is a Java-based build tool. This package contains optional jdepend tasks for Apache Ant. - - %package -n ant-jsch -Summary: Optional jsch tasks for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: jsch -%requires_eq ant +%requires_eq ant BuildRequires: jsch -Provides: ant-jsch = %{version} %description -n ant-jsch Apache Ant is a Java-based build tool. This package contains optional jsch tasks for Apache Ant. - - %package -n ant-junit -Summary: Optional junit tasks for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: junit4 -%requires_eq ant -Provides: ant-junit = %{version} +%requires_eq ant %description -n ant-junit Apache Ant is a Java-based build tool. @@ -407,20 +355,17 @@ Apache Ant is a Java-based build tool. This package contains optional JUnit tasks for Apache Ant. %package -n ant-testutil -Summary: Test utility classes for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Requires: junit4 -%requires_eq ant -Provides: ant-testutil = %{version} +%requires_eq ant %description -n ant-testutil Test utility tasks for %{name}. - - %package -n ant-manual -Summary: Manual for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building @@ -429,11 +374,9 @@ Apache Ant is a Java-based build tool. This package contains the manual for Apache Ant. - %if 0%{?build_javadoc} - %package -n ant-javadoc -Summary: Javadoc for ant +Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building @@ -442,7 +385,6 @@ Apache Ant is a Java-based build tool. This package contains the javadoc documentation for Apache Ant. %endif #javadoc - %endif %prep @@ -487,14 +429,14 @@ mv LICENSE.utf8 LICENSE export OPT_JAR_LIST=: %if ! %bootstrap -%{ant} -Dbuild.sysclasspath=first jars test-jar +ant -Dbuild.sysclasspath=first jars test-jar #remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar %if 0%{?build_javadoc} export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) -%{ant} javadocs +ant javadocs %endif %else @@ -564,7 +506,6 @@ done %if %bootstrap #ant-parent pom install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -# % add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent %add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts diff --git a/ant.changes b/ant.changes index 677aba5..5a4eda0 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jul 4 11:54:48 UTC 2014 - tchvatal@suse.com + +- Update to 1.9.4: + * Read WHATSNEW file for full changelist + * initial support for Java 1.9 + * has now a threads attribute allowing to run the tests in + several threads. Bugzilla Report 55925 + * TarInputStream will now read archives created by tar + implementations that encode big numbers by not adding a trailing + NUL. + ------------------------------------------------------------------- Thu May 15 13:18:36 UTC 2014 - peter.trommler@ohm-hochschule.de diff --git a/ant.spec b/ant.spec index f727900..b8628ed 100644 --- a/ant.spec +++ b/ant.spec @@ -33,7 +33,7 @@ %global major_version 1.9 Name: ant -Version: 1.9.3 +Version: 1.9.4 Release: 0 Summary: Java-based build tool License: Apache-2.0 @@ -44,10 +44,8 @@ Source1: apache-ant-1.8.ant.conf Source1000: pre_checkin.sh Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc Source1002: ant.keyring - Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch - %if %bootstrap BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel @@ -63,7 +61,7 @@ BuildRequires: unzip BuildRequires: xml-commons-apis-bootstrap %if ! %bootstrap BuildRequires: ant = %{version} -BuildRequires: junit4 +BuildRequires: junit BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis @@ -73,7 +71,6 @@ BuildRequires: xml-commons-apis Requires: java-devel >= 1.5.0 Requires: javapackages-tools Requires: jaxp_parser_impl -#Requires: xerces-j2 >= 2.7.1-2 Requires: xml-commons-apis Requires: xml-commons-resolver Obsoletes: apache-ant < %{version} @@ -85,7 +82,7 @@ Provides: ant-trax = %{version} %else # ant-antlr requires Requires: antlr -%requires_eq ant +%requires_eq ant Provides: ant-antlr = %{version}-%{release} %endif BuildArch: noarch @@ -127,7 +124,6 @@ based on the OS used. %if %bootstrap - %package -n ant-jmf Summary: Optional jmf tasks for ant License: Apache-2.0 @@ -140,11 +136,6 @@ Apache Ant is a Java-based build tool. This package contains optional jmf tasks for Apache Ant. - - - - - %package -n ant-swing Summary: Optional swing tasks for ant License: Apache-2.0 @@ -157,10 +148,6 @@ Apache Ant is a Java-based build tool. This package contains optional swing tasks for Apache Ant. - - - - %package -n ant-scripts Summary: Additional scripts for ant License: Apache-2.0 @@ -175,8 +162,6 @@ Apache Ant is a Java-based build tool. This package contains additional perl and python scripts for Apache Ant. - - %endif #if bootstrap %if ! %bootstrap @@ -185,77 +170,62 @@ Summary: Optional apache bsf tasks for ant License: Apache-2.0 Group: Development/Tools/Building Requires: bsf -%requires_eq ant +%requires_eq ant BuildRequires: bsf -Provides: ant-apache-bsf = %{version}-%{release} %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 License: Apache-2.0 Group: Development/Tools/Building Requires: xml-commons-resolver -%requires_eq ant +%requires_eq ant BuildRequires: xml-commons-resolver -Provides: ant-apache-resolver = %{version}-%{release} %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-commons-logging Summary: Optional commons logging tasks for ant License: Apache-2.0 Group: Development/Tools/Building Requires: jakarta-commons-logging -%requires_eq ant +%requires_eq ant BuildRequires: jakarta-commons-logging -Provides: ant-commons-logging = %{version}-%{release} %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-commons-net Summary: Optional commons net tasks for ant License: Apache-2.0 Group: Development/Tools/Building Requires: jakarta-commons-net -%requires_eq ant +%requires_eq ant BuildRequires: jakarta-commons-net -Provides: ant-commons-net = %{version}-%{release} %description -n ant-commons-net Apache Ant is a Java-based build tool. This package contains optional commons net tasks for Apache Ant. - - # Disable because we don't ship the dependencies %if 0 - %package -n ant-jai - Summary: Optional jai tasks for ant License: Apache-2.0 Group: Development/Tools/Building Requires: jai -%requires_eq ant +%requires_eq ant BuildRequires: jai -Provides: ant-jai = %{version}-%{release} %description -n ant-jai Optional jai tasks for ant. @@ -266,9 +236,8 @@ Summary: Optional apache bcel tasks for ant License: Apache-2.0 Group: Development/Tools/Building Requires: bcel -%requires_eq ant +%requires_eq ant BuildRequires: bcel -Provides: ant-apache-bcel = %{version} Provides: ant-jakarta-bcel = %{version} Obsoletes: ant-jakarta-bcel < %{version} @@ -277,16 +246,13 @@ 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 License: Apache-2.0 Group: Development/Tools/Building Requires: log4j -%requires_eq ant +%requires_eq ant BuildRequires: log4j-mini -Provides: ant-apache-log4j = %{version} Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -295,16 +261,13 @@ 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 License: Apache-2.0 Group: Development/Tools/Building Requires: oro -%requires_eq ant +%requires_eq ant BuildRequires: oro -Provides: ant-apache-oro = %{version} Provides: ant-jakarta-oro = %{version} Obsoletes: ant-jakarta-oro < %{version} @@ -313,16 +276,13 @@ 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 License: Apache-2.0 Group: Development/Tools/Building Requires: regexp -%requires_eq ant +%requires_eq ant BuildRequires: regexp -Provides: ant-apache-regexp = %{version} Provides: ant-jakarta-regexp = %{version} Obsoletes: ant-jakarta-regexp < %{version} @@ -337,68 +297,56 @@ License: Apache-2.0 Group: Development/Tools/Building BuildRequires: regexp Requires: regexp -%requires_eq ant -Provides: ant-apache-xalan2 = %{version} +%requires_eq ant %description -n ant-apache-xalan2 Optional apache xalan2 tasks for %{name}. - %package -n ant-javamail Summary: Optional javamail tasks for ant License: CDDL-1.0 Group: Development/Tools/Building BuildRequires: javamail >= 1.2-5jpp Requires: javamail >= 1.2-5jpp -%requires_eq ant -Provides: ant-javamail = %{version} +%requires_eq ant %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 License: Apache-2.0 Group: Development/Tools/Building Requires: jdepend -%requires_eq ant +%requires_eq ant BuildRequires: jdepend -Provides: ant-jdepend = %{version} %description -n ant-jdepend Apache Ant is a Java-based build tool. This package contains optional jdepend tasks for Apache Ant. - - %package -n ant-jsch Summary: Optional jsch tasks for ant License: Apache-2.0 Group: Development/Tools/Building Requires: jsch -%requires_eq ant +%requires_eq ant BuildRequires: jsch -Provides: ant-jsch = %{version} %description -n ant-jsch Apache Ant is a Java-based build tool. This package contains optional jsch tasks for Apache Ant. - - %package -n ant-junit Summary: Optional junit tasks for ant License: Apache-2.0 Group: Development/Tools/Building Requires: junit4 -%requires_eq ant -Provides: ant-junit = %{version} +%requires_eq ant %description -n ant-junit Apache Ant is a Java-based build tool. @@ -410,14 +358,11 @@ Summary: Test utility classes for ant License: Apache-2.0 Group: Development/Tools/Building Requires: junit4 -%requires_eq ant -Provides: ant-testutil = %{version} +%requires_eq ant %description -n ant-testutil Test utility tasks for %{name}. - - %package -n ant-manual Summary: Manual for ant License: Apache-2.0 @@ -428,9 +373,7 @@ Apache Ant is a Java-based build tool. This package contains the manual for Apache Ant. - %if 0%{?build_javadoc} - %package -n ant-javadoc Summary: Javadoc for ant License: Apache-2.0 @@ -441,7 +384,6 @@ Apache Ant is a Java-based build tool. This package contains the javadoc documentation for Apache Ant. %endif #javadoc - %endif %prep @@ -486,14 +428,14 @@ mv LICENSE.utf8 LICENSE export OPT_JAR_LIST=: %if ! %bootstrap -%{ant} -Dbuild.sysclasspath=first jars test-jar +ant -Dbuild.sysclasspath=first jars test-jar #remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar %if 0%{?build_javadoc} export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) -%{ant} javadocs +ant javadocs %endif %else @@ -563,7 +505,6 @@ done %if %bootstrap #ant-parent pom install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -# % add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent %add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts diff --git a/apache-ant-1.9.3-src.tar.bz2 b/apache-ant-1.9.3-src.tar.bz2 deleted file mode 100644 index 5d64050..0000000 --- a/apache-ant-1.9.3-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb9306e8b8322bb09b78cc3d8e288398f9cb657d76ffc61ee3fb175e786e8365 -size 3409084 diff --git a/apache-ant-1.9.3-src.tar.bz2.asc b/apache-ant-1.9.3-src.tar.bz2.asc deleted file mode 100644 index e6ed6cc..0000000 --- a/apache-ant-1.9.3-src.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: BCPG v1.29 - -iQIcBAABAgAQBQJSuFDdCRBe+tn+gqf7zQAALfQQALvsfsoZg1M5Gidza+SGQIun -5jMVKlWs9vftmM5rOpM2Ftv46S8JpYuXzU8liyMcYww+b4S1ANoyEGxz7pR0KR8D -VOi6/hVHIYobk8k2vspjmuq/FRJl/jnIdwwg3B9p2lCVP/Iot4IVwlG+q1cIEJ9e -IHuC/00+KYAvCUmnfqCqB8SqIwejXVdZ8WTfrgyksp0bJv9R01bRxL6txJ1AhANW -RH0rkR0hNCmyDcl9g8d5pziN5YVEY9OvzGsWSzEf79I106oHwh3G+GMhemqB2a8d -sddcrXvj0iPnmyOltAheBPTHBJ3t6VbilFcN3BmGU3zpu+TQQb8q5kItzmHQAR/X -IH4KNGZq2fBJWP5BRHAmD9K+tb69/szm3k0MfKtx3dyWhl8+LiS4j9wCQ3rG30J7 -kOhLC8NOEs/STL6CGKur1WGb9naoJ+xe/tU23nufOZHv1XGL6DTg7dvk3pSZG2Ff -XCjthjba1rzOiGIz72gVgoQGCqWcr2DdVc1tO/HGV9e4Kxks/kRsVwY+dwnL23ka -ynegQoOzl7pqnLrZXjLiyvFGegCrEz1sMmJUsI0pIOIPu8n7wD8YNoeGh4ZaN1qL -W++Oidms2B+/sMaDpsDl9Jw2yC3rkpLbWzbOs/sBDDxKNMOiWgHVK7oVSIdLJwV+ -NyUG09AggTC1/Q3g1+1O -=Gnno ------END PGP SIGNATURE----- diff --git a/apache-ant-1.9.4-src.tar.bz2 b/apache-ant-1.9.4-src.tar.bz2 new file mode 100644 index 0000000..f2b6d9e --- /dev/null +++ b/apache-ant-1.9.4-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac594ff7dcd461ebb3e607493af7682f84b1ceaa0621e17ec6367b8d2c410a1c +size 3802926 diff --git a/apache-ant-1.9.4-src.tar.bz2.asc b/apache-ant-1.9.4-src.tar.bz2.asc new file mode 100644 index 0000000..11fe14d --- /dev/null +++ b/apache-ant-1.9.4-src.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: BCPG v1.29 + +iQIcBAABAgAQBQJTYGtfCRBe+tn+gqf7zQAAQlsP/1wBDMlEe+SJWOStHB9rYAVz +lv27ZTT0GXyTFv0Ex3ue9PtV4azoLByToMeMeClgjWN6nUUEkynrzqKlFuXTDBg8 +d+UPUbBh1Jsgjl3hmF+yQXrXEyU/WIg2W1RbXUB78k/lKPTo6AZvlauGYKpTPlA0 +qnsScqxZ9e0L1y+SyiJ4Wtdk402NU4cpEoIj0RFgJmoRFxuk38z3iTidTmtiCkoD +EV+wfp66mJ4Tbf/A5Pw0t0SwPKD6VElAZ09MYjYlzQRZhfFx+eUjVANJ9RGdIeKh +38PFEz9lT6u8fUpbkJycDosrCo8a281plT9NkoyMPlcGS/Kiw6TTI3oAeXGh6stQ +G43K+4ck2nfCXO+BN8fi28RV/Z+McLCw1itV6+pVo9EEUYzOhGTTZQ+2AuDY0LEM +GGiookw+kKeypPcE4LAAoXGzdQ6yaUtntI3eTFiCgIg/GfJQ+X0ynyvfNP85WnVf +vHAUKTsev0gczD/ktlWGOcT6CQgOEfoi0oCgjPkDvTki6UInjC7DAHYVjoINMXEm +eu20V6YJv8aVkz3InUxuI/ZKt0lavs8CZPah72IY9a2De7+NX/oOKmyo5M975Wkh +1w94FJW+8PtuhVucCY/Ku0nrdwPePiJyWcyko/IhZqwHoXHvZ7hRhTh5Z9rTkg17 +fxrlBOMPDuAczLOZFqKC +=v3Yu +-----END PGP SIGNATURE----- diff --git a/pre_checkin.sh b/pre_checkin.sh index 76dc326..89941cc 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -2,8 +2,5 @@ EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####\n" sed "s/^%global bootstrap.*$/${EDIT_WARNING}%global bootstrap 0/; s/^\(Name:.*\)$/\1-antlr/; + s/^Summary:.*/Summary: Antlr Task for ant/; " < ant.spec > ant-antlr.spec - -sed "s/^%global bootstrap.*$/${EDIT_WARNING}%global bootstrap 0/; - s/^\(Name:.*\)$/\1-antlr-SLE_11/; - " < ant-SLE_11.spec > ant-antlr-SLE_11.spec