SPECS (DEVEL): fop.spec - %%builds but not %%installs - still does not pass...

[pawelz]

Author: pawelz                       Date: Mon Dec 29 16:22:26 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- %%builds but not %%installs
- still does not pass tests. Which package provides ConsoleLogger class?

---- Files affected:
SPECS:
   fop.spec (1.36.2.4 -> 1.36.2.5) 

---- Diffs:

================================================================
Index: SPECS/fop.spec
diff -u SPECS/fop.spec:1.36.2.4 SPECS/fop.spec:1.36.2.5
--- SPECS/fop.spec:1.36.2.4	Mon Dec 29 12:20:44 2008
+++ SPECS/fop.spec	Mon Dec 29 17:22:21 2008
@@ -2,21 +2,6 @@
 # TODO:
 # - Some test fails. Reason of some failures is obvious:
 #   [junit] No X11 DISPLAY variable was set, but this program performed an operation which requires it.
-# - Does not builds:
-#   [javac] /home/users/z/rpm/BUILD/fop-0.95/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java:103:
-#cannot find symbol
-#   [javac] symbol  : variable super
-#   [javac] location: class org.apache.fop.intermediate.AreaTreeParserTestCase
-#   [javac]         super.setUp();
-#   [javac]         ^
-#   [javac] /home/users/z/rpm/BUILD/fop-0.95/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java:137:
-#cannot find symbol
-#   [javac] symbol  : method
-#assertXMLEqual(org.w3c.dom.Document,org.w3c.dom.Document)
-#   [javac] location: class org.apache.fop.intermediate.AreaTreeParserTestCase
-#   [javac]         assertXMLEqual(intermediate, doc);
-#   [javac]         ^
-#   some BRs are missing?
 #
 # Conditional build:
 %bcond_without  tests           # build without tests
@@ -32,6 +17,7 @@
 # Source0-md5:	adeb416f81125d8554a621050f319632
 Source1:	%{name}-font-install.sh
 Source2:	%{name}.sh
+Patch0:		%{name}-nojunit.patch
 URL:		http://xmlgrapics.apache.org/fop/
 BuildRequires:	batik
 BuildRequires:	jdk >= 1.3
@@ -40,12 +26,20 @@
 BuildRequires:	xalan-j
 BuildRequires:	xerces-j
 %{?with_tests:BuildRequires:	xmlunit}
+BuildRequires:	java-commons-io
+BuildRequires:	java-commons-logging
+BuildRequires:	jakarta-servletapi5
+BuildRequires:	xmlgraphics-commons
 Requires:	batik
 Requires:	freetype1
 Requires:	jpackage-utils
 Requires:	jre
+Requires:	java-commons-io
+Requires:	java-commons-logging
+Requires:	jakarta-servletapi5
 Requires:	xalan-j
 Requires:	xerces-j
+Requires:	xmlgraphics-commons
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -70,14 +64,27 @@
 %prep
 %setup -q
 
+%if %{without tests}
+%patch0 -p1
+%endif
+
+# We do want to use system libs
+# br_jars='commons-io commons-logging avalon-framework-api serializer servlet xmlgraphics-commons xml-apis-ext xercesImpl xalan batik batik/*'
+rm lib/*
+# for jar in $br_jars; do
+#   ln -s $(find-jar $jar) lib
+# done
+
 %build
-required_jars='ant xml-commons-apis xercesImpl xalan batik'
-CLASSPATH="%{_jvmlibdir}/java/lib/tools.jar"
-export CLASSPATH="$CLASSPATH:`/usr/bin/build-classpath $required_jars`"
-export JAVA_HOME=%{java_home}
-export JAVAC=%{javac}
-export JAVA=%{java}
+# required_jars='ant'
+# CLASSPATH="%{_jvmlibdir}/java/lib/tools.jar"
+# export CLASSPATH="$CLASSPATH:`/usr/bin/build-classpath $required_jars`"
+# export JAVA_HOME=%{java_home}
+# export JAVAC=%{javac}
+# export JAVA=%{java}
 
+br_jars='commons-io commons-logging avalon-framework-api serializer servlet xmlgraphics-commons xml-apis-ext xercesImpl xalan batik'
+export CLASSPATH=$(build-classpath $br_jars):$(build-classpath-directory /usr/share/java/batik)
 %ant \
 %if %{without tests}
 	-Djunit.present=false \
@@ -117,6 +124,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36.2.5  2008/12/29 16:22:21  pawelz
+- %%builds but not %%installs
+- still does not pass tests. Which package provides ConsoleLogger class?
+
 Revision 1.36.2.4  2008/12/29 11:20:44  pawelz
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fop.spec?r1=1.36.2.4&r2=1.36.2.5&f=u