- don't use export and assignment on same line, subprocess exit code is lost this way

[packages/ant.git] / ant.spec

diff --git a/ant.spec b/ant.spec
index cefcc09cae787ff787cbf4faa547c08f409ad677..9f33c1c516f557ad5d40ebfa3539e013d2e3fa99 100644 (file)
--- a/ant.spec
+++ b/ant.spec
@@ -1,9 +1,13 @@
 # TODO
 # - prepare all BR and test the full build
-#   (TODO: stylebook, starteam, jai, jdepend, weblogic)
+#   TODO:
+#   - stylebook: http://svn.apache.org/viewcvs.cgi/xml/stylebook/
+#   - starteam: http://www.borland.com/downloads/download_starteam.html (30-day trial, needs registration)
+#   - weblogic: http://www.bea.com/ ? (needs registration)
 #
 # Conditional build:
 %bcond_with    bootstrap       # minimal build for bootstrap
+%bcond_with    nonfree         # build tasks with non-distributable dependencies
 %bcond_without antlr           # disable building antlr optional task(s)
 %bcond_without apache_bcel     # disable building apache-bcel optional task(s)
 %bcond_without apache_bsf      # disable building apache-bsf optional task(s)
@@ -13,13 +17,16 @@
 %bcond_without apache_resolver # disable building apache-resolver optional task(s)
 %bcond_without commons_logging # disable building commons-logging optional task(s)
 %bcond_without commons_net     # disable building commons-net optional task(s)
-%bcond_with    jai             # enable building jai optional task(s)
+%bcond_without jai             # disable building jai optional task(s)
 %bcond_without javamail        # disable building javamail optional task(s)
-%bcond_with    jdepend         # enable building jdepend optional task(s)
+%bcond_without jdepend         # disable building jdepend optional task(s)
 %bcond_without jsch            # disable building jsch optional task(s)
 %bcond_without junit           # disable building junit optional task(s)
 %bcond_without netrexx         # disable building netrexx optional taks(s)
 #
+%if %{without nonfree}
+%undefine      with_jai
+%endif
 %if %{with bootstrap}
 %undefine      with_antlr
 %undefine      with_apache_bcel
@@ -30,30 +37,36 @@
 %undefine      with_apache_resolver
 %undefine      with_commons_logging
 %undefine      with_commons_net
+%undefine      with_jai
 %undefine      with_javamail
+%undefine      with_jdepend
 %undefine      with_jsch
 %undefine      with_netrexx
 %endif
 #
-%define                _rel    0.1
+%define                _rel    4
 Summary:       Ant build tool for Java
-Summary(fr.UTF-8):   Outil de compilation pour java
-Summary(it.UTF-8):   Tool per la compilazione di programmi java
-Summary(pl.UTF-8):   Ant - narzędzie do budowania w Javie
+Summary(fr.UTF-8):     Outil de compilation pour java
+Summary(it.UTF-8):     Tool per la compilazione di programmi java
+Summary(pl.UTF-8):     Ant - narzędzie do budowania w Javie
 Name:          ant
-Version:       1.7.0
-Release:       %{?with_bootstrap:bootstrap.}%{_rel}
+Version:       1.7.1
+Release:       %{_rel}%{?with_bootstrap:.bootstrap}
 License:       Apache
 Group:         Development/Languages/Java
 Source0:       http://www.apache.org/dist/ant/source/apache-%{name}-%{version}-src.tar.bz2
-# Source0-md5: 22b378e27ab300e4d73bf09d91c7e2a6
+# Source0-md5: 0d68db4a1ada5c91bcbf53cefd0c2fd7
 Source1:       %{name}.conf
 Patch0:                %{name}-antRun.patch
+# patch1 has been applied to ant sources in svn. It won't be needed for the
+# next release of ant.
+Patch1:                %{name}-gcjtask.patch
 URL:           http://ant.apache.org/
 %{?with_antlr:BuildRequires:   antlr}
 %{?with_apache_bsf:BuildRequires:      beanshell}
 %{?with_apache_bsf:BuildRequires:      bsf}
 %{?with_javamail:BuildRequires:        jaf}
+%{?with_jai:BuildRequires:     jai}
 %{?with_apache_bcel:BuildRequires:     jakarta-bcel}
 %{?with_commons_logging:BuildRequires: jakarta-commons-logging}
 %{?with_commons_net:BuildRequires:     jakarta-commons-net}
@@ -61,6 +74,7 @@ URL:          http://ant.apache.org/
 %{?with_apache_regexp:BuildRequires:   jakarta-regexp}
 %{?with_javamail:BuildRequires:        javamail}
 BuildRequires: jaxp_parser_impl
+%{?with_jdepend:BuildRequires: jdepend}
 BuildRequires: jdk
 BuildRequires: jpackage-utils
 %{?with_jsch:BuildRequires:    jsch >= 0.1.21}
@@ -70,6 +84,7 @@ BuildRequires:        jpackage-utils
 %{?with_netrexx:BuildRequires: netrexx}
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.300
+%{?with_apache_resolver:BuildRequires: xml-commons-resolver}
 Requires:      jdk
 Requires:      jpackage-utils
 Obsoletes:     jakarta-ant
@@ -98,8 +113,8 @@ używany przez projekty apache jakarta i xml.
 
 %package antlr
 Summary:       Optional antlr tasks for %{name}
-Summary(fr.UTF-8):   Taches antlr optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania antlr dla anta
+Summary(fr.UTF-8):     Taches antlr optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania antlr dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      antlr
@@ -117,8 +132,8 @@ Opcjonalne zadania antlr dla anta.
 
 %package apache-bcel
 Summary:       Optional apache bcel tasks for %{name}
-Summary(fr.UTF-8):   Taches apache bcel optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania apache bcel dla anta
+Summary(fr.UTF-8):     Taches apache bcel optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania apache bcel dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      jakarta-bcel
@@ -138,8 +153,8 @@ Opcjonalne zadania apache bcel dla anta.
 
 %package apache-bsf
 Summary:       Optional apache bsf tasks for %{name}
-Summary(fr.UTF-8):   Taches apache bsf optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania apache bsf dla anta
+Summary(fr.UTF-8):     Taches apache bsf optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania apache bsf dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      bsf
@@ -157,8 +172,8 @@ Opcjonalne zadania apache bsf dla anta.
 
 %package apache-log4j
 Summary:       Optional apache log4j tasks for %{name}
-Summary(fr.UTF-8):   Taches apache log4j optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania apache log4j dla anta
+Summary(fr.UTF-8):     Taches apache log4j optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania apache log4j dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      logging-log4j >= 1.2
@@ -178,8 +193,8 @@ Opcjonalne zadania apache log4j dla anta.
 
 %package apache-oro
 Summary:       Optional apache oro tasks for %{name}
-Summary(fr.UTF-8):   Taches apache oro optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania apache oro dla anta
+Summary(fr.UTF-8):     Taches apache oro optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania apache oro dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      jakarta-oro
@@ -199,8 +214,8 @@ Opcjonalne zadania apache oro dla anta.
 
 %package apache-regexp
 Summary:       Optional apache regexp tasks for %{name}
-Summary(fr.UTF-8):   Taches apache regexp optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania apache regexp dla anta
+Summary(fr.UTF-8):     Taches apache regexp optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania apache regexp dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      jakarta-regexp
@@ -219,8 +234,8 @@ Opcjonalne zadania apache regexp dla anta.
 
 %package apache-resolver
 Summary:       Optional apache resolver tasks for %{name}
-Summary(fr.UTF-8):   Taches apache resolver optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania apache resolver dla anta
+Summary(fr.UTF-8):     Taches apache resolver optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania apache resolver dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      xml-commons-resolver
@@ -236,8 +251,8 @@ Taches apache resolver optionelles pour %{name}.
 
 %package commons-logging
 Summary:       Optional commons logging tasks for %{name}
-Summary(fr.UTF-8):   Taches commons logging optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania commons logging dla anta
+Summary(fr.UTF-8):     Taches commons logging optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania commons logging dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      jakarta-commons-logging
@@ -255,8 +270,8 @@ Opcjonalne zadania commons logging dla anta.
 
 %package commons-net
 Summary:       Optional commons net tasks for %{name}
-Summary(fr.UTF-8):   Taches commons net optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania commons net dla anta
+Summary(fr.UTF-8):     Taches commons net optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania commons net dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      jakarta-commons-net
@@ -274,8 +289,8 @@ Opcjonalne zadania commons net dla anta.
 
 %package jai
 Summary:       Optional jai tasks for %{name}
-Summary(fr.UTF-8):   Taches jai optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania jai dla anta
+Summary(fr.UTF-8):     Taches jai optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania jai dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      jai
@@ -293,8 +308,8 @@ Opcjonalne zadania jai dla anta.
 
 %package javamail
 Summary:       Optional javamail tasks for %{name}
-Summary(fr.UTF-8):   Taches javamail optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania javamail dla anta
+Summary(fr.UTF-8):     Taches javamail optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania javamail dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      jaf
@@ -313,8 +328,8 @@ Opcjonalne zadania javamail dla anta.
 
 %package jdepend
 Summary:       Optional jdepend tasks for %{name}
-Summary(fr.UTF-8):   Taches jdepend optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania jdepend dla anta
+Summary(fr.UTF-8):     Taches jdepend optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania jdepend dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      jdepend
@@ -332,8 +347,8 @@ Opcjonalne zadania jdepend dla anta.
 
 %package jmf
 Summary:       Optional jmf tasks for %{name}
-Summary(fr.UTF-8):   Taches jmf optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania jmf dla anta
+Summary(fr.UTF-8):     Taches jmf optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania jmf dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Conflicts:     ant-optional-clean
@@ -350,8 +365,8 @@ Opcjonalne zadania jmf dla anta.
 
 %package jsch
 Summary:       Optional jsch tasks for %{name}
-Summary(fr.UTF-8):   Taches jsch optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania jsch dla anta
+Summary(fr.UTF-8):     Taches jsch optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania jsch dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      jsch >= 0.1.21
@@ -369,8 +384,8 @@ Opcjonalne zadania jsch dla anta.
 
 %package junit
 Summary:       Optional junit tasks for %{name}
-Summary(fr.UTF-8):   Taches junit optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania junit dla anta
+Summary(fr.UTF-8):     Taches junit optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania junit dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      junit
@@ -388,8 +403,8 @@ Opcjonalne zadania junit dla anta.
 
 %package netrexx
 Summary:       Optional netrexx tasks for %{name}
-Summary(fr.UTF-8):   Taches netrexx optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania netrexx dla anta
+Summary(fr.UTF-8):     Taches netrexx optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania netrexx dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Conflicts:     ant-optional-clean
@@ -406,8 +421,8 @@ Opcjonalne zadania netrexx dla anta.
 
 %package nodeps
 Summary:       Optional tasks for %{name}
-Summary(fr.UTF-8):   Taches optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania dla anta
+Summary(fr.UTF-8):     Taches optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Conflicts:     ant-optional-clean
@@ -424,8 +439,8 @@ Opcjonalne zadania dla anta.
 
 %package swing
 Summary:       Optional swing tasks for %{name}
-Summary(fr.UTF-8):   Taches swing optionelles pour %{name}
-Summary(pl.UTF-8):   Opcjonalne zadania swing dla anta
+Summary(fr.UTF-8):     Taches swing optionelles pour %{name}
+Summary(pl.UTF-8):     Opcjonalne zadania swing dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Conflicts:     ant-optional-clean
@@ -442,8 +457,8 @@ Opcjonalne zadania swing dla anta.
 
 %package trax
 Summary:       Optional trax tasks for %{name}
-Summary(fr.UTF-8):   Taches trax optionelles pour %{name}
-Summary(pl.UTF-8):   Dodatkowe zadania trax dla anta
+Summary(fr.UTF-8):     Taches trax optionelles pour %{name}
+Summary(pl.UTF-8):     Dodatkowe zadania trax dla anta
 Group:         Development/Languages/Java
 Requires:      %{name} = %{version}-%{release}
 Requires:      jaxp_transform_impl
@@ -463,8 +478,8 @@ Dodatkowe zadania trax dla anta.
 
 %package scripts
 Summary:       Additional scripts for %{name}
-Summary(fr.UTF-8):   Scripts additionels pour %{name}
-Summary(pl.UTF-8):   Dodatkowe skrypty dla anta
+Summary(fr.UTF-8):     Scripts additionels pour %{name}
+Summary(pl.UTF-8):     Dodatkowe skrypty dla anta
 Group:         Development/Languages/Java
 AutoReqProv:   no
 Requires:      %{name} = %{version}-%{release}
@@ -482,9 +497,9 @@ Dodatkowe skrypty dla anta.
 
 %package doc
 Summary:       Manual for %{name}
-Summary(fr.UTF-8):   Documentation pour %{name}
-Summary(it.UTF-8):   Documentazione di %{name}
-Summary(pl.UTF-8):   Podręcznik dla anta
+Summary(fr.UTF-8):     Documentation pour %{name}
+Summary(it.UTF-8):     Documentazione di %{name}
+Summary(pl.UTF-8):     Podręcznik dla anta
 Group:         Development/Languages/Java
 
 %description doc
@@ -501,7 +516,7 @@ Dokumentacja do anta.
 
 %package javadoc
 Summary:       Online manual for ant
-Summary(pl.UTF-8):   Dokumentacja online do ant
+Summary(pl.UTF-8):     Dokumentacja online do ant
 Group:         Documentation
 Requires:      jpackage-utils
 Obsoletes:     jakarta-ant-doc
@@ -518,6 +533,7 @@ jakarta i xml.
 %prep
 %setup -q -n apache-%{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 # clean jar files
 find . -name "*.jar" -exec rm -f {} \;
@@ -526,6 +542,9 @@ sed -i -e 's|@BINDIR@|%{_bindir}|g' \
        src/main/org/apache/tools/ant/taskdefs/Exec.java \
        src/main/org/apache/tools/ant/taskdefs/Execute.java
 
+# fix link between manual and javadoc
+ln -sf %{_javadocdir}/%{name}-%{version} docs/manual/api
+
 %build
 export JAVA_HOME="%{java_home}"
 
@@ -536,7 +555,7 @@ required_jars="jaxp_parser_impl"
 %{?with_apache_resolver:required_jars="$required_jars resolver"}
 %{?with_commons_logging:required_jars="$required_jars commons-logging"}
 %{?with_commons_net:required_jars="$required_jars commons-net"}
-%{?with_jai:required_jars="$required_jars jait"}
+%{?with_jai:required_jars="$required_jars jai_core jai_codec"}
 %{?with_apache_bcel:required_jars="$required_jars bcel"}
 %{?with_apache_log4j:required_jars="$required_jars log4j"}
 %{?with_apache_oro:required_jars="$required_jars oro"}
@@ -546,7 +565,8 @@ required_jars="jaxp_parser_impl"
 %{?with_jsch:required_jars="$required_jars jsch"}
 %{?with_netrexx:required_jars="$required_jars NetRexxC"}
 
-export CLASSPATH="`/usr/bin/build-classpath $required_jars`"
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
 
 sh build.sh --noconfig main javadocs
 
@@ -667,23 +687,13 @@ echo "netrexx ant/ant-netrexx" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/netrexx
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 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
-cd ..
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-       rm -f %{_javadocdir}/%{name}
-fi
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -874,3 +884,4 @@ fi
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}