SPECS (DEVEL): mozilla-firefox.spec - move modules to datadir - ad...

[glen]

Author: glen                         Date: Thu Mar  6 15:49:12 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- move modules to datadir
- add --enable-libxul

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.228.4.17 -> 1.228.4.18) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.228.4.17 SPECS/mozilla-firefox.spec:1.228.4.18
--- SPECS/mozilla-firefox.spec:1.228.4.17	Thu Mar  6 01:14:29 2008
+++ SPECS/mozilla-firefox.spec	Thu Mar  6 16:49:07 2008
@@ -21,7 +21,7 @@
 
 %define		ver		3.0
 %define		subver	b3
-%define		rel		0.5
+%define		rel		0.8
 
 Summary:	Firefox Community Edition web browser
 Summary(pl.UTF-8):	Firefox Community Edition - przeglądarka WWW
@@ -133,10 +133,8 @@
 
 %build
 cd mozilla
-
 cp -f %{_datadir}/automake/config.* build/autoconf
 cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
-#cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
 cat << 'EOF' > .mozconfig
 . $topsrcdir/browser/config/mozconfig
@@ -195,6 +193,7 @@
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-myspell
 ac_add_options --enable-xft
+ac_add_options --enable-libxul
 ac_add_options --with-distribution-id=org.pld-linux
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-nspr
@@ -229,12 +228,14 @@
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules $RPM_BUILD_ROOT%{_datadir}/%{name}/modules
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
 ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
 ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
 ln -s ../../share/%{name}/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
 ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
+ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
 ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
 ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
 ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
@@ -268,7 +269,7 @@
 # also TMPDIR could be pointing to sudo user's homedir
 unset TMPDIR TMP || :
 
-LD_LIBRARY_PATH=%{_libdir}/%{name}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %{_libdir}/%{name}/regxpcom
+#LD_LIBRARY_PATH=%{_libdir}/%{name}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %{_libdir}/%{name}/regxpcom
 %{_libdir}/%{name}/firefox -register
 
 rm -rf $HOME
@@ -281,7 +282,7 @@
 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 res searchplugins; do
+for d in chrome defaults extensions greprefs modules icons res searchplugins; do
 	if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
 		install -d %{_datadir}/%{name}
 		mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d
@@ -380,8 +381,9 @@
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
 %attr(755,root,root) %{_libdir}/%{name}/*.sh
-%attr(755,root,root) %{_libdir}/%{name}/m*
-%attr(755,root,root) %{_libdir}/%{name}/f*
+%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
+%attr(755,root,root) %{_libdir}/%{name}/firefox
+%attr(755,root,root) %{_libdir}/%{name}/firefox-bin
 #%attr(755,root,root) %{_libdir}/%{name}/regxpcom
 #%attr(755,root,root) %{_libdir}/%{name}/xpcshell
 #%attr(755,root,root) %{_libdir}/%{name}/xpicleanup
@@ -395,6 +397,7 @@
 %{_libdir}/%{name}/extensions
 %{_libdir}/%{name}/greprefs
 %{_libdir}/%{name}/icons
+%{_libdir}/%{name}/modules
 %{_libdir}/%{name}/res
 %{_libdir}/%{name}/searchplugins
 
@@ -409,6 +412,7 @@
 %{_datadir}/%{name}/defaults
 %{_datadir}/%{name}/greprefs
 %{_datadir}/%{name}/icons
+%{_datadir}/%{name}/modules
 %{_datadir}/%{name}/res
 %{_datadir}/%{name}/searchplugins
 
@@ -428,11 +432,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.228.4.18  2008-03-06 15:49:07  glen
+- move modules to datadir
+- add --enable-libxul
+
 Revision 1.228.4.17  2008-03-06 00:14:29  glen
 - APNG runtime dep
 
 Revision 1.228.4.16  2008-03-06 00:06:00  glen
-- R: caior >= 1.5 as soname is same, but some syms are missing
+- R: cairo >= 1.5 as soname is same, but some syms are missing
 
 Revision 1.228.4.15  2008-03-05 23:59:01  glen
 - builds and packages
@@ -474,7 +482,7 @@
 
 Revision 1.228.4.5  2008-02-13 10:32:03  glen
 - up to beta3, disable patch sources that are not used
-- add patch for pango crash from #414239 (by raul raat)
+- add patch for pango crash from #414239 (by Raul Raat)
 
 Revision 1.228.4.4  2008-02-13 10:30:23  glen
 - or was it nspr 4.6.7?
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mozilla-firefox.spec?r1=1.228.4.17&r2=1.228.4.18&f=u