firefox: update to 10.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5560 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 9.0
-%global geckomajor 9.0
-%global ffminor 1
+# do not include minor version number in MOZILLA_FIVE_HOME
+%global ffmajor 10.0
+%global geckomajor 10.0
+#%%global ffminor 
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
 %global langpackdir %{ffdir}/langpacks
@@ -28,7 +28,7 @@
 %define build_vine5 1
 %endif
 
-%define ffrelease 3%{?_dist_release}
+%define ffrelease 1%{?_dist_release}
 
 %define desktop_file_utils_version 0.6
 %define nspr_version 4.8.8
@@ -117,9 +117,9 @@ BuildRequires:  libpng-devel
 %if %{build_vine7}
 BuildRequires:  nss-devel >= %{nss_version}
 #BuildRequires:  sqlite3-devel >= %{sqlite3_version}
+#BuildRequires:  libvpx-devel >= 0.9.7
 %endif
 %if %{build_vine6}
-BuildRequires:  libvpx-devel
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  cairo-devel >= %{cairo_version}
 BuildRequires:  libjpeg-turbo-devel >= %{libjpeg-turbo_version}
@@ -152,14 +152,16 @@ Requires:	nspr >= %{nspr_version}
 
 Obsoletes:      phoenix, mozilla-firebird, MozillaFirebird
 Obsoletes:      firefox3
+Conflicts:	firefox-esr
 Provides:       webclient
 
-#AutoProv: 0
+AutoProv: 0
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100}
 
 Vendor: Project Vine
 Distribution: Vine Linux
+Packager: daisuke
 
 %description
 Fx Browser is an open-source web browser based on mozilla technology.
@@ -408,6 +410,13 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Feb 01 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 10.0-1
+- update to 10.0
+- use internal libvpx
+
+* Thu Jan 26 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 9.0.1-4
+- add AutoProv: no
+
 * Thu Dec 29 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 9.0.1-3
 - update mozconfig-firefox-vine5,6,7
 - fix spec to build in parallel