SPECS: ant.spec - BR: xerces - adapterized

[pawelz]

Author: pawelz                       Date: Mon Feb  9 18:30:37 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: xerces
- adapterized

---- Files affected:
SPECS:
   ant.spec (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.107 SPECS/ant.spec:1.108
--- SPECS/ant.spec:1.107	Sun Feb  8 00:48:15 2009
+++ SPECS/ant.spec	Mon Feb  9 19:30:32 2009
@@ -73,10 +73,10 @@
 %{?with_commons_net:BuildRequires:	jakarta-commons-net}
 %{?with_apache_oro:BuildRequires:	jakarta-oro}
 %{?with_apache_regexp:BuildRequires:	jakarta-regexp}
+BuildRequires:	java-gcj-compat-devel
+%{?with_apache_resolver:BuildRequires:	java-xml-commons-resolver}
 %{?with_javamail:BuildRequires:	javamail}
-BuildRequires:	jaxp_parser_impl
 %{?with_jdepend:BuildRequires:	jdepend}
-BuildRequires:	java-gcj-compat-devel
 BuildRequires:	jpackage-utils
 %{?with_jsch:BuildRequires:	jsch >= 0.1.21}
 %{?with_junit:BuildRequires:	junit}
@@ -85,7 +85,7 @@
 %{?with_netrexx:BuildRequires:	netrexx}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-%{?with_apache_resolver:BuildRequires:	java-xml-commons-resolver}
+BuildRequires:	xerces-j
 Requires:	jdk
 Requires:	jpackage-utils
 Obsoletes:	jakarta-ant
@@ -712,13 +712,13 @@
 %{_javadir}/%{name}-launcher-%{version}.jar
 %dir %{_javadir}/%{name}
 %dir %{ant_home}
-%dir %{ant_home}/etc
-%{ant_home}/etc/ant-update.xsl
-%{ant_home}/etc/changelog.xsl
-%{ant_home}/etc/common2master.xsl
-%{ant_home}/etc/log.xsl
-%{ant_home}/etc/tagdiff.xsl
-%{ant_home}/etc/junit-frames-xalan1.xsl
+%dir %{ant_home}%{_sysconfdir}
+%{ant_home}%{_sysconfdir}/ant-update.xsl
+%{ant_home}%{_sysconfdir}/changelog.xsl
+%{ant_home}%{_sysconfdir}/common2master.xsl
+%{ant_home}%{_sysconfdir}/log.xsl
+%{ant_home}%{_sysconfdir}/tagdiff.xsl
+%{ant_home}%{_sysconfdir}/junit-frames-xalan1.xsl
 %dir %{ant_home}/lib
 %dir %{_sysconfdir}/%{name}.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
@@ -764,7 +764,7 @@
 %{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-oro.jar
 %{_sysconfdir}/%{name}.d/apache-oro
-%{ant_home}/etc/maudit-frames.xsl
+%{ant_home}%{_sysconfdir}/maudit-frames.xsl
 %endif
 
 %if %{with apache_regexp}
@@ -822,8 +822,8 @@
 %{_javadir}/%{name}/%{name}-jdepend.jar
 %{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
 %{_sysconfdir}/%{name}.d/jdepend
-%{ant_home}/etc/jdepend.xsl
-%{ant_home}/etc/jdepend-frames.xsl
+%{ant_home}%{_sysconfdir}/jdepend.xsl
+%{ant_home}%{_sysconfdir}/jdepend-frames.xsl
 %endif
 
 %files jmf
@@ -846,8 +846,8 @@
 %{_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
+%{ant_home}%{_sysconfdir}/junit-frames.xsl
+%{ant_home}%{_sysconfdir}/junit-noframes.xsl
 %endif
 
 %if %{with netrexx}
@@ -875,8 +875,8 @@
 %{_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
+%{ant_home}%{_sysconfdir}/mmetrics-frames.xsl
+%{ant_home}%{_sysconfdir}/coverage-frames.xsl
 
 %files scripts
 %defattr(644,root,root,755)
@@ -898,6 +898,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2009/02/09 18:30:32  pawelz
+- BR: xerces
+- adapterized
+
 Revision 1.107  2009/02/07 23:48:15  pawelz
 - s/xml-commons-resolver/java-xml-commons-resolver/ in BRs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ant.spec?r1=1.107&r2=1.108&f=u