update to firefox-8.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5157 ec354946-7b23-47d6-9f5a-488ba84defc7

f/firefox/firefox-vine-default-prefs.js

@@ -1,13 +1,17 @@
 // Vine Linux default settings
-pref("app.update.auto", false);
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
+pref("app.update.auto",                     false);
+pref("app.update.enabled",                  false);
+pref("app.update.autoInstallEnabled",       false);
 pref("browser.backspace_action",            2);
 pref("browser.display.use_system_colors",   true);
 pref("browser.download.folderList",         1);
 pref("browser.link.open_external",          3);
 pref("general.smoothScroll",                true);
 pref("browser.shell.checkDefaultBrowser",   false);
-pref("general.useragent.vendor", "Vine");
-pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");
-pref("font.default", "sans-serif");
+pref("network.manage-offline-status",       true);
+pref("dom.ipc.plugins.enabled.nswrapper*",  false);
+pref("extensions.shownSelectionUI",         true);
+pref("extensions.autoDisableScope",         0);
+pref("general.useragent.vendor",            "Vine");
+pref("general.useragent.vendorSub",         "FIREFOX_RPM_VR");
+pref("font.default",                        "sans-serif");

f/firefox/firefox-vl.spec

@@ -1,9 +1,9 @@
 ## do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 7.0
-%global geckomajor 7.0
-%global ffminor 1
+%global ffmajor 8.0
+%global geckomajor 8.0
+#global ffminor 0
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
-%define ffdir %{_libdir}/firefox-%{ffmajor}
+%define ffdir %{_libdir}/firefox
 %global langpackdir %{ffdir}/langpacks
 %define tarballdir mozilla-release
 
@@ -76,11 +76,12 @@ Source2000:     firefox-searchplugins-4.0-ja.tar.bz2
 # upstream patch
 
 # build patches
-Patch0:		firefox-version.patch
-Patch1:		firefox-7.0-cache-build.patch
+Patch0:         firefox-install-dir.patch
 
 # bugfix
 Patch14:	firefox-5.0-asciidel.patch
+# 
+Patch15:	firefox-8.0-enable-addons.patch
 
 # customization patches
 Patch26:	firefox-1.5-default-a4-paper.patch
@@ -160,13 +161,10 @@ FX ウェブブラウザは Mozilla テクノロジーをベースとしたオ
 %setup -q -n %{name}-%{version} -c
 cd %{tarballdir}
 
-sed -e 's/__RPM_VERSION_INTERNAL__/%{ffmajor}/' \
-    %{P:%%PATCH0} > version.patch
-%{__patch} -p1 -b --suffix .version < version.patch
-
-%patch1 -p1 -b .cache
+%patch0 -p2 -b .install-dir
 
 %patch14 -p1 -b .asciidel
+%patch15 -p2 -b .enable-addons
 
 %patch26 -p1
 
@@ -278,14 +276,9 @@ do
 done
 
 # set up the firefox start script
-#%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
-#%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{ffmajor},g' > \
-#  $RPM_BUILD_ROOT%{_bindir}/firefox
-#%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox
 %{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
 XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,g"`
-%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{ffmajor},g' \
-		     | %{__sed} -e "s,XULRUNNER_DIRECTORY,$XULRUNNER_DIR,g" > \
+%{__cat} %{SOURCE21} | %{__sed} -e "s,XULRUNNER_DIRECTORY,$XULRUNNER_DIR,g" > \
   $RPM_BUILD_ROOT%{_bindir}/firefox
 %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox
 
@@ -354,6 +347,12 @@ done
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
 
 
+# cleanup unpackaged files
+%{__rm} -rf $RPM_BUILD_ROOT%{_includedir}/*
+%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-*
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/idl
+
+
 #---------------------------------------------------------------------
 
 %clean
@@ -390,6 +389,11 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Nov 18 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 8.0-1
+- update to 8.0
+- remove version number from MOZ_DIST_BIN
+  - /usr/lib*/firefox-8.0 -> /usr/lib*/firefox
+
 * Fri Sep 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 7.0.1-1
 - update to 7.0.1
 

f/firefox/firefox.vine.sh.in

@@ -50,18 +50,18 @@ esac
 
 MOZ_FIREFOX_FILE="firefox"
 
-if [ ! -r $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE ]; then
-    if [ ! -r $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE ]; then
-	echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE not found"
+if [ ! -r $MOZ_LIB_DIR/firefox/$MOZ_FIREFOX_FILE ]; then
+    if [ ! -r $SECONDARY_LIB_DIR/firefox/$MOZ_FIREFOX_FILE ]; then
+	echo "Error: $MOZ_LIB_DIR/firefox/$MOZ_FIREFOX_FILE not found"
 	if [ -d $SECONDARY_LIB_DIR ]; then
-	    echo "       $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE not found"
+	    echo "       $SECONDARY_LIB_DIR/firefox/$MOZ_FIREFOX_FILE not found"
 	fi
 	exit 1
     fi
     MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
 fi
-MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
-MOZ_XUL_DIR="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
+MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox"
+MOZ_XUL_DIR="$MOZ_LIB_DIR/firefox"
 MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
 MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
 MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"