X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ant.spec;h=cefcc09cae787ff787cbf4faa547c08f409ad677;hb=6d9b16facd3f6790fe4e796c34b228ba71c7be0a;hp=d7f1cb7d4c8a3c5572b59c5f69750201424d407a;hpb=20f0e5722b39cb0b524c6b9bd87a3793ed26d620;p=packages%2Fant.git

diff --git a/ant.spec b/ant.spec
index d7f1cb7..cefcc09 100644
--- a/ant.spec
+++ b/ant.spec
@@ -1,5 +1,6 @@
 # TODO
 # - prepare all BR and test the full build
+#   (TODO: stylebook, starteam, jai, jdepend, weblogic)
 #
 # Conditional build:
 %bcond_with	bootstrap	# minimal build for bootstrap
@@ -9,7 +10,7 @@
 %bcond_without	apache_log4j	# disable building log4j optional task(s)
 %bcond_without	apache_oro	# disable building apache-oro optional task(s)
 %bcond_without	apache_regexp	# disable building apache-regexp optional task(s)
-%bcond_with	apache_resolver	# enable building apache-resolver optional task(s)
+%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)
@@ -17,6 +18,7 @@
 %bcond_with	jdepend		# enable 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 %{with bootstrap}
 %undefine	with_antlr
@@ -30,13 +32,14 @@
 %undefine	with_commons_net
 %undefine	with_javamail
 %undefine	with_jsch
+%undefine	with_netrexx
 %endif
 #
 %define		_rel	0.1
 Summary:	Ant build tool for Java
-Summary(fr):	Outil de compilation pour java
-Summary(it):	Tool per la compilazione di programmi java
-Summary(pl):	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}
@@ -64,6 +67,7 @@ BuildRequires:	jpackage-utils
 %{?with_junit:BuildRequires:	junit}
 %{?with_apache_bsf:BuildRequires:	jython}
 %{?with_apache_log4j:BuildRequires:	logging-log4j >= 1.2}
+%{?with_netrexx:BuildRequires:	netrexx}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jdk
@@ -79,23 +83,23 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Platform-independent build tool for Java. Ant is a Java based build
 system. Ant is used by apache jakarta & xml projects.
 
-%description -l fr
+%description -l fr.UTF-8
 Ant est un outil de compilation multi-plateformes pour java. Il est
-utilisé par les projets apache-jakarta et apache-xml.
+utilisé par les projets apache-jakarta et apache-xml.
 
-%description -l it
+%description -l it.UTF-8
 Ant e' un tool indipendente dalla piattaforma creato per faciltare la
 compilazione di programmi java. Allo stato attuale viene utilizzato
 dai progetti apache jakarta ed apache xml.
 
-%description -l pl
-Niezale¿ne od platformy narzêdzie do budowania w Javie. Ant jest
-u¿ywany przez projekty apache jakarta i xml.
+%description -l pl.UTF-8
+Niezależne od platformy narzędzie do budowania w Javie. Ant jest
+używany przez projekty apache jakarta i xml.
 
 %package antlr
 Summary:	Optional antlr tasks for %{name}
-Summary(fr):	Taches antlr optionelles pour %{name}
-Summary(pl):	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
@@ -105,16 +109,37 @@ Conflicts:	ant-optional-full
 %description antlr
 Optional antlr tasks for %{name}.
 
-%description antlr -l fr
+%description antlr -l fr.UTF-8
 Taches antlr optionelles pour %{name}.
 
-%description antlr -l pl
+%description antlr -l pl.UTF-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
+Group:		Development/Languages/Java
+Requires:	%{name} = %{version}-%{release}
+Requires:	jakarta-bcel
+Provides:	ant-jakarta-bcel = %{version}-%{release}
+Obsoletes:	ant-jakarta-bcel
+Conflicts:	ant-optional-clean
+Conflicts:	ant-optional-full
+
+%description apache-bcel
+Optional apache bcel tasks for %{name}.
+
+%description apache-bcel -l fr.UTF-8
+Taches apache bcel optionelles pour %{name}.
+
+%description apache-bcel -l pl.UTF-8
+Opcjonalne zadania apache bcel dla anta.
+
 %package apache-bsf
 Summary:	Optional apache bsf tasks for %{name}
-Summary(fr):	Taches apache bsf optionelles pour %{name}
-Summary(pl):	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
@@ -124,16 +149,78 @@ Conflicts:	ant-optional-full
 %description apache-bsf
 Optional apache bsf tasks for %{name}.
 
-%description apache-bsf -l fr
+%description apache-bsf -l fr.UTF-8
 Taches apache bsf optionelles pour %{name}.
 
-%description apache-bsf -l pl
+%description apache-bsf -l pl.UTF-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
+Group:		Development/Languages/Java
+Requires:	%{name} = %{version}-%{release}
+Requires:	logging-log4j >= 1.2
+Provides:	ant-jakarta-log4j = %{version}-%{release}
+Obsoletes:	ant-jakarta-log4j
+Conflicts:	ant-optional-clean
+Conflicts:	ant-optional-full
+
+%description apache-log4j
+Optional apache log4j tasks for %{name}.
+
+%description apache-log4j -l fr.UTF-8
+Taches apache log4j optionelles pour %{name}.
+
+%description apache-log4j -l pl.UTF-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
+Group:		Development/Languages/Java
+Requires:	%{name} = %{version}-%{release}
+Requires:	jakarta-oro
+Provides:	ant-jakarta-oro = %{version}-%{release}
+Obsoletes:	ant-jakarta-oro
+Conflicts:	ant-optional-clean
+Conflicts:	ant-optional-full
+
+%description apache-oro
+Optional apache oro tasks for %{name}.
+
+%description apache-oro -l fr.UTF-8
+Taches apache oro optionelles pour %{name}.
+
+%description apache-oro -l pl.UTF-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
+Group:		Development/Languages/Java
+Requires:	%{name} = %{version}-%{release}
+Requires:	jakarta-regexp
+Obsoletes:	ant-jakarta-regexp
+Conflicts:	ant-optional-clean
+Conflicts:	ant-optional-full
+
+%description apache-regexp
+Optional apache regexp tasks for %{name}.
+
+%description apache-regexp -l fr.UTF-8
+Taches apache regexp optionelles pour %{name}.
+
+%description apache-regexp -l pl.UTF-8
+Opcjonalne zadania apache regexp dla anta.
+
 %package apache-resolver
 Summary:	Optional apache resolver tasks for %{name}
-Summary(fr):	Taches apache resolver optionelles pour %{name}
-Summary(pl):	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
@@ -144,13 +231,13 @@ Conflicts:	ant-optional-full
 %description apache-resolver
 Optional apache resolver tasks for %{name}.
 
-%description apache-resolver -l fr
+%description apache-resolver -l fr.UTF-8
 Taches apache resolver optionelles pour %{name}.
 
 %package commons-logging
 Summary:	Optional commons logging tasks for %{name}
-Summary(fr):	Taches commons logging optionelles pour %{name}
-Summary(pl):	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
@@ -160,16 +247,16 @@ Conflicts:	ant-optional-full
 %description commons-logging
 Optional commons logging tasks for %{name}.
 
-%description commons-logging -l fr
+%description commons-logging -l fr.UTF-8
 Taches commons logging optionelles pour %{name}.
 
-%description commons-logging -l pl
+%description commons-logging -l pl.UTF-8
 Opcjonalne zadania commons logging dla anta.
 
 %package commons-net
 Summary:	Optional commons net tasks for %{name}
-Summary(fr):	Taches commons net optionelles pour %{name}
-Summary(pl):	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
@@ -179,16 +266,16 @@ Conflicts:	ant-optional-full
 %description commons-net
 Optional commons net tasks for %{name}.
 
-%description commons-net -l fr
+%description commons-net -l fr.UTF-8
 Taches commons net optionelles pour %{name}.
 
-%description commons-net -l pl
+%description commons-net -l pl.UTF-8
 Opcjonalne zadania commons net dla anta.
 
 %package jai
 Summary:	Optional jai tasks for %{name}
-Summary(fr):	Taches jai optionelles pour %{name}
-Summary(pl):	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
@@ -198,99 +285,16 @@ Conflicts:	ant-optional-full
 %description jai
 Optional jai tasks for %{name}.
 
-%description jai -l fr
+%description jai -l fr.UTF-8
 Taches jai optionelles pour %{name}.
 
-%description jai -l pl
+%description jai -l pl.UTF-8
 Opcjonalne zadania jai dla anta.
 
-%package apache-bcel
-Summary:	Optional apache bcel tasks for %{name}
-Summary(fr):	Taches apache bcel optionelles pour %{name}
-Summary(pl):	Opcjonalne zadania apache bcel dla anta
-Group:		Development/Languages/Java
-Requires:	%{name} = %{version}-%{release}
-Requires:	jakarta-bcel
-Provides:	ant-jakarta-bcel = %{version}-%{release}
-Obsoletes:	ant-jakarta-bcel
-Conflicts:	ant-optional-clean
-Conflicts:	ant-optional-full
-
-%description apache-bcel
-Optional apache bcel tasks for %{name}.
-
-%description apache-bcel -l fr
-Taches apache bcel optionelles pour %{name}.
-
-%description apache-bcel -l pl
-Opcjonalne zadania apache bcel dla anta.
-
-%package apache-log4j
-Summary:	Optional apache log4j tasks for %{name}
-Summary(fr):	Taches apache log4j optionelles pour %{name}
-Summary(pl):	Opcjonalne zadania apache log4j dla anta
-Group:		Development/Languages/Java
-Requires:	%{name} = %{version}-%{release}
-Requires:	logging-log4j >= 1.2
-Provides:	ant-jakarta-log4j = %{version}-%{release}
-Obsoletes:	ant-jakarta-log4j
-Conflicts:	ant-optional-clean
-Conflicts:	ant-optional-full
-
-%description apache-log4j
-Optional apache log4j tasks for %{name}.
-
-%description apache-log4j -l fr
-Taches apache log4j optionelles pour %{name}.
-
-%description apache-log4j -l pl
-Opcjonalne zadania apache log4j dla anta.
-
-%package apache-oro
-Summary:	Optional apache oro tasks for %{name}
-Summary(fr):	Taches apache oro optionelles pour %{name}
-Summary(pl):	Opcjonalne zadania apache oro dla anta
-Group:		Development/Languages/Java
-Requires:	%{name} = %{version}-%{release}
-Requires:	jakarta-oro
-Provides:	ant-jakarta-oro = %{version}-%{release}
-Obsoletes:	ant-jakarta-oro
-Conflicts:	ant-optional-clean
-Conflicts:	ant-optional-full
-
-%description apache-oro
-Optional apache oro tasks for %{name}.
-
-%description apache-oro -l fr
-Taches apache oro optionelles pour %{name}.
-
-%description apache-oro -l pl
-Opcjonalne zadania apache oro dla anta.
-
-%package apache-regexp
-Summary:	Optional apache regexp tasks for %{name}
-Summary(fr):	Taches apache regexp optionelles pour %{name}
-Summary(pl):	Opcjonalne zadania apache regexp dla anta
-Group:		Development/Languages/Java
-Requires:	%{name} = %{version}-%{release}
-Requires:	jakarta-regexp
-Obsoletes:	ant-jakarta-regexp
-Conflicts:	ant-optional-clean
-Conflicts:	ant-optional-full
-
-%description apache-regexp
-Optional apache regexp tasks for %{name}.
-
-%description apache-regexp -l fr
-Taches apache regexp optionelles pour %{name}.
-
-%description apache-regexp -l pl
-Opcjonalne zadania apache regexp dla anta.
-
 %package javamail
 Summary:	Optional javamail tasks for %{name}
-Summary(fr):	Taches javamail optionelles pour %{name}
-Summary(pl):	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
@@ -301,16 +305,16 @@ Conflicts:	ant-optional-full
 %description javamail
 Optional javamail tasks for %{name}.
 
-%description javamail -l fr
+%description javamail -l fr.UTF-8
 Taches javamail optionelles pour %{name}.
 
-%description javamail -l pl
+%description javamail -l pl.UTF-8
 Opcjonalne zadania javamail dla anta.
 
 %package jdepend
 Summary:	Optional jdepend tasks for %{name}
-Summary(fr):	Taches jdepend optionelles pour %{name}
-Summary(pl):	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
@@ -320,16 +324,16 @@ Conflicts:	ant-optional-full
 %description jdepend
 Optional jdepend tasks for %{name}.
 
-%description jdepend -l fr
+%description jdepend -l fr.UTF-8
 Taches jdepend optionelles pour %{name}.
 
-%description jdepend -l pl
+%description jdepend -l pl.UTF-8
 Opcjonalne zadania jdepend dla anta.
 
 %package jmf
 Summary:	Optional jmf tasks for %{name}
-Summary(fr):	Taches jmf optionelles pour %{name}
-Summary(pl):	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
@@ -338,16 +342,16 @@ Conflicts:	ant-optional-full
 %description jmf
 Optional jmf tasks for %{name}.
 
-%description jmf -l fr
+%description jmf -l fr.UTF-8
 Taches jmf optionelles pour %{name}.
 
-%description jmf -l pl
+%description jmf -l pl.UTF-8
 Opcjonalne zadania jmf dla anta.
 
 %package jsch
 Summary:	Optional jsch tasks for %{name}
-Summary(fr):	Taches jsch optionelles pour %{name}
-Summary(pl):	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
@@ -357,16 +361,16 @@ Conflicts:	ant-optional-full
 %description jsch
 Optional jsch tasks for %{name}.
 
-%description jsch -l fr
+%description jsch -l fr.UTF-8
 Taches jsch optionelles pour %{name}.
 
-%description jsch -l pl
+%description jsch -l pl.UTF-8
 Opcjonalne zadania jsch dla anta.
 
 %package junit
 Summary:	Optional junit tasks for %{name}
-Summary(fr):	Taches junit optionelles pour %{name}
-Summary(pl):	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
@@ -376,16 +380,34 @@ Conflicts:	ant-optional-full
 %description junit
 Optional junit tasks for %{name}.
 
-%description junit -l fr
+%description junit -l fr.UTF-8
 Taches junit optionelles pour %{name}.
 
-%description junit -l pl
+%description junit -l pl.UTF-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
+Group:		Development/Languages/Java
+Requires:	%{name} = %{version}-%{release}
+Conflicts:	ant-optional-clean
+Conflicts:	ant-optional-full
+
+%description netrexx
+Optional netrexx tasks for %{name}.
+
+%description netrexx -l fr.UTF-8
+Taches netrexx optionelles pour %{name}.
+
+%description netrexx -l pl.UTF-8
+Opcjonalne zadania netrexx dla anta.
+
 %package nodeps
 Summary:	Optional tasks for %{name}
-Summary(fr):	Taches optionelles pour %{name}
-Summary(pl):	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
@@ -394,16 +416,16 @@ Conflicts:	ant-optional-full
 %description nodeps
 Optional tasks for %{name}.
 
-%description nodeps -l fr
+%description nodeps -l fr.UTF-8
 Taches optionelles pour %{name}.
 
-%description nodeps -l pl
+%description nodeps -l pl.UTF-8
 Opcjonalne zadania dla anta.
 
 %package swing
 Summary:	Optional swing tasks for %{name}
-Summary(fr):	Taches swing optionelles pour %{name}
-Summary(pl):	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
@@ -412,16 +434,16 @@ Conflicts:	ant-optional-full
 %description swing
 Optional swing tasks for %{name}.
 
-%description swing -l fr
+%description swing -l fr.UTF-8
 Taches swing optionelles pour %{name}.
 
-%description swing -l pl
+%description swing -l pl.UTF-8
 Opcjonalne zadania swing dla anta.
 
 %package trax
 Summary:	Optional trax tasks for %{name}
-Summary(fr):	Taches trax optionelles pour %{name}
-Summary(pl):	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
@@ -433,16 +455,16 @@ Conflicts:	ant-optional-full
 %description trax
 Optional trax tasks for %{name}.
 
-%description trax -l fr
+%description trax -l fr.UTF-8
 Taches trax optionelles pour %{name}.
 
-%description trax -l pl
+%description trax -l pl.UTF-8
 Dodatkowe zadania trax dla anta.
 
 %package scripts
 Summary:	Additional scripts for %{name}
-Summary(fr):	Scripts additionels pour %{name}
-Summary(pl):	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}
@@ -452,34 +474,34 @@ Requires:	/usr/bin/python
 %description scripts
 Additional Perl and Python scripts for %{name}.
 
-%description scripts -l fr
+%description scripts -l fr.UTF-8
 Scripts additionels pour %{name}.
 
-%description scripts -l pl
+%description scripts -l pl.UTF-8
 Dodatkowe skrypty dla anta.
 
 %package doc
 Summary:	Manual for %{name}
-Summary(fr):	Documentation pour %{name}
-Summary(it):	Documentazione di %{name}
-Summary(pl):	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
 Documentation for %{name}.
 
-%description doc -l fr
+%description doc -l fr.UTF-8
 Documentation pour %{name}.
 
-%description doc -l it
+%description doc -l it.UTF-8
 Documentazione di %{name}.
 
-%description doc -l pl
+%description doc -l pl.UTF-8
 Dokumentacja do anta.
 
 %package javadoc
 Summary:	Online manual for ant
-Summary(pl):	Dokumentacja online do ant
+Summary(pl.UTF-8):   Dokumentacja online do ant
 Group:		Documentation
 Requires:	jpackage-utils
 Obsoletes:	jakarta-ant-doc
@@ -488,9 +510,9 @@ Obsoletes:	jakarta-ant-doc
 Documentation for ant, platform-independent build tool for Java. Used
 by Apache Group for jakarta and xml projects.
 
-%description javadoc -l pl
-Dokumentacja do anta - niezale¿nego od platformy narzêdzia do
-budowania w Javie. Jest ono u¿ywane przez Apache Group w projektach
+%description javadoc -l pl.UTF-8
+Dokumentacja do anta - niezależnego od platformy narzędzia do
+budowania w Javie. Jest ono używane przez Apache Group w projektach
 jakarta i xml.
 
 %prep
@@ -511,9 +533,9 @@ required_jars="jaxp_parser_impl"
 %{?with_junit:required_jars="$required_jars junit"}
 %{?with_antlr:required_jars="$required_jars antlr"}
 %{?with_apache_bsf:required_jars="$required_jars bsf jython bsh"}
-%{?with_apache_resolver:required_jars="$required_jars xml-commons-resolver"}
-%{?with_commons_logging:required_jars="$required_jars jakarta-commons-logging"}
-%{?with_commons_net:required_jars="$required_jars jakarta-commons-net"}
+%{?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_apache_bcel:required_jars="$required_jars bcel"}
 %{?with_apache_log4j:required_jars="$required_jars log4j"}
@@ -522,6 +544,7 @@ required_jars="jaxp_parser_impl"
 %{?with_javamail:required_jars="$required_jars mailapi activation"}
 %{?with_jdepend:required_jars="$required_jars jdepend"}
 %{?with_jsch:required_jars="$required_jars jsch"}
+%{?with_netrexx:required_jars="$required_jars NetRexxC"}
 
 export CLASSPATH="`/usr/bin/build-classpath $required_jars`"
 
@@ -632,6 +655,11 @@ install build/lib/%{name}-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-js
 echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
 %endif
 
+%if %{with netrexx}
+install build/lib/%{name}-netrexx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-netrexx-%{version}.jar
+echo "netrexx ant/ant-netrexx" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/netrexx
+%endif
+
 # jar aliases
 (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)
@@ -654,7 +682,7 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
 %postun javadoc
 if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/%{name}
+	rm -f %{_javadocdir}/%{name}
 fi
 
 %files
@@ -679,55 +707,6 @@ fi
 %dir %{_sysconfdir}/%{name}.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 
-%files nodeps
-%defattr(644,root,root,755)
-%{_javadir}/%{name}/%{name}-nodeps.jar
-%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
-%{_sysconfdir}/%{name}.d/nodeps
-
-%files swing
-%defattr(644,root,root,755)
-%{_javadir}/%{name}/%{name}-swing.jar
-%{_javadir}/%{name}/%{name}-swing-%{version}.jar
-%{_sysconfdir}/%{name}.d/swing
-
-%files trax
-%defattr(644,root,root,755)
-%{_javadir}/%{name}/%{name}-trax.jar
-%{_javadir}/%{name}/%{name}-trax-%{version}.jar
-%{_sysconfdir}/%{name}.d/trax
-%{ant_home}/etc/mmetrics-frames.xsl
-%{ant_home}/etc/coverage-frames.xsl
-
-%files jmf
-%defattr(644,root,root,755)
-%{_javadir}/%{name}/%{name}-jmf.jar
-%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
-%{_sysconfdir}/%{name}.d/jmf
-
-%files scripts
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*.pl
-%attr(755,root,root) %{_bindir}/*.py
-
-%files doc
-%defattr(644,root,root,755)
-%doc docs/*
-
-%files javadoc
-%defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-
-%if %{with junit}
-%files junit
-%defattr(644,root,root,755)
-%{_javadir}/%{name}/%{name}-junit.jar
-%{_javadir}/%{name}/%{name}-junit-%{version}.jar
-%{_sysconfdir}/%{name}.d/junit
-%{ant_home}/etc/junit-frames.xsl
-%{ant_home}/etc/junit-noframes.xsl
-%endif
-
 %if %{with antlr}
 %files antlr
 %defattr(644,root,root,755)
@@ -736,6 +715,15 @@ fi
 %{_sysconfdir}/%{name}.d/antlr
 %endif
 
+%if %{with apache_bcel}
+%files apache-bcel
+%defattr(644,root,root,755)
+%{_javadir}/%{name}/%{name}-apache-bcel.jar
+%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
+%{_javadir}/%{name}/%{name}-jakarta-bcel.jar
+%{_sysconfdir}/%{name}.d/apache-bcel
+%endif
+
 %if %{with apache_bsf}
 %files apache-bsf
 %defattr(644,root,root,755)
@@ -744,6 +732,34 @@ fi
 %{_sysconfdir}/%{name}.d/apache-bsf
 %endif
 
+%if %{with apache_log4j}
+%files apache-log4j
+%defattr(644,root,root,755)
+%{_javadir}/%{name}/%{name}-apache-log4j.jar
+%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
+%{_javadir}/%{name}/%{name}-jakarta-log4j.jar
+%{_sysconfdir}/%{name}.d/apache-log4j
+%endif
+
+%if %{with apache_oro}
+%files apache-oro
+%defattr(644,root,root,755)
+%{_javadir}/%{name}/%{name}-apache-oro.jar
+%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
+%{_javadir}/%{name}/%{name}-jakarta-oro.jar
+%{_sysconfdir}/%{name}.d/apache-oro
+%{ant_home}/etc/maudit-frames.xsl
+%endif
+
+%if %{with apache_regexp}
+%files apache-regexp
+%defattr(644,root,root,755)
+%{_javadir}/%{name}/%{name}-apache-regexp.jar
+%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
+%{_javadir}/%{name}/%{name}-jakarta-regexp.jar
+%{_sysconfdir}/%{name}.d/apache-regexp
+%endif
+
 %if %{with apache_resolver}
 %files apache-resolver
 %defattr(644,root,root,755)
@@ -776,43 +792,6 @@ fi
 %{_sysconfdir}/%{name}.d/jai
 %endif
 
-%if %{with apache_bcel}
-%files apache-bcel
-%defattr(644,root,root,755)
-%{_javadir}/%{name}/%{name}-apache-bcel.jar
-%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
-%{_javadir}/%{name}/%{name}-jakarta-bcel.jar
-%{_sysconfdir}/%{name}.d/apache-bcel
-%endif
-
-%if %{with apache_log4j}
-%files apache-log4j
-%defattr(644,root,root,755)
-%{_javadir}/%{name}/%{name}-apache-log4j.jar
-%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
-%{_javadir}/%{name}/%{name}-jakarta-log4j.jar
-%{_sysconfdir}/%{name}.d/apache-log4j
-%endif
-
-%if %{with apache_oro}
-%files apache-oro
-%defattr(644,root,root,755)
-%{_javadir}/%{name}/%{name}-apache-oro.jar
-%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
-%{_javadir}/%{name}/%{name}-jakarta-oro.jar
-%{_sysconfdir}/%{name}.d/apache-oro
-%{ant_home}/etc/maudit-frames.xsl
-%endif
-
-%if %{with apache_regexp}
-%files apache-regexp
-%defattr(644,root,root,755)
-%{_javadir}/%{name}/%{name}-apache-regexp.jar
-%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
-%{_javadir}/%{name}/%{name}-jakarta-regexp.jar
-%{_sysconfdir}/%{name}.d/apache-regexp
-%endif
-
 %if %{with javamail}
 %files javamail
 %defattr(644,root,root,755)
@@ -831,6 +810,12 @@ fi
 %{ant_home}/etc/jdepend-frames.xsl
 %endif
 
+%files jmf
+%defattr(644,root,root,755)
+%{_javadir}/%{name}/%{name}-jmf.jar
+%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
+%{_sysconfdir}/%{name}.d/jmf
+
 %if %{with jsch}
 %files jsch
 %defattr(644,root,root,755)
@@ -838,3 +823,54 @@ fi
 %{_javadir}/%{name}/%{name}-jsch-%{version}.jar
 %{_sysconfdir}/%{name}.d/jsch
 %endif
+
+%if %{with junit}
+%files junit
+%defattr(644,root,root,755)
+%{_javadir}/%{name}/%{name}-junit.jar
+%{_javadir}/%{name}/%{name}-junit-%{version}.jar
+%{_sysconfdir}/%{name}.d/junit
+%{ant_home}/etc/junit-frames.xsl
+%{ant_home}/etc/junit-noframes.xsl
+%endif
+
+%if %{with netrexx}
+%files netrexx
+%defattr(644,root,root,755)
+%{_javadir}/%{name}/%{name}-netrexx.jar
+%{_javadir}/%{name}/%{name}-netrexx-%{version}.jar
+%{_sysconfdir}/%{name}.d/netrexx
+%endif
+
+%files nodeps
+%defattr(644,root,root,755)
+%{_javadir}/%{name}/%{name}-nodeps.jar
+%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
+%{_sysconfdir}/%{name}.d/nodeps
+
+%files swing
+%defattr(644,root,root,755)
+%{_javadir}/%{name}/%{name}-swing.jar
+%{_javadir}/%{name}/%{name}-swing-%{version}.jar
+%{_sysconfdir}/%{name}.d/swing
+
+%files trax
+%defattr(644,root,root,755)
+%{_javadir}/%{name}/%{name}-trax.jar
+%{_javadir}/%{name}/%{name}-trax-%{version}.jar
+%{_sysconfdir}/%{name}.d/trax
+%{ant_home}/etc/mmetrics-frames.xsl
+%{ant_home}/etc/coverage-frames.xsl
+
+%files scripts
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/*.pl
+%attr(755,root,root) %{_bindir}/*.py
+
+%files doc
+%defattr(644,root,root,755)
+%doc docs/*
+
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{name}-%{version}