From 760460b66b42a5cca46c87f0dcf88beafd4cfa08 Mon Sep 17 00:00:00 2001 From: Deepak Bhole Date: Fri, 11 Aug 2006 23:01:45 +0000 Subject: [PATCH] - Added conditional native compilation - Add missing requirements - Synch with JPackage spec --- ant.spec | 854 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 694 insertions(+), 160 deletions(-) diff --git a/ant.spec b/ant.spec index c791308..827ab3f 100644 --- a/ant.spec +++ b/ant.spec @@ -1,11 +1,45 @@ +# Copyright (c) 2000-2005, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +%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}}} + %define ant_home %{_datadir}/ant %define section free -%define jpprelease 1jpp +%define major_version 1.6 +%define jpprelease 2jpp Name: ant Version: 1.6.5 -Release: %{jpprelease}_11fc +Release: %{jpprelease}.1 Epoch: 0 Summary: Ant build tool for java Summary(it): Tool per la compilazione di programmi java @@ -21,16 +55,22 @@ Patch1: apache-ant-1.6.5-rpm.patch # https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008785.html # Message-ID: <432A8E37.8050101@zarb.org> Patch2: apache-ant-1.6.5-javah.patch +# Fix some places where copies of classes are included in the wrong jarfiles Patch4: apache-ant-jars.patch Patch5: apache-ant-bz163689.patch Patch6: apache-ant-1.6.5-jvm1.5-detect.patch Requires: jaxp_parser_impl Requires: jpackage-utils >= 0:1.5 Requires: java-devel +Requires: xml-commons-apis BuildRequires: jaxp_parser_impl BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: java-devel BuildRequires: coreutils +BuildRequires: xml-commons-apis +%if ! %{gcj_support} +BuildArch: noarch +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Obsoletes: ant-optional ant-optional-full # Allow subpackages not in Fedora to be installed from JPackage @@ -39,10 +79,12 @@ Provides: %{name} = %{epoch}:%{version}-%{jpprelease} Obsoletes: %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2 # FC4 Obsoletes: %{name}-jmf <= 1.6.2-3jpp_12fc -# libgcj aot-compiled native libraries -BuildRequires: java-gcj-compat-devel >= 1.0.31 -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description Ant is a platform-independent build tool for java. It's used by apache @@ -58,6 +100,28 @@ compilazione di programmi java. Allo stato attuale viene utilizzato dai progetti apache jakarta ed apache xml. +%package manifest-only +Summary: Manifest-only jars for %{name} +Group: Development/Build Tools +Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: %{name}-icontract = %{epoch}:%{version}-%{release} +Provides: %{name}-netrexx = %{epoch}:%{version}-%{release} +Provides: %{name}-starteam = %{epoch}:%{version}-%{release} +Provides: %{name}-stylebook = %{epoch}:%{version}-%{release} +Provides: %{name}-vaj = %{epoch}:%{version}-%{release} +Provides: %{name}-weblogic = %{epoch}:%{version}-%{release} +Provides: %{name}-xalan1 = %{epoch}:%{version}-%{release} +Provides: %{name}-xslp = %{epoch}:%{version}-%{release} + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif + +%description manifest-only +Manifest-only jars for %{name}. + %package antlr Summary: Optional antlr tasks for %{name} Group: Development/Build Tools @@ -66,8 +130,12 @@ Requires: antlr BuildRequires: antlr Provides: ant-antlr = %{epoch}:%{version}-%{release} Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description antlr Optional antlr tasks for %{name}. @@ -83,8 +151,12 @@ Requires: bsf BuildRequires: bsf Provides: ant-apache-bsf = %{epoch}:%{version}-%{release} Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description apache-bsf Optional apache bsf tasks for %{name}. @@ -100,8 +172,12 @@ Requires: xml-commons-resolver BuildRequires: xml-commons-resolver Provides: ant-apache-resolver = %{epoch}:%{version}-%{release} Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description apache-resolver Optional apache resolver tasks for %{name}. @@ -117,8 +193,12 @@ Requires: jakarta-commons-logging BuildRequires: jakarta-commons-logging Provides: ant-commons-logging = %{epoch}:%{version}-%{release} Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description commons-logging Optional commons logging tasks for %{name}. @@ -126,6 +206,51 @@ Optional commons logging tasks for %{name}. %description commons-logging -l fr Taches commons logging optionelles pour %{name}. +# Disable because we don't ship the dependencies +%if 0 +%package commons-net +Summary: Optional commons net tasks for %{name} +Group: Development/Build Tools +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: jakarta-commons-net +BuildRequires: jakarta-commons-net +Provides: ant-commons-net = %{epoch}:%{version}-%{release} +Conflicts: ant-optional-clean, ant-optional-full + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif + +%description commons-net +Optional commons net tasks for %{name}. + +%description commons-net -l fr +Taches commons net optionelles pour %{name}. + +%package jai +Summary: Optional jai tasks for %{name} +Group: Development/Build Tools +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: jai +BuildRequires: jai +Provides: ant-jai = %{epoch}:%{version}-%{release} +Conflicts: ant-optional-clean, ant-optional-full + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif + +%description jai +Optional jai tasks for %{name}. + +%description jai -l fr +Taches jai optionelles pour %{name}. +%endif + %package apache-bcel Summary: Optional apache bcel tasks for %{name} Group: Development/Build Tools @@ -136,8 +261,12 @@ Provides: ant-apache-bcel = %{epoch}:%{version}-%{release} Provides: ant-jakarta-bcel = %{epoch}:%{version}-%{release} Obsoletes: ant-jakarta-bcel Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description apache-bcel Optional apache bcel tasks for %{name}. @@ -155,8 +284,12 @@ Provides: ant-apache-log4j = %{epoch}:%{version}-%{release} Provides: ant-jakarta-log4j = %{epoch}:%{version}-%{release} Obsoletes: ant-jakarta-log4j Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description apache-log4j Optional apache log4j tasks for %{name}. @@ -174,8 +307,12 @@ Provides: ant-apache-oro = %{epoch}:%{version}-%{release} Provides: ant-jakarta-oro = %{epoch}:%{version}-%{release} Obsoletes: ant-jakarta-oro Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description apache-oro Optional apache oro tasks for %{name}. @@ -193,8 +330,12 @@ Provides: ant-apache-regexp = %{epoch}:%{version}-%{release} Provides: ant-jakarta-regexp = %{epoch}:%{version}-%{release} Obsoletes: ant-jakarta-regexp Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description apache-regexp Optional apache regexp tasks for %{name}. @@ -212,8 +353,12 @@ BuildRequires: javamail >= 0:1.2-5jpp BuildRequires: jaf >= 0:1.0.1-5jpp Provides: ant-javamail = %{epoch}:%{version}-%{release} Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description javamail Optional javamail tasks for %{name}. @@ -229,8 +374,12 @@ Requires: jdepend BuildRequires: jdepend Provides: ant-jdepend = %{epoch}:%{version}-%{release} Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description jdepend Optional jdepend tasks for %{name}. @@ -238,6 +387,25 @@ Optional jdepend tasks for %{name}. %description jdepend -l fr Taches jdepend optionelles pour %{name}. +%package jmf +Summary: Optional jmf tasks for %{name} +Group: Development/Build Tools +Requires: %{name} = %{epoch}:%{version}-%{release} +Provides: ant-jmf = %{epoch}:%{version}-%{release} +Conflicts: ant-optional-clean, ant-optional-full + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif + +%description jmf +Optional jmf tasks for %{name}. + +%description jmf -l fr +Taches jmf optionelles pour %{name}. + %package jsch Summary: Optional jsch tasks for %{name} Group: Development/Build Tools @@ -246,8 +414,12 @@ Requires: jsch BuildRequires: jsch Provides: ant-jsch = %{epoch}:%{version}-%{release} Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description jsch Optional jsch tasks for %{name}. @@ -263,8 +435,12 @@ Requires: junit BuildRequires: junit Provides: ant-junit = %{epoch}:%{version}-%{release} Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description junit Optional junit tasks for %{name}. @@ -278,8 +454,12 @@ Group: Development/Build Tools Requires: %{name} = %{epoch}:%{version}-%{release} Provides: ant-nodeps = %{epoch}:%{version}-%{release} Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description nodeps Optional tasks for %{name}. @@ -293,8 +473,12 @@ Group: Development/Build Tools Requires: %{name} = %{epoch}:%{version}-%{release} Provides: ant-swing = %{epoch}:%{version}-%{release} Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description swing Optional swing tasks for %{name}. @@ -311,8 +495,12 @@ Provides: ant-trax = %{epoch}:%{version}-%{release} # The ant-xalan jar has been merged into the ant-trax one Obsoletes: ant-xalan2 Conflicts: ant-optional-clean, ant-optional-full -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 + +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif %description trax Optional trax tasks for %{name}. @@ -350,7 +538,8 @@ Documentation pour %{name}. %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Prereq: coreutils +Requires(post): /bin/rm,/bin/ln +Requires(postun): /bin/rm %description javadoc Javadoc for %{name}. @@ -386,7 +575,8 @@ find . -name "*.jar" -exec rm -f {} \; %build # classpath selects optional components to build -export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jai/jai_codec jai/jai_core jsch bsf xml-commons-resolver) +#export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jai/jai_codec jai/jai_core jsch bsf xml-commons-resolver) +export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging jsch bsf xml-commons-resolver) # perform bootstrap and build without jjp or user configs, # (except JAVA_HOME as required by build script) @@ -413,10 +603,20 @@ cp -p build/lib/%{name}-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launcher # optional jars mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name} +cp -p build/lib/%{name}-icontract.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-icontract-%{version}.jar +cp -p build/lib/%{name}-netrexx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-netrexx-%{version}.jar +cp -p build/lib/%{name}-starteam.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-starteam-%{version}.jar +cp -p build/lib/%{name}-stylebook.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-stylebook-%{version}.jar +cp -p build/lib/%{name}-vaj.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-vaj-%{version}.jar +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 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 cp -p build/lib/%{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar 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 @@ -427,6 +627,7 @@ ln -sf %{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta ln -sf %{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-regexp.jar cp -p build/lib/%{name}-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar cp -p build/lib/%{name}-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar +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 cp -p build/lib/%{name}-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar @@ -458,12 +659,15 @@ 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 echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro echo "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 "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps @@ -477,117 +681,17 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} # fix link between manual and javadoc (cd docs/manual; ln -sf %{_javadocdir}/%{name}-%{version} api) -aot-compile-rpm - # ----------------------------------------------------------------------------- +%if %{gcj_support} +%{_bindir}/aot-compile-rpm +%endif + %clean rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- -%pre -rm -f %{_javadir}/ant.jar -rm -f %{_javadir}/ant-optional.jar - -# ----------------------------------------------------------------------------- - -%post -%{_bindir}/rebuild-gcj-db - -%postun -%{_bindir}/rebuild-gcj-db - -%post antlr -%{_bindir}/rebuild-gcj-db - -%postun antlr -%{_bindir}/rebuild-gcj-db - -%post apache-bsf -%{_bindir}/rebuild-gcj-db - -%postun apache-bsf -%{_bindir}/rebuild-gcj-db - -%post apache-resolver -%{_bindir}/rebuild-gcj-db - -%postun apache-resolver -%{_bindir}/rebuild-gcj-db - -%post commons-logging -%{_bindir}/rebuild-gcj-db - -%postun commons-logging -%{_bindir}/rebuild-gcj-db - -%post apache-bcel -%{_bindir}/rebuild-gcj-db - -%postun apache-bcel -%{_bindir}/rebuild-gcj-db - -%post apache-log4j -%{_bindir}/rebuild-gcj-db - -%postun apache-log4j -%{_bindir}/rebuild-gcj-db - -%post apache-oro -%{_bindir}/rebuild-gcj-db - -%postun apache-oro -%{_bindir}/rebuild-gcj-db - -%post apache-regexp -%{_bindir}/rebuild-gcj-db - -%postun apache-regexp -%{_bindir}/rebuild-gcj-db - -%post javamail -%{_bindir}/rebuild-gcj-db - -%postun javamail -%{_bindir}/rebuild-gcj-db - -%post jdepend -%{_bindir}/rebuild-gcj-db - -%postun jdepend -%{_bindir}/rebuild-gcj-db - -%post jsch -%{_bindir}/rebuild-gcj-db - -%postun jsch -%{_bindir}/rebuild-gcj-db - -%post junit -%{_bindir}/rebuild-gcj-db - -%postun junit -%{_bindir}/rebuild-gcj-db - -%post nodeps -%{_bindir}/rebuild-gcj-db - -%postun nodeps -%{_bindir}/rebuild-gcj-db - -%post swing -%{_bindir}/rebuild-gcj-db - -%postun swing -%{_bindir}/rebuild-gcj-db - -%post trax -%{_bindir}/rebuild-gcj-db - -%postun trax -%{_bindir}/rebuild-gcj-db - %post javadoc rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} @@ -599,6 +703,313 @@ fi # ----------------------------------------------------------------------------- +%if %{gcj_support} +%post +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +# We do not ship dependencies for these, so they are disabled. +%if 0 +%if %{gcj_support} +%post commons-net +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun commons-net +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post jai +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun jai +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif +%endif + +%if %{gcj_support} +%post antlr +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun antlr +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post apache-bcel +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun apache-bcel +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post jmf +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun jmf +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post trax +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun trax +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post apache-log4j +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun apache-log4j +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post swing +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun swing +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post nodeps +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun nodeps +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post apache-regexp +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun apache-regexp +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post apache-resolver +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun apache-resolver +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post junit +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun junit +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post apache-oro +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun apache-oro +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post javamail +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun javamail +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post commons-logging +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun commons-logging +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post jdepend +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun jdepend +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post jsch +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun jsch +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%post apache-bsf +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%if %{gcj_support} +%postun apache-bsf +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + %files %defattr(0644,root,root,0755) %doc KEYS LICENSE NOTICE README WHATSNEW @@ -619,37 +1030,100 @@ fi %{ant_home}/etc/junit-frames-xalan1.xsl %dir %{ant_home}/lib %dir %{_sysconfdir}/%{name}.d -%dir %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-launcher-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-1.6.5.jar.* +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-launcher-1.6.5.jar.* +%endif + +%files manifest-only +%defattr(0644,root,root,0755) +%{_javadir}/%{name}/ant-icontract-%{version}.jar +%{_javadir}/%{name}/ant-icontract.jar +%{_javadir}/%{name}/ant-netrexx-%{version}.jar +%{_javadir}/%{name}/ant-netrexx.jar +%{_javadir}/%{name}/ant-starteam-%{version}.jar +%{_javadir}/%{name}/ant-starteam.jar +%{_javadir}/%{name}/ant-stylebook-%{version}.jar +%{_javadir}/%{name}/ant-stylebook.jar +%{_javadir}/%{name}/ant-vaj-%{version}.jar +%{_javadir}/%{name}/ant-vaj.jar +%{_javadir}/%{name}/ant-weblogic-%{version}.jar +%{_javadir}/%{name}/ant-weblogic.jar +%{_javadir}/%{name}/ant-xalan1-%{version}.jar +%{_javadir}/%{name}/ant-xalan1.jar +%{_javadir}/%{name}/ant-xslp-%{version}.jar +%{_javadir}/%{name}/ant-xslp.jar %files antlr %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-antlr.jar %{_javadir}/%{name}/%{name}-antlr-%{version}.jar %{_sysconfdir}/%{name}.d/antlr -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-antlr-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-antlr-1.6.5.jar.* +%endif %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 -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-apache-bsf-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bsf-1.6.5.jar.* +%endif %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 -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*-resolver-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-resolver-1.6.5.jar.* +%endif %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 -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*-logging-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-logging-1.6.5.jar.* +%endif + +# Disable as we dont ship the dependencies +%if 0 +%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 + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-net-1.6.5.jar.* +%endif + +%files jai +%defattr(0644,root,root,0755) +%{_javadir}/%{name}/%{name}-jai.jar +%{_javadir}/%{name}/%{name}-jai-%{version}.jar +%{_sysconfdir}/%{name}.d/jai + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jai-1.6.5.jar.* +%endif +%endif %files apache-bcel %defattr(0644,root,root,0755) @@ -657,7 +1131,11 @@ fi %{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar %{_javadir}/%{name}/%{name}-jakarta-bcel.jar %{_sysconfdir}/%{name}.d/apache-bcel -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-apache-bcel-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bcel-1.6.5.jar.* +%endif %files apache-log4j %defattr(0644,root,root,0755) @@ -665,7 +1143,11 @@ fi %{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar %{_javadir}/%{name}/%{name}-jakarta-log4j.jar %{_sysconfdir}/%{name}.d/apache-log4j -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-apache-log4j-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-log4j-1.6.5.jar.* +%endif %files apache-oro %defattr(0644,root,root,0755) @@ -674,7 +1156,11 @@ fi %{_javadir}/%{name}/%{name}-jakarta-oro.jar %{_sysconfdir}/%{name}.d/apache-oro %{ant_home}/etc/maudit-frames.xsl -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-apache-oro-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-oro-1.6.5.jar.* +%endif %files apache-regexp %defattr(0644,root,root,0755) @@ -682,14 +1168,22 @@ fi %{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar %{_javadir}/%{name}/%{name}-jakarta-regexp.jar %{_sysconfdir}/%{name}.d/apache-regexp -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*-regexp-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-1.6.5.jar.* +%endif %files javamail %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-javamail.jar %{_javadir}/%{name}/%{name}-javamail-%{version}.jar %{_sysconfdir}/%{name}.d/javamail -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-javamail-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-javamail-1.6.5.jar.* +%endif %files jdepend %defattr(0644,root,root,0755) @@ -698,14 +1192,33 @@ fi %{_sysconfdir}/%{name}.d/jdepend %{ant_home}/etc/jdepend.xsl %{ant_home}/etc/jdepend-frames.xsl -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jdepend-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jdepend-1.6.5.jar.* +%endif + +%files jmf +%defattr(0644,root,root,0755) +%{_javadir}/%{name}/%{name}-jmf.jar +%{_javadir}/%{name}/%{name}-jmf-%{version}.jar +%{_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 %files jsch %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-jsch.jar %{_javadir}/%{name}/%{name}-jsch-%{version}.jar %{_sysconfdir}/%{name}.d/jsch -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jsch-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jsch-1.6.5.jar.* +%endif %files junit %defattr(0644,root,root,0755) @@ -714,21 +1227,33 @@ fi %{_sysconfdir}/%{name}.d/junit %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-junit-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-junit-1.6.5.jar.* +%endif %files nodeps %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-nodeps.jar %{_javadir}/%{name}/%{name}-nodeps-%{version}.jar %{_sysconfdir}/%{name}.d/nodeps -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-nodeps-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-nodeps-1.6.5.jar.* +%endif %files swing %defattr(0644,root,root,0755) %{_javadir}/%{name}/%{name}-swing.jar %{_javadir}/%{name}/%{name}-swing-%{version}.jar %{_sysconfdir}/%{name}.d/swing -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-swing-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-swing-1.6.5.jar.* +%endif %files trax %defattr(0644,root,root,0755) @@ -737,7 +1262,11 @@ fi %{_sysconfdir}/%{name}.d/trax %{ant_home}/etc/mmetrics-frames.xsl %{ant_home}/etc/coverage-frames.xsl -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-trax-%{version}.jar.* + +%if %{gcj_support} +%attr(-,root,root) %dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-trax-1.6.5.jar.* +%endif %files scripts %defattr(0755,root,root,0755) @@ -755,6 +1284,11 @@ fi # ----------------------------------------------------------------------------- %changelog +* Fri Aug 11 2006 Deepak Bhole - 0:1.6.5-2jpp.1 +- Added conditional native compilation +- Add missing requirements +- Synch with JPackage spec + * Sat Jul 22 2006 Jakub Jelinek - 0:1.6.5-1jpp_11fc - Rebuilt