|
|
@@ -1,13 +1,13 @@
|
|
|
## do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%define ffmajor 3.6
|
|
|
-%define ffversion %{ffmajor}.8
|
|
|
+%global ffmajor 3.6
|
|
|
+%global geckomajor 1.9.2
|
|
|
+%global ffminor 9
|
|
|
+%global ffversion %{ffmajor}.%{ffminor}
|
|
|
%define ffdir %{_libdir}/firefox-%{ffmajor}
|
|
|
%define tarballdir mozilla-1.9.2
|
|
|
|
|
|
%define build_vine6 0
|
|
|
%define build_vine5 0
|
|
|
-# Vine Linux 4.x does not support now.
|
|
|
-%define build_vine4 0
|
|
|
|
|
|
# current firefox3 doesn't build on Vine Linux 4.x or older.
|
|
|
%if "%{?_dist_release}" == "vl6"
|
|
|
@@ -17,16 +17,13 @@
|
|
|
%if "%{?_dist_release}" == "vl5"
|
|
|
%define build_vine5 1
|
|
|
%endif
|
|
|
-%if "%{?_dist_release}" == "vl4"
|
|
|
-%define build_vine4 1
|
|
|
-%endif
|
|
|
|
|
|
%define ffrelease 1%{?_dist_release}
|
|
|
|
|
|
%define desktop_file_utils_version 0.6
|
|
|
-%define nspr_version 4.8
|
|
|
+%define nspr_version 3.8.6
|
|
|
%define nss_version 3.12.3
|
|
|
-%define gecko_version 1.9.2.8
|
|
|
+%define gecko_version %{geckomajor}.%{ffminor}
|
|
|
|
|
|
ExclusiveArch: i386 i586 i686 x86_64 ia64 ppc s390 s390x
|
|
|
|
|
|
@@ -40,7 +37,6 @@ License: MPL/LGPL
|
|
|
Group: Applications/Internet
|
|
|
Source0: firefox-%{version}.source.tar.bz2
|
|
|
|
|
|
-Source210: mozconfig-firefox36-vine4
|
|
|
Source220: mozconfig-firefox36-vine5
|
|
|
Source230: mozconfig-firefox36-vine6
|
|
|
|
|
|
@@ -142,9 +138,6 @@ cd %{tarballdir}
|
|
|
%if %build_vine5
|
|
|
%{__cp} -f %{SOURCE220} .mozconfig
|
|
|
%endif
|
|
|
-%if %build_vine4
|
|
|
-%{__cp} -f %{SOURCE210} .mozconfig
|
|
|
-%endif
|
|
|
|
|
|
%if %build_vine5
|
|
|
echo "ac_add_options --with-libxul-sdk=`pkg-config --variable=sdkdir libxul`" >> .mozconfig
|
|
|
@@ -330,6 +323,9 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Sep 14 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 3.6.9-1
|
|
|
+- update to 3.6.9
|
|
|
+
|
|
|
* Mon Jul 26 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 3.6.8-1
|
|
|
- update to 3.6.8
|
|
|
|
daisuke