firefox: update to 21.0

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

f/firefox/firefox-vl.spec

@@ -1,7 +1,7 @@
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 20.0
-%global geckomajor 20.0
-%global ffminor 1
+%global ffmajor 21.0
+%global geckomajor 21.0
+#global ffminor 1
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
 %global langpackdir %{ffdir}/langpacks
@@ -22,7 +22,7 @@
 %define build_vine6 1
 %endif
 
-%define ffrelease 2%{?_dist_release}
+%define ffrelease 1%{?_dist_release}
 
 %define desktop_file_utils_version 0.6
 %define nspr_version 4.9.6
@@ -91,16 +91,13 @@ Patch21:        rhbz-911314.patch
 Patch22:        rhbz-928353.patch
 
 # upstream patch
-Patch101:       mozilla-791626.patch
-Patch102:       mozilla-239254.patch
-Patch104:       mozilla-844883.patch
 
 
 # customization patches
 Patch200:	firefox-1.5-default-a4-paper.patch
 
 ## Vine patch
-Patch1000:      firefox-19.0-disable-pdfjs.patch
+#Patch1000:      firefox-19.0-disable-pdfjs.patch
 
 # vine customization patch
 Patch2000:      firefox-20.0-vine.patch
@@ -140,7 +137,13 @@ BuildRequires:  yasm
 BuildRequires:  unzip
 BuildRequires:  zip
 BuildRequires:  bzip2-devel
+%if %{build_vine7}
 BuildRequires:  python-devel
+BuildRequires:  python
+%else
+BuildRequires:  python27-devel
+BuildRequires:  python27
+%endif
 BuildRequires:  curl-devel
 BuildRequires:  wget
 
@@ -195,13 +198,10 @@ cd %{tarballdir}
 #%patch22  -p2
 #%endif
 
-%patch101 -p1 -b .791626
-%patch102 -p1 -b .239254
-
 %patch200 -p1
 
 #
-%patch1000 -p1 -b .disable-pdfjs
+#patch1000 -p1 -b .disable-pdfjs
 %patch2000 -p1 -b .vine
 
 %{__rm} -f .mozconfig
@@ -282,7 +282,7 @@ cd %{tarballdir}
 
 # set up our prefs and add it to the package manifest file, so it gets pulled in
 # to omni.jar which gets created during make install
-%global MOZ_PREF_DIR defaults/pref
+%global MOZ_PREF_DIR browser/defaults/preferences
 %{__cat} %{SOURCE12} | \
   sed -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > objdir/dist/bin/%{MOZ_PREF_DIR}/all-vine.js
 # This sed call "replaces" firefox.js with all-vine.js, newline, and itself (&)
@@ -292,8 +292,8 @@ cd %{tarballdir}
     browser/installer/package-manifest.in
 	
 # set up our default bookmarks
-%{__install} -p -D -m 664 %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/defaults/profile/US/bookmarks.html
-%{__install} -p -D -m 664 %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/defaults/profile/bookmarks.html
+%{__install} -p -D -m 664 %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/browser/defaults/profile/US/bookmarks.html
+%{__install} -p -D -m 664 %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/browser/defaults/profile/bookmarks.html
 
 # Make sure locale works for langpacks
 %{__cat} > objdir/dist/bin/%{MOZ_PREF_DIR}/firefox-l10n.js << EOF
@@ -358,14 +358,14 @@ for langpack in `ls firefox-langpacks/*.xpi`; do
   find $extensionID -type f | xargs chmod 644
 
   sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
-     $extensionID/chrome/$language/locale/branding/browserconfig.properties
+     $extensionID/browser/chrome/$language/locale/branding/browserconfig.properties
 
   sed -i \
      -e "s|Mozilla Firefox|Fx ウェブブラウザ|g" \
      -e "s|Firefox|Fx ウェブブラウザ|g" \
      -e "s|Mozilla|Project Vine|g" \
      -e 's|\(.*trademarkInfo.part1.*"\).*">|\1Vine Linux および Vine Linux ロゴは Project Vine および有限会社ヴァインカーブの日本およびその他の国における商標です。">|g' \
-     $extensionID/chrome/$language/locale/branding/brand.*
+     $extensionID/browser/chrome/$language/locale/branding/brand.*
 
   cd $extensionID
   zip -r9mX ../${extensionID}.xpi *
@@ -377,6 +377,11 @@ for langpack in `ls firefox-langpacks/*.xpi`; do
 done
 %{__rm} -rf firefox-langpacks
 
+# Keep compatibility with the old preference location 
+%{__mkdir_p} $RPM_BUILD_ROOT/%{ffdir}/defaults/preferences
+%{__mkdir_p} $RPM_BUILD_ROOT/%{ffdir}/browser/defaults
+ln -s %{mozappdir}/defaults/preferences $RPM_BUILD_ROOT/%{ffdir}/browser/defaults/pref
+
 
 # System extensions
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_app_id}
@@ -389,12 +394,12 @@ done
 %{__mkdir_p} $RPM_BUILD_ROOT%{ffdir}/chrome/icons/default/
 for i in default16.png default32.png default48.png
 do
-  %{__cp} -f browser/branding/unofficial/$i $RPM_BUILD_ROOT%{ffdir}/chrome/icons/default/
+  %{__cp} -f browser/branding/unofficial/$i $RPM_BUILD_ROOT%{ffdir}/browser/chrome/icons/default/
 done
 for i in default16.png default32.png default48.png background.png \
          mozicon128.png document.ico firefox.ico
 do
-  %{__cp} -f browser/branding/unofficial/$i $RPM_BUILD_ROOT%{ffdir}/icons/
+  %{__cp} -f browser/branding/unofficial/$i $RPM_BUILD_ROOT%{ffdir}/browser/icons/
 done
 
 		
@@ -444,6 +449,11 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Sun May 19 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 21.0-1
+- update to 21.0
+- enable pdfjs
+- build with python27 on Vine6
+
 * Thu Apr 18 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 20.0.1-2
 - remove patch22