firefox:

- update mozconfig
- support vl5
- fix spec to build in parallel


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

f/firefox/firefox-vl.spec

@@ -10,11 +10,17 @@
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define homepage http://vinelinux.org/
 
+%define build_vine7 0
 %define build_vine6 0
 %define build_vine5 0
 
 # current firefox3 doesn't build on Vine Linux 4.x or older.
-%if "%{?_dist_release}" >= "vl6"
+%if "%{?_dist_release}" == "vl7"
+%define build_vine7 1
+%define build_vine6 1
+%define build_vine5 1
+%endif
+%if "%{?_dist_release}" == "vl6"
 %define build_vine6 1
 %define build_vine5 1
 %endif
@@ -22,12 +28,13 @@
 %define build_vine5 1
 %endif
 
-%define ffrelease 1%{?_dist_release}
+%define ffrelease 3%{?_dist_release}
 
 %define desktop_file_utils_version 0.6
-%define nspr_version 4.8.7
+%define nspr_version 4.8.8
 %define nss_version 3.13.1
 %define cairo_version 1.10.2-2
+#%define sqlite3_version 3.7.7.1
 %define libjpeg-turbo_version 1.1.0
 #define gecko_version %{geckomajor}%{?ffminor:.%{ffminor}}
 %define gecko_version %{geckomajor}
@@ -53,6 +60,7 @@ Source0:        firefox-%{version}.source.tar.bz2
 
 Source220:       mozconfig-firefox-vine5
 Source230:       mozconfig-firefox-vine6
+Source240:       mozconfig-firefox-vine7
 
 Source11:       firefox-vine-default-bookmarks.html
 Source12:       firefox-vine-default-prefs.js
@@ -105,18 +113,20 @@ BuildRequires:	libgnome-devel
 BuildRequires:  pango-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:  lcms-devel
-BuildRequires:  libvpx-devel
 BuildRequires:  libpng-devel
+%if %{build_vine7}
+BuildRequires:  nss-devel >= %{nss_version}
+#BuildRequires:  sqlite3-devel >= %{sqlite3_version}
+%endif
 %if %{build_vine6}
-BuildRequires:  libnotify-devel
+BuildRequires:  libvpx-devel
+BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  cairo-devel >= %{cairo_version}
 BuildRequires:  libjpeg-turbo-devel >= %{libjpeg-turbo_version}
-BuildRequires:  sqlite3-devel >= %{sqlite_version}
 %endif
 %if %{build_vine5}
-BuildRequires:  nspr-devel >= %{nspr_version}
-BuildRequires:  nss-devel >= %{nss_version}
 #BuildRequires:  gecko-devel = %{gecko_version}
+BuildRequires:  libnotify-devel
 BuildRequires:	libXt-devel
 BuildRequires:	libXrender-devel
 BuildRequires:  libXScrnSaver-devel
@@ -130,9 +140,13 @@ BuildRequires:  zip
 BuildRequires:  bzip2-devel
 
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
-%if %{build_vine5}
-Requires:	nspr >= %{nspr_version}
+%if %{build_vine7}
 Requires:	nss >= %{nss_version}
+%endif
+%if %{build_vine6}
+Requires:	nspr >= %{nspr_version}
+%endif
+%if %{build_vine5}
 #Requires:       gecko-libs >= %{gecko_version}
 %endif
 
@@ -174,10 +188,15 @@ cd %{tarballdir}
 
 %{__rm} -f .mozconfig
 
-%{__cp} %{SOURCE230} .mozconfig
-%if %build_vine5
+%if %build_vine7
+%{__cp} %{SOURCE240} .mozconfig
+%else
+%if %build_vine6
+%{__cp} -f %{SOURCE230} .mozconfig
+%else
 %{__cp} -f %{SOURCE220} .mozconfig
 %endif
+%endif
 
 #echo "ac_add_options --with-libxul-sdk=`pkg-config --variable=sdkdir libxul`" >> .mozconfig
 
@@ -218,7 +237,7 @@ MOZ_SMP_FLAGS=-j1
 # however builds tend to fail on other arches when building in parallel.
 %ifarch %{ix86} x86_64
 [ -z "$RPM_BUILD_NCPUS" ] && \
-     RPM_BUILD_NCPUS="/usr/bin/getconf _NPROCESSORS_ONLN"
+     RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
 [ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
 %endif
@@ -389,6 +408,14 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* 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
+
+* Thu Dec 22 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 9.0.1-2
+- update mozconfig
+  - build with internal nss on Vine6
+
 * Thu Dec 22 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 9.0.1-1
 - update to 9.0.1