SPECS (DEVEL): mozilla-firefox.spec - remove --disable-v1-string-a...

[glen]

Author: glen                         Date: Fri Nov  3 13:46:25 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- remove --disable-v1-string-abi, it was cause of memory faults
- cleanups in spec and chrome+xpcom-generate
- package dictionaries dir
- remove {cf2812dc-6a7c-4402-b639-4d277dac4c36} extension (not built)

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.95.2.43 -> 1.95.2.44) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.95.2.43 SPECS/mozilla-firefox.spec:1.95.2.44
--- SPECS/mozilla-firefox.spec:1.95.2.43	Fri Nov  3 14:00:13 2006
+++ SPECS/mozilla-firefox.spec	Fri Nov  3 14:46:20 2006
@@ -23,7 +23,7 @@
 Summary(pl):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox
 Version:	2.0
-Release:	0.17
+Release:	0.19
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
@@ -221,7 +221,6 @@
 ac_add_options --enable-update-channel=default
 ac_add_options --enable-reorder
 ac_add_options --enable-libxul
-#ac_add_options --disable-v1-string-abi
 ac_add_options --with-default-mozilla-five-home=%{_firefoxdir}
 ac_cv_visibility_pragma=no
 EOF
@@ -308,25 +307,21 @@
 touch $RPM_BUILD_ROOT%{_firefoxdir}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{_firefoxdir}/components/xpti.dat
 
-cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/firefox-chrome+xpcom-generate
+cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
 #!/bin/sh
 umask 022
 rm -f %{_firefoxdir}/chrome/{chrome.rdf,overlayinfo/*/*/*.rdf}
 rm -f %{_firefoxdir}/components/{compreg,xpti}.dat
-export MOZILLA_FIVE_HOME=%{_firefoxdir} # perhaps uneccessary after --with-default-mozilla-five-home?
 
-# PATH
-export PATH="%{_firefoxdir}:$PATH"
-
-# added /usr/lib: don't load your local library
-export LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-
-unset TMPDIR TMP || :
 # it attempts to touch files in $HOME/.mozilla
 # beware if you run this with sudo!!!
 export HOME=$(mktemp -d)
-%{_firefoxdir}/regxpcom
+# also TMPDIR could be pointing to sudo user's homedir
+unset TMPDIR TMP || :
+
+LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %{_firefoxdir}/regxpcom
 %{_firefoxdir}/firefox -register
+
 rm -rf $HOME
 EOF
 
@@ -334,13 +329,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/firefox-chrome+xpcom-generate
+%{_sbindir}/%{name}-chrome+xpcom-generate
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mozilla*
+%attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/firefox
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
 %dir %{_firefoxdir}
 %{_firefoxdir}/res
 %dir %{_firefoxdir}/components
@@ -354,6 +349,7 @@
 %{_firefoxdir}/defaults
 %{_firefoxdir}/greprefs
 %dir %{_firefoxdir}/extensions
+%dir %{_firefoxdir}/dictionaries
 %dir %{_firefoxdir}/init.d
 %{_firefoxdir}/init.d/README
 %attr(755,root,root) %{_firefoxdir}/*.so
@@ -379,7 +375,6 @@
 %if %{with javaxpcom}
 %{_firefoxdir}/javaxpcom-src.jar
 %{_firefoxdir}/javaxpcom.jar
-%{_firefoxdir}/extensions/{cf2812dc-6a7c-4402-b639-4d277dac4c36}
 %endif
 
 # updater
@@ -425,6 +420,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95.2.44  2006/11/03 13:46:20  glen
+- remove --disable-v1-string-abi, it was cause of memory faults
+- cleanups in spec and chrome+xpcom-generate
+- package dictionaries dir
+- remove {cf2812dc-6a7c-4402-b639-4d277dac4c36} extension (not built)
+
 Revision 1.95.2.43  2006/11/03 13:00:13  glen
 - javaxpcom bcond
 
================================================================

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