|
|
@@ -1,9 +1,8 @@
|
|
|
## do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
%global ffmajor 4.0
|
|
|
%global geckomajor 2.0
|
|
|
-##global ffminor
|
|
|
-##global ffversion %{ffmajor}.%{ffminor}
|
|
|
-%global ffversion %{ffmajor}
|
|
|
+%global ffminor 1
|
|
|
+%global ffversion %{ffmajor}.%{ffminor}
|
|
|
%define ffdir %{_libdir}/firefox-%{ffmajor}
|
|
|
%global langpackdir %{ffdir}/langpacks
|
|
|
%define tarballdir mozilla-2.0
|
|
|
@@ -23,15 +22,15 @@
|
|
|
%define build_vine5 1
|
|
|
%endif
|
|
|
|
|
|
-%define ffrelease 2%{?_dist_release}
|
|
|
+%define ffrelease 1%{?_dist_release}
|
|
|
|
|
|
%define desktop_file_utils_version 0.6
|
|
|
%define nspr_version 4.8.7
|
|
|
%define nss_version 3.12.9
|
|
|
%define cairo_version 1.10.2-2
|
|
|
%define libjpeg-turbo_version 1.1.0
|
|
|
-##define gecko_version %{geckomajor}.%{ffminor}
|
|
|
-%define gecko_version %{geckomajor}
|
|
|
+%define gecko_version %{geckomajor}.%{ffminor}
|
|
|
+#define gecko_version %{geckomajor}
|
|
|
|
|
|
ExclusiveArch: i386 i586 i686 x86_64 ia64 ppc s390 s390x
|
|
|
|
|
|
@@ -91,7 +90,7 @@ Patch2000: firefox-4.0-vine.patch
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
-BuildRequires: libpng-devel, libjpeg-devel
|
|
|
+BuildRequires: libpng-devel
|
|
|
BuildRequires: zlib-devel, zip
|
|
|
BuildRequires: libIDL-devel
|
|
|
BuildRequires: desktop-file-utils
|
|
|
@@ -114,6 +113,8 @@ BuildRequires: startup-notification-devel
|
|
|
%endif
|
|
|
BuildRequires: autoconf213
|
|
|
BuildRequires: freetype2-devel
|
|
|
+BuildRequires: yasm
|
|
|
+BuildRequires: unzip
|
|
|
|
|
|
Requires: desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
%if %{build_vine5}
|
|
|
@@ -236,7 +237,9 @@ export MOZ_APP_DISPLAYNAME="Fx for Vine Linux"
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
|
|
|
|
|
|
if [ "%{version}" != "%{ffmajor}" ]; then
|
|
|
- %{__mv} $RPM_BUILD_ROOT%{_libdir}/firefox-%{version} $RPM_BUILD_ROOT%{ffdir}
|
|
|
+ if [ -d "$RPM_BUILD_ROOT%{_libdir}/firefox-%{version}" ]; then
|
|
|
+ %{__mv} $RPM_BUILD_ROOT%{_libdir}/firefox-%{version} $RPM_BUILD_ROOT%{ffdir}
|
|
|
+ fi
|
|
|
fi
|
|
|
|
|
|
# install icons
|
|
|
@@ -364,6 +367,11 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Mon May 23 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 4.0.1-1
|
|
|
+- update to 4.0.1
|
|
|
+- remove MimeType from firefox-safe-mode.desktop
|
|
|
+- add BR: yasm, unzip
|
|
|
+
|
|
|
* Tue Mar 31 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 4.0-2
|
|
|
- add "--disable-ipc" on non-x86 architecture
|
|
|
- update parallel build option
|
daisuke