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

[glen]

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

---- Files affected:
SPECS:
   openoffice.org.spec (1.714 -> 1.715) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.714 SPECS/openoffice.org.spec:1.715
--- SPECS/openoffice.org.spec:1.714	Mon Mar  5 21:53:04 2007
+++ SPECS/openoffice.org.spec	Tue Mar  6 01:02:13 2007
@@ -2266,8 +2266,13 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome
 
 # Remove dictionaries (in separate pkg)
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/*
+rm -vf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/*
+%if %{with system_myspell}
+rmdir $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo
+ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo
+%else
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/dictionary.lst
+%endif
 
 # is below comment true?
 # OOo should not install the Vera fonts, they are Required: now
@@ -2388,6 +2393,15 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with system_myspell}
+# we symlink the dir, unless smb wishes to patch OOo to use system dir directly
+%pre core
+if [ -d %{_libdir}/%{name}/share/dict/ooo ] && [ ! -L %{_libdir}/%{name}/share/dict/ooo ]; then
+	rmdir %{_libdir}/%{name}/share/dict/ooo 2>/dev/null || mv -v %{_libdir}/%{name}/share/dict/ooo{,rpmsave} || :
+	ln -s %{_datadir}/myspell %{_libdir}/%{name}/share/dict/ooo
+fi
+%endif
+
 %post core
 umask 022
 [ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
@@ -2404,6 +2418,9 @@
 %postun -n fonts-TTF-OpenSymbol
 fontpostinst TTF
 
+# NOTE:
+# you may find build/*_list.txt useful to help you package files to packages
+
 %files
 %defattr(644,root,root,755)
 
@@ -2479,7 +2496,8 @@
 %{_libdir}/%{name}/share/config/soffice.cfg/modules/StartModule
 %{_libdir}/%{name}/share/config/wizard
 %dir %{_libdir}/%{name}/share/dict
-%dir %{_libdir}/%{name}/share/dict/ooo
+%{!?with_system_myspell:%dir %{_libdir}/%{name}/share/dict/ooo}
+%{!?with_system_myspell:%ghost %{_libdir}/%{name}/share/dict/ooo/dictionary.lst}
 %{_libdir}/%{name}/share/dtd
 %{_libdir}/%{name}/share/fonts
 %{_libdir}/%{name}/share/gallery
@@ -2749,7 +2767,6 @@
 %{_libdir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/UISort/UISort-math.xcu
 %{_libdir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/UISort/UISort-writer.xcu
 
-%ghost %{_libdir}/%{name}/share/dict/ooo/dictionary.lst
 %dir %{_libdir}/%{name}/presets
 %dir %{_libdir}/%{name}/presets/autotext
 %{_libdir}/%{name}/presets/autotext/mytexts.bau
@@ -3036,7 +3053,6 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/libera680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libeti680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libevoab1.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libevoab2.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libevtatt.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libexlink680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libexp680*.so
@@ -3239,6 +3255,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/gnome-open-url
 %attr(755,root,root) %{_libdir}/%{name}/program/gnome-open-url.bin
 %attr(755,root,root) %{_libdir}/%{name}/program/gnome-set-default-application
+%attr(755,root,root) %{_libdir}/%{name}/program/libevoab2.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_gtk*.so
 %if %{with gnomevfs}
 %attr(755,root,root) %{_libdir}/%{name}/program/gconfbe1.uno.so
@@ -3755,6 +3772,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.715  2007/03/06 00:02:13  glen
+- AC-branch merge
+
 Revision 1.714  2007/03/05 20:53:04  glen
 - adapter
 
================================================================

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