SPECS: mozilla-firefox.spec - dictionaries fixes from AC-branch

[glen]

Author: glen                         Date: Sun Mar  4 23:01:27 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dictionaries fixes from AC-branch

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.181 -> 1.182) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.181 SPECS/mozilla-firefox.spec:1.182
--- SPECS/mozilla-firefox.spec:1.181	Sun Mar  4 21:32:34 2007
+++ SPECS/mozilla-firefox.spec	Mon Mar  5 00:01:22 2007
@@ -4,7 +4,6 @@
 # - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff*
 #   for hints how to make locales
 # - make it more pld-like (bookmarks, default page etc..)
-# - add dictionaries outside of mozilla
 #
 # Conditional build:
 %bcond_with	tests	# enable tests (whatever they check)
@@ -231,6 +230,7 @@
 ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
 ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
 
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 
 sed 's, at LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
@@ -273,6 +273,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
+if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
+	mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
+fi
 for d in chrome defaults extensions greprefs icons init.d res searchplugins; do
 	if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
 		install -d %{_datadir}/%{name}
@@ -367,6 +370,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.182  2007/03/04 23:01:22  glen
+- dictionaries fixes from AC-branch
+
 Revision 1.181  2007/03/04 20:32:34  glen
 - use system myspell
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.181&r2=1.182&f=u