|
|
@@ -1,7 +1,7 @@
|
|
|
## do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 6.0
|
|
|
-%global geckomajor 6.0
|
|
|
-%global ffminor 2
|
|
|
+%global ffmajor 7.0
|
|
|
+%global geckomajor 7.0
|
|
|
+%global ffminor 1
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox-%{ffmajor}
|
|
|
%global langpackdir %{ffdir}/langpacks
|
|
|
@@ -77,6 +77,7 @@ Source2000: firefox-searchplugins-4.0-ja.tar.bz2
|
|
|
|
|
|
# build patches
|
|
|
Patch0: firefox-version.patch
|
|
|
+Patch1: firefox-7.0-cache-build.patch
|
|
|
|
|
|
# bugfix
|
|
|
Patch14: firefox-5.0-asciidel.patch
|
|
|
@@ -117,6 +118,7 @@ BuildRequires: nss-devel >= %{nss_version}
|
|
|
#BuildRequires: gecko-devel = %{gecko_version}
|
|
|
BuildRequires: libXt-devel
|
|
|
BuildRequires: libXrender-devel
|
|
|
+BuildRequires: libXScrnSaver-devel
|
|
|
BuildRequires: startup-notification-devel
|
|
|
%endif
|
|
|
BuildRequires: autoconf213
|
|
|
@@ -124,6 +126,7 @@ BuildRequires: freetype2-devel
|
|
|
BuildRequires: yasm
|
|
|
BuildRequires: unzip
|
|
|
BuildRequires: zip
|
|
|
+BuildRequires: bzip2-devel
|
|
|
|
|
|
Requires: desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
%if %{build_vine5}
|
|
|
@@ -160,7 +163,9 @@ cd %{tarballdir}
|
|
|
sed -e 's/__RPM_VERSION_INTERNAL__/%{ffmajor}/' \
|
|
|
%{P:%%PATCH0} > version.patch
|
|
|
%{__patch} -p1 -b --suffix .version < version.patch
|
|
|
-
|
|
|
+
|
|
|
+%patch1 -p1 -b .cache
|
|
|
+
|
|
|
%patch14 -p1 -b .asciidel
|
|
|
|
|
|
%patch26 -p1
|
|
|
@@ -338,8 +343,8 @@ for i in default16.png default32.png default48.png
|
|
|
do
|
|
|
%{__cp} -f browser/branding/unofficial/$i $RPM_BUILD_ROOT%{ffdir}/chrome/icons/default/
|
|
|
done
|
|
|
-for i in default16.png default32.png default48.png document.png \
|
|
|
- mozicon128.png
|
|
|
+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/
|
|
|
done
|
|
|
@@ -385,6 +390,12 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Sep 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 7.0.1-1
|
|
|
+- update to 7.0.1
|
|
|
+
|
|
|
+* Wed Sep 28 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 7.0-1
|
|
|
+- update to 7.0
|
|
|
+
|
|
|
* Tue Sep 06 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 6.0.2-1
|
|
|
- update to 6.0.2
|
|
|
|
daisuke