From 17bb9c4375911c65355df92242c868cee9faaf00 Mon Sep 17 00:00:00 2001 From: Permaine Cheung Date: Mar 16 2007 21:55:40 +0000 Subject: - Merge with upstream, get rid of the endorsed patch --- diff --git a/.cvsignore b/.cvsignore index eba4e7f..b92412f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1 @@ -apache-ant-1.6.2-src-RHCLEAN.tar.bz2 -apache-ant-1.6.2 -i386 -*.src.rpm -apache-ant-1.6.5-src.tar.bz2 -apache-ant-1.6.5-RHCLEAN.src.tar.bz2 +apache-ant-1.6.5-src.tar.gz diff --git a/ant.spec b/ant.spec index 6baeb41..5c2faf0 100644 --- a/ant.spec +++ b/ant.spec @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2005, JPackage Project +# Copyright (c) 2000-2007, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -30,16 +30,28 @@ %define _with_gcj_support 1 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} +# Bootstrap sequence is +# 1) rpmbuild ant --with bootstrap1 and install +# 2) build xml-commons-apis and install +# 3) build some jaxp_parser_impl (crimson) and install +# 4) rpmbuild ant --with bootstrap2 and force update +# 5) build rest of full ant BRs and install them +# 6) rpmbuild ant (no special option) and force update + +# build while still no jaxp_parser_impl nor xml-commons-apis available +%define bootstrap1 %{?_with_bootstrap1:1}%{!?_with_bootstrap1:%{?_without_bootstrap1:0}%{!?_without_bootstrap1:%{?_bootstrap1:%{_bootstrap1}}%{!?_bootstrap1:0}}} +# build core packages when xml-commons-apis and some jaxp_parser_impl available +%define bootstrap2 %{?_with_bootstrap2:1}%{!?_with_bootstrap2:%{?_without_bootstrap2:0}%{!?_without_bootstrap2:%{?_bootstrap2:%{_bootstrap2}}%{!?_bootstrap2:0}}} %define ant_home %{_datadir}/ant %define section free %define major_version 1.6 -%define jpprelease 2jpp +%define jpprelease 4jpp Name: ant Version: 1.6.5 -Release: %{jpprelease}.3%{?dist} +Release: %{jpprelease}.1%{?dist} Epoch: 0 Summary: Ant build tool for java Summary(it): Tool per la compilazione di programmi java @@ -47,7 +59,7 @@ Summary(fr): Outil de compilation pour java License: Apache Software License URL: http://ant.apache.org/ Group: Development/Build Tools -Source0: apache-ant-%{version}-RHCLEAN.src.tar.bz2 +Source0: http://archive.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.gz Source2: apache-ant-1.6.2.ant.conf Patch1: apache-ant-1.6.5-rpm.patch # javah: BZ 157750 @@ -59,30 +71,42 @@ Patch2: apache-ant-1.6.5-javah.patch Patch4: apache-ant-jars.patch #Patch5: apache-ant-bz163689.patch Patch6: apache-ant-1.6.5-jvm1.5-detect.patch -Patch7: apache-ant-1.6.5-endorsed.patch +#Patch7: apache-ant-1.6.5-endorsed.patch Requires: xerces-j2 Requires: jaxp_parser_impl -Requires: jpackage-utils >= 0:1.5 +Requires: jpackage-utils >= 0:1.6 +Requires(pre): jpackage-utils >= 0:1.6 +Requires(postun): jpackage-utils >= 0:1.6 Requires: java-devel Requires: xml-commons-apis BuildRequires: xerces-j2 BuildRequires: jaxp_parser_impl -BuildRequires: jpackage-utils >= 0:1.5 +BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: java-devel BuildRequires: coreutils +%if ! %{bootstrap1} +Requires: jaxp_parser_impl +BuildRequires: jaxp_parser_impl +Requires: xml-commons-apis BuildRequires: xml-commons-apis +%endif %if ! %{gcj_support} BuildArch: noarch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: ant-optional < %{epoch}:%{version}-%{jpprelease} +Provides: ant-optional = %{epoch}:%{version}-%{jpprelease} Obsoletes: ant-optional-full < %{epoch}:%{version}-%{jpprelease} +Provides: ant-optional-full = %{epoch}:%{version}-%{jpprelease} # Allow subpackages not in Fedora to be installed from JPackage Provides: %{name} = %{epoch}:%{version}-%{jpprelease} # RHEL3 and FC2 Obsoletes: %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2 +Provides: %{name}-libs = %{epoch}:%{version}-%{jpprelease} +Provides: %{name}-core = %{epoch}:%{version}-%{jpprelease} # FC4 Obsoletes: %{name}-jmf <= 1.6.2-3jpp_12fc +Provides: %{name}-jmf = %{epoch}:%{version}-%{jpprelease} %if %{gcj_support} BuildRequires: java-gcj-compat-devel @@ -126,6 +150,7 @@ Requires(postun): java-gcj-compat %description manifest-only Manifest-only jars for %{name}. +%if ! %{bootstrap1} && ! %{bootstrap2} %package antlr Summary: Optional antlr tasks for %{name} Group: Development/Build Tools @@ -146,7 +171,9 @@ Optional antlr tasks for %{name}. %description antlr -l fr Taches antlr optionelles pour %{name}. +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %package apache-bsf Summary: Optional apache bsf tasks for %{name} Group: Development/Build Tools @@ -167,7 +194,9 @@ Optional apache bsf tasks for %{name}. %description apache-bsf -l fr Taches apache bsf optionelles pour %{name}. +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %package apache-resolver Summary: Optional apache resolver tasks for %{name} Group: Development/Build Tools @@ -188,7 +217,10 @@ Optional apache resolver tasks for %{name}. %description apache-resolver -l fr Taches apache resolver optionelles pour %{name}. +%endif + +%if ! %{bootstrap1} && ! %{bootstrap2} %package commons-logging Summary: Optional commons logging tasks for %{name} Group: Development/Build Tools @@ -209,9 +241,11 @@ Optional commons logging tasks for %{name}. %description commons-logging -l fr Taches commons logging optionelles pour %{name}. +%endif # Disable because we don't ship the dependencies %if 0 +%if ! %{bootstrap1} && ! %{bootstrap2} %package commons-net Summary: Optional commons net tasks for %{name} Group: Development/Build Tools @@ -232,6 +266,7 @@ Optional commons net tasks for %{name}. %description commons-net -l fr Taches commons net optionelles pour %{name}. +%endif %package jai Summary: Optional jai tasks for %{name} @@ -255,6 +290,7 @@ Optional jai tasks for %{name}. Taches jai optionelles pour %{name}. %endif +%if ! %{bootstrap1} && ! %{bootstrap2} %package apache-bcel Summary: Optional apache bcel tasks for %{name} Group: Development/Build Tools @@ -277,7 +313,9 @@ Optional apache bcel tasks for %{name}. %description apache-bcel -l fr Taches apache bcel optionelles pour %{name}. +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %package apache-log4j Summary: Optional apache log4j tasks for %{name} Group: Development/Build Tools @@ -300,7 +338,9 @@ Optional apache log4j tasks for %{name}. %description apache-log4j -l fr Taches apache log4j optionelles pour %{name}. +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %package apache-oro Summary: Optional apache oro tasks for %{name} Group: Development/Build Tools @@ -323,7 +363,9 @@ Optional apache oro tasks for %{name}. %description apache-oro -l fr Taches apache oro optionelles pour %{name}. +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %package apache-regexp Summary: Optional apache regexp tasks for %{name} Group: Development/Build Tools @@ -346,7 +388,9 @@ Optional apache regexp tasks for %{name}. %description apache-regexp -l fr Taches apache regexp optionelles pour %{name}. +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %package javamail Summary: Optional javamail tasks for %{name} Group: Development/Build Tools @@ -369,7 +413,9 @@ Optional javamail tasks for %{name}. %description javamail -l fr Taches javamail optionelles pour %{name}. +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %package jdepend Summary: Optional jdepend tasks for %{name} Group: Development/Build Tools @@ -390,6 +436,7 @@ Optional jdepend tasks for %{name}. %description jdepend -l fr Taches jdepend optionelles pour %{name}. +%endif %package jmf Summary: Optional jmf tasks for %{name} @@ -410,6 +457,7 @@ Optional jmf tasks for %{name}. %description jmf -l fr Taches jmf optionelles pour %{name}. +%if ! %{bootstrap1} && ! %{bootstrap2} %package jsch Summary: Optional jsch tasks for %{name} Group: Development/Build Tools @@ -430,7 +478,9 @@ Optional jsch tasks for %{name}. %description jsch -l fr Taches jsch optionelles pour %{name}. +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %package junit Summary: Optional junit tasks for %{name} Group: Development/Build Tools @@ -451,6 +501,7 @@ Optional junit tasks for %{name}. %description junit -l fr Taches junit optionelles pour %{name}. +%endif %package nodeps Summary: Optional tasks for %{name} @@ -498,6 +549,7 @@ Requires: jaxp_transform_impl Provides: ant-trax = %{epoch}:%{version}-%{release} # The ant-xalan jar has been merged into the ant-trax one Obsoletes: ant-xalan2 < %{epoch}:%{version}-%{release} +Provides: ant-xalan2 = %{epoch}:%{version}-%{release} Conflicts: ant-optional-clean, ant-optional-full %if %{gcj_support} @@ -572,14 +624,12 @@ Javadoc pour %{name}. %patch6 -b .sav -# Add endorsed option when running ant -%patch7 -p1 +## Add endorsed option when running ant +#%patch7 -p1 # clean jar files find . -name "*.jar" -exec rm -f {} \; -rm src/script/ant.orig - # ----------------------------------------------------------------------------- %build @@ -620,9 +670,9 @@ cp -p build/lib/%{name}-vaj.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-vaj-% cp -p build/lib/%{name}-weblogic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-weblogic-%{version}.jar cp -p build/lib/%{name}-xalan1.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xalan1-%{version}.jar cp -p build/lib/%{name}-xslp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xslp-%{version}.jar +%if ! %{bootstrap1} && ! %{bootstrap2} cp -p build/lib/%{name}-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar cp -p build/lib/%{name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar -cp -p build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar cp -p build/lib/%{name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar #cp -p build/lib/%{name}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar #cp -p build/lib/%{name}-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jai-%{version}.jar @@ -630,6 +680,7 @@ cp -p build/lib/%{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{nam cp -p build/lib/%{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar cp -p build/lib/%{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar cp -p build/lib/%{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar +cp -p build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar ln -sf %{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-bcel.jar ln -sf %{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-log4j.jar ln -sf %{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-oro.jar @@ -639,6 +690,7 @@ cp -p build/lib/%{name}-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-j cp -p build/lib/%{name}-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmf-%{version}.jar cp -p build/lib/%{name}-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsch-%{version}.jar cp -p build/lib/%{name}-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-junit-%{version}.jar +%endif cp -p build/lib/%{name}-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar cp -p build/lib/%{name}-swing.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swing-%{version}.jar cp -p build/lib/%{name}-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-trax-%{version}.jar @@ -647,12 +699,12 @@ cp -p build/lib/%{name}-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-trax (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -# endorsed jars -mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}/endorsed -pushd $RPM_BUILD_ROOT%{_javadir}/%{name}/endorsed -ln -sf $(build-classpath xml-commons-apis) -ln -sf $(build-classpath xerces-j2) jaxp_parser_impl.jar -popd +## endorsed jars +#mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}/endorsed +#pushd $RPM_BUILD_ROOT%{_javadir}/%{name}/endorsed +#ln -sf $(build-classpath xml-commons-apis) +#ln -sf $(build-classpath xerces-j2) jaxp_parser_impl.jar +#popd # scripts: remove dos and os/2 scripts rm -f src/script/*.bat @@ -660,6 +712,13 @@ rm -f src/script/*.cmd # XSLs cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc +%if %{bootstrap1} || %{bootstrap2} +rm -f $RPM_BUILD_ROOT%{ant_home}/etc/jdepend-frames.xsl +rm -f $RPM_BUILD_ROOT%{ant_home}/etc/jdepend.xsl +rm -f $RPM_BUILD_ROOT%{ant_home}/etc/junit-frames.xsl +rm -f $RPM_BUILD_ROOT%{ant_home}/etc/junit-noframes.xsl +rm -f $RPM_BUILD_ROOT%{ant_home}/etc/maudit-frames.xsl +%endif # install everything else mkdir -p $RPM_BUILD_ROOT%{_bindir} @@ -671,9 +730,9 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf # OPT_JAR_LIST fragments mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d +%if ! %{bootstrap1} && ! %{bootstrap2} echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf -echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging #echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net #echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jai @@ -683,9 +742,11 @@ echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-o echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend -echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit +echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver +%endif +echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/trax @@ -1029,7 +1090,7 @@ fi %files %defattr(0644,root,root,0755) %doc KEYS LICENSE NOTICE README WHATSNEW -%config %{_sysconfdir}/%{name}.conf +%config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant %attr(0755,root,root) %{_bindir}/antRun %{_javadir}/%{name}.jar @@ -1037,7 +1098,7 @@ fi %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}-launcher-%{version}.jar %dir %{_javadir}/%{name} -%{_javadir}/%{name}/endorsed +#%{_javadir}/%{name}/endorsed %dir %{ant_home} %dir %{ant_home}/etc %{ant_home}/etc/ant-update.xsl @@ -1073,68 +1134,78 @@ fi %{_javadir}/%{name}/ant-xslp-%{version}.jar %{_javadir}/%{name}/ant-xslp.jar +%if ! %{bootstrap1} && ! %{bootstrap2} %files antlr %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-antlr.jar %{_javadir}/%{name}/%{name}-antlr-%{version}.jar -%{_sysconfdir}/%{name}.d/antlr +%config(noreplace) %{_sysconfdir}/%{name}.d/antlr %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-antlr-1.6.5.jar.* %endif +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %files apache-bsf %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-apache-bsf.jar %{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar -%{_sysconfdir}/%{name}.d/apache-bsf +%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bsf-1.6.5.jar.* %endif +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %files apache-resolver %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-apache-resolver.jar %{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar -%{_sysconfdir}/%{name}.d/apache-resolver +%config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-resolver-1.6.5.jar.* %endif +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %files commons-logging %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-commons-logging.jar %{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar -%{_sysconfdir}/%{name}.d/commons-logging +%config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-logging-1.6.5.jar.* %endif +%endif # Disable as we dont ship the dependencies %if 0 +%if ! %{bootstrap1} && ! %{bootstrap2} %files commons-net %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-commons-net.jar %{_javadir}/%{name}/%{name}-commons-net-%{version}.jar -%{_sysconfdir}/%{name}.d/commons-net +%config(noreplace) %{_sysconfdir}/%{name}.d/commons-net %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-net-1.6.5.jar.* %endif +%endif %files jai %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-jai.jar %{_javadir}/%{name}/%{name}-jai-%{version}.jar -%{_sysconfdir}/%{name}.d/jai +%config(noreplace) %{_sysconfdir}/%{name}.d/jai %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} @@ -1142,71 +1213,82 @@ fi %endif %endif +%if ! %{bootstrap1} && ! %{bootstrap2} %files apache-bcel %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-apache-bcel.jar %{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar %{_javadir}/%{name}/%{name}-jakarta-bcel.jar -%{_sysconfdir}/%{name}.d/apache-bcel +%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bcel-1.6.5.jar.* %endif +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %files apache-log4j %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-apache-log4j.jar %{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar %{_javadir}/%{name}/%{name}-jakarta-log4j.jar -%{_sysconfdir}/%{name}.d/apache-log4j +%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-log4j-1.6.5.jar.* %endif +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %files apache-oro %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-apache-oro.jar %{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar %{_javadir}/%{name}/%{name}-jakarta-oro.jar -%{_sysconfdir}/%{name}.d/apache-oro +%config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro %{ant_home}/etc/maudit-frames.xsl %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-oro-1.6.5.jar.* %endif +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %files apache-regexp %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-apache-regexp.jar %{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar %{_javadir}/%{name}/%{name}-jakarta-regexp.jar -%{_sysconfdir}/%{name}.d/apache-regexp +%config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-1.6.5.jar.* %endif +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %files javamail %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-javamail.jar %{_javadir}/%{name}/%{name}-javamail-%{version}.jar -%{_sysconfdir}/%{name}.d/javamail +%config(noreplace) %{_sysconfdir}/%{name}.d/javamail %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-javamail-1.6.5.jar.* %endif +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %files jdepend %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-jdepend.jar %{_javadir}/%{name}/%{name}-jdepend-%{version}.jar -%{_sysconfdir}/%{name}.d/jdepend +%config(noreplace) %{_sysconfdir}/%{name}.d/jdepend %{ant_home}/etc/jdepend.xsl %{ant_home}/etc/jdepend-frames.xsl @@ -1214,34 +1296,38 @@ fi %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jdepend-1.6.5.jar.* %endif +%endif %files jmf %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-jmf.jar %{_javadir}/%{name}/%{name}-jmf-%{version}.jar -%{_sysconfdir}/%{name}.d/jmf +%config(noreplace) %{_sysconfdir}/%{name}.d/jmf %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jmf-1.6.5.jar.* %endif +%if ! %{bootstrap1} && ! %{bootstrap2} %files jsch %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-jsch.jar %{_javadir}/%{name}/%{name}-jsch-%{version}.jar -%{_sysconfdir}/%{name}.d/jsch +%config(noreplace) %{_sysconfdir}/%{name}.d/jsch %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jsch-1.6.5.jar.* %endif +%endif +%if ! %{bootstrap1} && ! %{bootstrap2} %files junit %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-junit.jar %{_javadir}/%{name}/%{name}-junit-%{version}.jar -%{_sysconfdir}/%{name}.d/junit +%config(noreplace) %{_sysconfdir}/%{name}.d/junit %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl @@ -1249,12 +1335,13 @@ fi %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-junit-1.6.5.jar.* %endif +%endif %files nodeps %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-nodeps.jar %{_javadir}/%{name}/%{name}-nodeps-%{version}.jar -%{_sysconfdir}/%{name}.d/nodeps +%config(noreplace) %{_sysconfdir}/%{name}.d/nodeps %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} @@ -1265,7 +1352,7 @@ fi %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-swing.jar %{_javadir}/%{name}/%{name}-swing-%{version}.jar -%{_sysconfdir}/%{name}.d/swing +%config(noreplace) %{_sysconfdir}/%{name}.d/swing %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} @@ -1276,7 +1363,7 @@ fi %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-trax.jar %{_javadir}/%{name}/%{name}-trax-%{version}.jar -%{_sysconfdir}/%{name}.d/trax +%config(noreplace) %{_sysconfdir}/%{name}.d/trax %{ant_home}/etc/mmetrics-frames.xsl %{ant_home}/etc/coverage-frames.xsl @@ -1301,12 +1388,25 @@ fi # ----------------------------------------------------------------------------- %changelog +* Fri Mar 16 2007 Permaine Cheung 1.6.5-4jpp.1 +- Merge with upstream, get rid of the endorsed patch + * Tue Feb 20 2007 Permaine Cheung 1.6.5-2jpp.3 - Add endorsed dir and create symlinks for xml-commons-apis and jaxp_parser_impl there, and add the option when running ant. - Add missing BR - Fix some rpmlint issues +* Fri Feb 09 2007 Ralph Apel - 0:1.6.5-4jpp +- Must skip release 3 because Youri::Bugzilla::_add_version doesn't + distinguish between JPP-1.6 and JPP-1.7 and we have 1.6.5-3 in 1.6 + +* Fri Feb 09 2007 Ralph Apel - 0:1.6.5-3jpp +- Added option "bootstrap1" for building core while no jaxp_parser_impl + nor xml-commons-apis available +- Added option "bootstrap2" for building core when some jaxp_parser_impl + and xml-commons-apis available + * Wed Aug 30 2006 Deepak Bhole 1.6.5-2jpp.2 - Re-enabling style and xmlvalidate task on ppc64 and s390x. diff --git a/sources b/sources index b9f802e..158c98d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ae039c49baae1d3568e54ab83dea8d9 apache-ant-1.6.5-RHCLEAN.src.tar.bz2 +b1a692367b4ef4d08833c434b4863ae9 apache-ant-1.6.5-src.tar.gz