SPECS (AC-branch): openoffice.org.spec - libevoab2.so to gnome as ...
glen
glen at pld-linux.org
Tue Mar 6 00:18:03 CET 2007
Author: glen Date: Mon Mar 5 23:18:03 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- libevoab2.so to gnome as build/gnome-list.txt had it
- use dictionaries from myspell dir
- rel 3
---- Files affected:
SPECS:
openoffice.org.spec (1.704.2.15 -> 1.704.2.16)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.15 SPECS/openoffice.org.spec:1.704.2.16
--- SPECS/openoffice.org.spec:1.704.2.15 Mon Mar 5 21:50:48 2007
+++ SPECS/openoffice.org.spec Tue Mar 6 00:17:57 2007
@@ -68,7 +68,7 @@
%endif
%define ver 2.1.0
-%define _rel 2
+%define _rel 3
%define subver 680
%define snap OOE680
%define snap2 SRC680
@@ -2258,8 +2258,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
@@ -2380,6 +2385,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 ||:
@@ -2396,6 +2410,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)
@@ -2471,7 +2488,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
@@ -2741,7 +2759,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
@@ -3028,7 +3045,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
@@ -3231,6 +3247,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
@@ -3747,6 +3764,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.704.2.16 2007/03/05 23:17:57 glen
+- libevoab2.so to gnome as build/gnome-list.txt had it
+- use dictionaries from myspell dir
+- rel 3
+
Revision 1.704.2.15 2007/03/05 20:50:48 glen
- HEAD merge
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.704.2.15&r2=1.704.2.16&f=u
More information about the pld-cvs-commit
mailing list