packages: fop/fop.spec - dependencies

[pawelz]

Author: pawelz                       Date: Thu Apr  1 22:59:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dependencies

---- Files affected:
packages/fop:
   fop.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: packages/fop/fop.spec
diff -u packages/fop/fop.spec:1.43 packages/fop/fop.spec:1.44
--- packages/fop/fop.spec:1.43	Thu Apr  1 23:46:25 2010
+++ packages/fop/fop.spec	Fri Apr  2 00:59:12 2010
@@ -30,21 +30,25 @@
 BuildRequires:	batik
 BuildRequires:	glibc-localedb-all
 %{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
-BuildRequires:	jpackage-utils
 %{?with_tests:BuildRequires:	java-junit}
+%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	java-xalan
+BuildRequires:	java-xerces
 %{?with_tests:BuildRequires:	java-xmlunit}
+BuildRequires:	jpackage-utils
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-BuildRequires:	xalan-j
-BuildRequires:	xerces-j
 Requires:	batik
+Requires:	commons-io
 Requires:	freetype1
+Requires:	java-xalan
+Requires:	java-xerces
+Requires:	java-xerces
 Requires:	jpackage-utils
-Requires:	xalan-j
-Requires:	xerces-j
-Patch0:		fop-disableX11tests.patch
+Requires:	ttmkfdir
+Requires:	xmlgraphics-commons
+Patch0:		%{name}-disableX11tests.patch
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -74,7 +78,7 @@
 %build
 required_jars='ant xml-commons-apis xercesImpl xalan batik'
 CLASSPATH="%{_jvmlibdir}/java/lib/tools.jar"
-CLASSPATH="$CLASSPATH:$(/usr/bin/build-classpath $required_jars)"
+CLASSPATH="$CLASSPATH:$(%{_bindir}/build-classpath $required_jars)"
 export JAVA_HOME=%{java_home}
 export JAVAC=%{javac}
 export JAVA=%{java}
@@ -85,7 +89,7 @@
 
 %if %{with tests}
 required_jars='xmlunit junit'
-CLASSPATH="$CLASSPATH:$(/usr/bin/build-classpath $required_jars)"
+CLASSPATH="$CLASSPATH:$(%{_bindir}/build-classpath $required_jars)"
 %ant -Dbuild.sysclasspath=first
 %endif
 
@@ -128,6 +132,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2010/04/01 22:59:12  pawelz
+- dependencies
+
 Revision 1.43  2010/04/01 21:46:25  pawelz
 - up to 0.95
 - pldized/unified/etc
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fop/fop.spec?r1=1.43&r2=1.44&f=u