Author: glen Date: Mon Mar 5 20:50:53 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- HEAD merge
---- Files affected:
SPECS:
openoffice.org.spec (1.704.2.14 -> 1.704.2.15)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.14
SPECS/openoffice.org.spec:1.704.2.15
--- SPECS/openoffice.org.spec:1.704.2.14 Mon Mar 5 21:49:47 2007
+++ SPECS/openoffice.org.spec Mon Mar 5 21:50:48 2007
@@ -2106,7 +2106,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} \
@@ -3059,7 +3062,7 @@
%attr(755,root,root) %{_libdir}/%{name}/program/libira680*.so
%attr(755,root,root) %{_libdir}/%{name}/program/libitg680*.so
%attr(755,root,root) %{_libdir}/%{name}/program/libiti680*.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libj680li_g.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libj680l*_g.so
%attr(755,root,root) %{_libdir}/%{name}/program/libkab1.so
%attr(755,root,root) %{_libdir}/%{name}/program/liblegacy_binfilters680*.so
%attr(755,root,root) %{_libdir}/%{name}/program/liblng680*.so
@@ -3082,7 +3085,6 @@
%attr(755,root,root) %{_libdir}/%{name}/program/libpdffilter680*.so
%attr(755,root,root) %{_libdir}/%{name}/program/libpk680*.so
%attr(755,root,root) %{_libdir}/%{name}/program/libpl680*.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libplacewareli.so
%attr(755,root,root) %{_libdir}/%{name}/program/libpreload680*.so
%attr(755,root,root) %{_libdir}/%{name}/program/libprotocolhandler680*.so
%attr(755,root,root) %{_libdir}/%{name}/program/libpsp680*.so
@@ -3745,6 +3747,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.704.2.15 2007/03/05 20:50:48 glen
+- HEAD merge
+
Revision 1.704.2.14 2007/03/05 20:49:47 glen
- arch note
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.704.2.14&r2=1.704.2.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
