SPECS: openoffice.org.spec - AC-branch merge

[glen]

Author: glen                         Date: Tue Mar  6 02:17:20 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   openoffice.org.spec (1.716 -> 1.717) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.716 SPECS/openoffice.org.spec:1.717
--- SPECS/openoffice.org.spec:1.716	Tue Mar  6 03:15:14 2007
+++ SPECS/openoffice.org.spec	Tue Mar  6 03:17:15 2007
@@ -305,6 +305,7 @@
 %{?with_system_beanshell:Requires:	beanshell}
 # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
 Requires:	cups-lib
+%{?with_system_hsqldb:Requires:	hsqldb >= 1.8.0}
 Requires:	libstdc++ >= 5:3.2.1
 Requires:	mktemp
 Requires:	sed
@@ -2497,6 +2498,7 @@
 %{_libdir}/%{name}/share/config/wizard
 %dir %{_libdir}/%{name}/share/dict
 %{!?with_system_myspell:%dir %{_libdir}/%{name}/share/dict/ooo}
+%{?with_system_myspell:%{_libdir}/%{name}/share/dict/ooo}
 %{!?with_system_myspell:%ghost %{_libdir}/%{name}/share/dict/ooo/dictionary.lst}
 %{_libdir}/%{name}/share/dtd
 %{_libdir}/%{name}/share/fonts
@@ -3772,6 +3774,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.717  2007/03/06 02:17:15  glen
+- AC-branch merge
+
 Revision 1.716  2007/03/06 02:15:14  glen
 - dot
 
================================================================

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