rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 7

Browse Source
This commit is contained in:
Jan Horak 2011-09-27 18:18:08 +02:00
parent 6c8be791ec
commit d2cc79302e
5 changed files with 63 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
.gitignore vendored
View File

@ -1,32 +1,26 @@
firefox-langpacks-3.6.4-20100622.tar.bz2 firefox-langpacks-3.6.4-20100622.tar.bz2
firefox-3.6.4.source.tar.bz2 firefox-3.6.4.source.tar.bz2
/firefox-4.0b4.source.tar.bz2 /firefox-3.6.9.source.tar.bz2
/firefox-langpacks-4.0b4-20100830.tar.bz2 /firefox-langpacks-3.6.9-20100906.tar.bz2
/firefox-4.0b6.source.tar.bz2 /firefox-3.6.11.source.tar.bz2
/firefox-langpacks-4.0b6-20100921.tar.bz2 /firefox-langpacks-3.6.11-20101019.tar.bz2
/firefox-4.0b7.source.tar.bz2 /firefox-3.6.12.source.tar.bz2
/firefox-langpacks-4.0b7-20101111.tar.bz2 /firefox-langpacks-3.6.12-20101027.tar.bz2
/firefox-4.0b8.source.tar.bz2 /firefox-3.6.13.source.tar.bz2
/firefox-langpacks-4.0b8-20101221.tar.bz2 /firefox-langpacks-3.6.13-20101210.tar.bz2
/firefox-4.0b9.source.tar.bz2 /firefox-3.6.14.source.tar.bz2
/firefox-langpacks-4.0b9-20110111.tar.bz2 /firefox-langpacks-3.6.14-20110301.tar.bz2
/firefox-4.0b10.source.tar.bz2 /firefox-3.6.15.source.tar.bz2
/firefox-langpacks-4.0b10-20110125.tar.bz2 /firefox-langpacks-3.6.15-20110307.tar.bz2
/firefox-4.0b11.source.tar.bz2 /firefox-3.6.16.source.tar.bz2
/firefox-langpacks-4.0b11-20110208.tar.xz /firefox-langpacks-3.6.16-20110322.tar.xz
/firefox-4.0b12.source.tar.bz2 /firefox-langpacks-3.6.17-20110428.tar.xz
/firefox-langpacks-4.0b12-20110225.tar.xz /firefox-3.6.17.source.tar.bz2
/firefox-4.0rc1.source.tar.bz2 /firefox-3.6.18.source.tar.bz2
/firefox-langpacks-4.0rc1-20110309.tar.xz /firefox-langpacks-3.6.18-20110621.tar.xz
/firefox-4.0rc2.source.tar.bz2 /firefox-3.6.22.source.tar.bz2
/firefox-langpacks-4.0rc2-20110318.tar.xz /firefox-langpacks-3.6.22-20110906.tar.xz
/firefox-4.0.source.tar.bz2 /firefox-langpacks-3.6.20-20110816.tar.xz
/firefox-langpacks-4.0-20110322.tar.xz /firefox-3.6.20.source.tar.bz2
/firefox-4.0.1.source.tar.bz2 /firefox-7.0.source.tar.bz2
/firefox-langpacks-4.0.1-20110428.tar.xz /firefox-langpacks-7.0-20110927.tar.xz
/firefox-5.0.source.tar.bz2
/firefox-langpacks-5.0-20110621.tar.xz
/firefox-6.0.source.tar.bz2
/firefox-langpacks-6.0-20110816.tar.xz
/firefox-6.0.2.source.tar.bz2
/firefox-langpacks-6.0.2-20110906.tar.xz

25
firefox-install-dir.patch Normal file
View File

@ -0,0 +1,25 @@
diff -up firefox-7.0/mozilla-beta/config/autoconf.mk.in.old firefox-7.0/mozilla-beta/config/autoconf.mk.in
--- firefox-7.0/mozilla-beta/config/autoconf.mk.in.old 2011-08-31 21:16:06.000000000 +0200
+++ firefox-7.0/mozilla-beta/config/autoconf.mk.in 2011-09-06 12:08:00.859392269 +0200
@@ -68,7 +68,7 @@ datadir = @datadir@
mandir = @mandir@
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
DIST = $(DEPTH)/dist
diff -up firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in.old firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in
--- firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in.old 2011-08-31 21:16:16.000000000 +0200
+++ firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in 2011-09-06 12:08:39.463500899 +0200
@@ -61,7 +61,7 @@ libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
TOP_DIST = @TOP_DIST@
diff -up firefox-7.0/mozilla-beta/Makefile.in.old firefox-7.0/mozilla-beta/Makefile.in

11
firefox-version.patch
View File

@ -1,11 +0,0 @@
--- mozilla-release/browser/installer/Makefile.in.version 2011-08-11 23:40:51.000000000 +0200
+++ mozilla-release/browser/installer/Makefile.in 2011-08-16 15:29:42.132101348 +0200
@@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
+MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__"
+
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in

10
firefox.sh.in
View File

@ -50,17 +50,17 @@ esac
MOZ_FIREFOX_FILE="firefox" MOZ_FIREFOX_FILE="firefox"
if [ ! -r $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE ]; then if [ ! -r $MOZ_LIB_DIR/firefox/$MOZ_FIREFOX_FILE ]; then
if [ ! -r $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE ]; then if [ ! -r $SECONDARY_LIB_DIR/firefox/$MOZ_FIREFOX_FILE ]; then
echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE not found" echo "Error: $MOZ_LIB_DIR/firefox/$MOZ_FIREFOX_FILE not found"
if [ -d $SECONDARY_LIB_DIR ]; then if [ -d $SECONDARY_LIB_DIR ]; then
echo " $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/$MOZ_FIREFOX_FILE not found" echo " $SECONDARY_LIB_DIR/firefox/$MOZ_FIREFOX_FILE not found"
fi fi
exit 1 exit 1
fi fi
MOZ_LIB_DIR="$SECONDARY_LIB_DIR" MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
fi fi
MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox"
MOZ_XUL_DIR="$MOZ_LIB_DIR/XULRUNNER_DIRECTORY" MOZ_XUL_DIR="$MOZ_LIB_DIR/XULRUNNER_DIRECTORY"
MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks" MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"

21
firefox.spec
View File

@ -9,13 +9,12 @@
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%global firefox_dir_ver 6 %global gecko_version 7.0
%global gecko_version 6.0.2
%global alpha_version 0 %global alpha_version 0
%global beta_version 0 %global beta_version 0
%global rc_version 0 %global rc_version 0
%global mozappdir %{_libdir}/%{name}-%{firefox_dir_ver} %global mozappdir %{_libdir}/%{name}
%global langpackdir %{mozappdir}/langpacks %global langpackdir %{mozappdir}/langpacks
%global tarballdir mozilla-release %global tarballdir mozilla-release
@ -51,7 +50,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2 Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2
%if %{build_langpacks} %if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20110906.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20110927.tar.xz
%endif %endif
Source10: firefox-mozconfig Source10: firefox-mozconfig
Source11: firefox-mozconfig-branded Source11: firefox-mozconfig-branded
@ -62,7 +61,7 @@ Source21: firefox.sh.in
Source23: firefox.1 Source23: firefox.1
#Build patches #Build patches
Patch0: firefox-version.patch Patch0: firefox-install-dir.patch
Patch1: firefox-6.0-cache-build.patch Patch1: firefox-6.0-cache-build.patch
# Fedora patches # Fedora patches
@ -106,12 +105,8 @@ compliance, performance and portability.
%setup -q -c %setup -q -c
cd %{tarballdir} cd %{tarballdir}
sed -e 's/__RPM_VERSION_INTERNAL__/%{firefox_dir_ver}/' %{P:%%PATCH0} \
> version.patch
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
# Build patches # Build patches
%patch0 -p2 -b .install-dir
%patch1 -p2 -b .cache %patch1 -p2 -b .cache
# For branding specific patches. # For branding specific patches.
@ -221,8 +216,7 @@ desktop-file-install --vendor mozilla \
# set up the firefox start script # set up the firefox start script
%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox %{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,g"` XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,g"`
%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{firefox_dir_ver},g' \ %{__cat} %{SOURCE21} | %{__sed} -e "s,XULRUNNER_DIRECTORY,$XULRUNNER_DIR,g" > \
| %{__sed} -e "s,XULRUNNER_DIRECTORY,$XULRUNNER_DIR,g" > \
$RPM_BUILD_ROOT%{_bindir}/firefox $RPM_BUILD_ROOT%{_bindir}/firefox
%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox
@ -349,6 +343,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Sep 27 2011 Jan Horak <jhorak@redhat.com> - 7.0
- Update to 7.0
* Tue Sep 6 2011 Jan Horak <jhorak@redhat.com> - 6.0.2-1 * Tue Sep 6 2011 Jan Horak <jhorak@redhat.com> - 6.0.2-1
- Update to 6.0.2 - Update to 6.0.2