SPECS: openoffice.org.spec - use serializer.jar from new xerces-j ...

[arekm]

Author: arekm                        Date: Mon Mar  5 08:08:42 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use serializer.jar from new xerces-j if available; fallback to xalan.jar

---- Files affected:
SPECS:
   openoffice.org.spec (1.710 -> 1.711) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.710 SPECS/openoffice.org.spec:1.711
--- SPECS/openoffice.org.spec:1.710	Mon Mar  5 02:39:35 2007
+++ SPECS/openoffice.org.spec	Mon Mar  5 09:08:37 2007
@@ -2114,7 +2114,10 @@
 	%{?with_system_libhnj:--with-system-altlinuxhyphen} \
 	%{?with_system_mdbtools:--with-system-mdbtools} \
 	%{?with_system_myspell:--with-system-myspell} \
-	%{?with_system_xalan:--with-system-xalan --with-serializer-jar=%{_javadir}/xalan.jar} \
+%if %{with system_xalan}
+	--with-system-xalan \
+	`[ -e "%{_javadir}/serializer.jar" ] && echo "--with-serializer-jar=%{_javadir}/serializer.jar" || echo "--with-serializer-jar=%{_javadir}/xalan.jar"`
+%endif
 	%{?with_system_xerces:--with-system-xerces} \
 	%{?with_system_xml_apis:--with-system-xml-apis} \
 	%{?with_system_xt:--with-system-xt --with-xt-jar=%{_javadir}/classes} \
@@ -3753,6 +3756,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.711  2007/03/05 08:08:37  arekm
+- use serializer.jar from new xerces-j if available; fallback to xalan.jar
+
 Revision 1.710  2007/03/05 01:39:35  glen
 - AC-branch merge
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.710&r2=1.711&f=u