# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1283523970 -7200
# Node ID 6f59409302d1df81bbfd10093e2991efe6769a39
# Parent  9a05844af63460d8655dd1e032eb2af0137d304a
switching back to jar chrome format (instead of omni)

diff -r 9a05844af634 -r 6f59409302d1 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Sep 02 23:05:22 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Sep 03 16:26:10 2010 +0200
@@ -211,6 +211,7 @@
 %if 0%{?use_xulrunner}
 cat << EOF >> $MOZCONFIG
 ac_add_options --with-libxul-sdk=$SDKDIR
+ac_add_options --enable-chrome-format=jar
 EOF
 %endif
 %if %branding
@@ -233,7 +234,7 @@
 %if %localize
 rm -f %{_tmppath}/translations.*
 touch %{_tmppath}/translations.{common,other}
-for locale in $(awk '{ print $1; }' browser/locales/shipped-locales); do
+for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do
   case $locale in
    ja-JP-mac|en-US)
 	;;
@@ -352,17 +353,22 @@
 %defattr(-,root,root)
 %dir %{progdir}
 %dir %{progdir}/chrome/
+%{progdir}/chrome/browser.*
+%{progdir}/chrome/localized.manifest
+%{progdir}/chrome/nonlocalized.manifest
+%{progdir}/chrome/en-US.*
 %{progdir}/chrome/icons
 %{progdir}/components/
-#%exclude %{progdir}/defaults/profile/bookmarks.html
+%exclude %{progdir}/defaults/profile/bookmarks.html
+%{progdir}/defaults/
 %{progdir}/extensions/
 %{progdir}/icons/
+%{progdir}/modules/
 %{progdir}/searchplugins/
 %attr(755,root,root) %{progdir}/%{progname}.sh
 %{progdir}/firefox
 %{progdir}/application.ini
 %{progdir}/blocklist.xml
-%{progdir}/omni.jar
 %if %crashreporter
 %{progdir}/crashreporter-override.ini
 %endif
@@ -392,7 +398,7 @@
 %files branding-upstream  
 %defattr(-,root,root)  
 %dir %{progdir}
-#%dir %{progdir}/defaults/
-#%{progdir}/defaults/profile/bookmarks.html
+%dir %{progdir}/defaults/
+%{progdir}/defaults/profile/bookmarks.html
 
 %changelog