|
|
@@ -1,10 +1,15 @@
|
|
|
## do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 3.6
|
|
|
-%global geckomajor 1.9.2
|
|
|
-%global ffminor 15
|
|
|
-%global ffversion %{ffmajor}.%{ffminor}
|
|
|
+%global ffmajor 4.0
|
|
|
+%global geckomajor 2.0
|
|
|
+##global ffminor
|
|
|
+##global ffversion %{ffmajor}.%{ffminor}
|
|
|
+%global ffversion %{ffmajor}
|
|
|
%define ffdir %{_libdir}/firefox-%{ffmajor}
|
|
|
-%define tarballdir mozilla-1.9.2
|
|
|
+%global langpackdir %{ffdir}/langpacks
|
|
|
+%define tarballdir mozilla-2.0
|
|
|
+
|
|
|
+%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
|
|
|
+%define homepage http://vinelinux.org/
|
|
|
|
|
|
%define build_vine6 0
|
|
|
%define build_vine5 0
|
|
|
@@ -21,14 +26,17 @@
|
|
|
%define ffrelease 1%{?_dist_release}
|
|
|
|
|
|
%define desktop_file_utils_version 0.6
|
|
|
-%define nspr_version 3.8.6
|
|
|
-%define nss_version 3.12.3
|
|
|
-%define gecko_version %{geckomajor}.%{ffminor}
|
|
|
+%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}
|
|
|
|
|
|
ExclusiveArch: i386 i586 i686 x86_64 ia64 ppc s390 s390x
|
|
|
|
|
|
-Summary: Fx3.6 for Vine Linux
|
|
|
-Summary(ja): Fx3.6 for Vine Linux
|
|
|
+Summary: Fx4 for Vine Linux
|
|
|
+Summary(ja): Fx4 for Vine Linux
|
|
|
Name: firefox
|
|
|
Version: %{ffversion}
|
|
|
Release: %{ffrelease}
|
|
|
@@ -37,33 +45,32 @@ License: MPL/LGPL
|
|
|
Group: Applications/Internet
|
|
|
Source0: firefox-%{version}.source.tar.bz2
|
|
|
|
|
|
-Source220: mozconfig-firefox36-vine5
|
|
|
-Source230: mozconfig-firefox36-vine6
|
|
|
+Source220: mozconfig-firefox4-vine5
|
|
|
+Source230: mozconfig-firefox4-vine6
|
|
|
|
|
|
Source11: firefox-vine-default-bookmarks.html
|
|
|
Source12: firefox-vine-default-prefs.js
|
|
|
Source21: firefox.vine.sh.in
|
|
|
Source22: firefox.png
|
|
|
-Source23: fx36-about.png
|
|
|
+Source23: fx-about.png
|
|
|
+Source24: fx-about-wordmark.png
|
|
|
Source25: firefox.desktop
|
|
|
Source26: firefox-safe-mode.desktop
|
|
|
Source30: firefox.1
|
|
|
Source50: firefox-xremote-client.sh.in
|
|
|
-Source55: firefox-rebuild-databases.pl.vine.in
|
|
|
Source100: find-external-requires
|
|
|
|
|
|
# locale sources
|
|
|
%define MOZ_BUILD_LOCALES "ja"
|
|
|
-Source1000: firefox-%{ffversion}-ja.tar.bz2
|
|
|
-Source1010: firefox-3.6-unofficial-branding-fx.tar.bz2
|
|
|
-
|
|
|
+Source1000: firefox-%{ffversion}-langpacks.tar.bz2
|
|
|
+Source1010: firefox-unofficial-branding-fx4.tar.bz2
|
|
|
#
|
|
|
-Source2000: firefox-searchplugins-3.0-ja.tar.bz2
|
|
|
+Source2000: firefox-searchplugins-4.0-ja.tar.bz2
|
|
|
|
|
|
# upstream patch
|
|
|
|
|
|
# build patches
|
|
|
-Patch1: firefox-2.0-link-layout.patch
|
|
|
+Patch0: firefox-version.patch
|
|
|
|
|
|
# customization patches
|
|
|
Patch26: firefox-1.5-default-a4-paper.patch
|
|
|
@@ -73,7 +80,7 @@ Patch26: firefox-1.5-default-a4-paper.patch
|
|
|
Patch1000: firefox-3.6.2-sjisalias.patch
|
|
|
|
|
|
# vine customization patch
|
|
|
-Patch2000: firefox-3.6-vine.patch
|
|
|
+Patch2000: firefox-4.0-vine.patch
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
@@ -87,6 +94,8 @@ BuildRequires: libgnome-devel
|
|
|
BuildRequires: pango-devel
|
|
|
%if %{build_vine6}
|
|
|
BuildRequires: libnotify-devel
|
|
|
+BuildRequires: cairo-devel >= %{cairo_version}
|
|
|
+BuildRequires: libjpeg-turbo-devel >= %{libjpeg-turbo_version}
|
|
|
%endif
|
|
|
%if %{build_vine5}
|
|
|
BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
@@ -121,11 +130,13 @@ This is unofficial build of firefox browser.
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%prep
|
|
|
-%setup -q -n %{name}-%{version} -c -b 1000 -b 1010
|
|
|
+%setup -q -n %{name}-%{version} -c
|
|
|
cd %{tarballdir}
|
|
|
|
|
|
-%patch1 -p1 -b .link-layout
|
|
|
-
|
|
|
+sed -e 's/__RPM_VERSION_INTERNAL__/%{ffmajor}/' \
|
|
|
+ %{P:%%PATCH0} > version.patch
|
|
|
+%{__patch} -p1 -b --suffix .version < version.patch
|
|
|
+
|
|
|
%patch26 -p1
|
|
|
|
|
|
#
|
|
|
@@ -144,12 +155,13 @@ echo "ac_add_options --with-libxul-sdk=`pkg-config --variable=sdkdir libxul`" >>
|
|
|
%endif
|
|
|
|
|
|
# update searchplugins
|
|
|
-%{__tar} xjvf %{SOURCE2000} -C ../l10n/ja/browser/
|
|
|
+%{__tar} xjvf %{SOURCE2000} -C browser/locales/en-US/
|
|
|
|
|
|
# setup unofficial branding logos
|
|
|
+%{__tar} xjvf %{SOURCE1010}
|
|
|
%{__cp} %{SOURCE23} browser/branding/unofficial/content/about.png
|
|
|
-#%{__cp} browser/branding/unofficial/content/*.png browser/base/branding/
|
|
|
-%{__cp} ../l10n/ja/browser/branding/unofficial/brand.* browser/branding/unofficial/locales/en-US/
|
|
|
+%{__cp} %{SOURCE24} browser/branding/unofficial/content/about-wordmark.png
|
|
|
+%{__cp} browser/branding/unofficial/locales/en-US/brand.* browser/branding/nightly/locales/en-US/
|
|
|
|
|
|
|
|
|
#---------------------------------------------------------------------
|
|
|
@@ -163,7 +175,6 @@ MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-Wall//')
|
|
|
export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
|
|
|
export MOZILLA_OFFICIAL=1
|
|
|
export BUILD_OFFICIAL=1
|
|
|
-#export MOZ_APP_DISPLAYNAME="Firefox Community Edition"
|
|
|
export MOZ_APP_DISPLAYNAME="Fx for Vine Linux"
|
|
|
|
|
|
%ifarch ppc ppc64 s390 s390x
|
|
|
@@ -181,14 +192,14 @@ export MAKE="gmake %{moz_mflags}"
|
|
|
%__make -f client.mk build
|
|
|
|
|
|
# build locales
|
|
|
-LOCALEDIRS=`find . -print | grep 'locales/Makefile$' | \
|
|
|
- sed -e 's|\./\(.*\)/locales/.*|\1|g'`
|
|
|
-for dir in $LOCALEDIRS
|
|
|
-do
|
|
|
- for lang in %{MOZ_BUILD_LOCALES} ; do
|
|
|
- make -C $dir/locales AB_CD=$lang
|
|
|
- done
|
|
|
-done
|
|
|
+#LOCALEDIRS=`find . -print | grep 'locales/Makefile$' | \
|
|
|
+# sed -e 's|\./\(.*\)/locales/.*|\1|g'`
|
|
|
+#for dir in $LOCALEDIRS
|
|
|
+#do
|
|
|
+# for lang in %{MOZ_BUILD_LOCALES} ; do
|
|
|
+# make -C $dir/locales AB_CD=$lang
|
|
|
+# done
|
|
|
+#done
|
|
|
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
@@ -196,10 +207,25 @@ done
|
|
|
cd %{tarballdir}
|
|
|
%{__rm} -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
-#cd xpinstall/packager/
|
|
|
-#%{__make} MOZILLA_BIN="\$(DIST)/bin/firefox-bin" STRIP=/bin/true
|
|
|
-#cd -
|
|
|
+# set up our prefs and add it to the package manifest file, so it gets pulled in
|
|
|
+# to omni.jar which gets created during make install
|
|
|
+%{__cat} %{SOURCE12} | sed -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > dist/bin/defaults/preferences/all-vine.js
|
|
|
+# This sed call "replaces" firefox.js with all-vine.js, newline, and itself (&)
|
|
|
+# having the net effect of prepending all-vine.js above firefox.js
|
|
|
+%{__sed} -i -e\
|
|
|
+ 's|@BINPATH@/@PREF_DIR@/firefox.js|@BINPATH@/@PREF_DIR@/all-vine.js\n&|' \
|
|
|
+ browser/installer/package-manifest.in
|
|
|
+
|
|
|
+# set up our default bookmarks
|
|
|
+%{__install} -p -D -m 664 %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/defaults/profile/US/bookmarks.html
|
|
|
+%{__install} -p -D -m 664 %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/defaults/profile/bookmarks.html
|
|
|
+
|
|
|
+# Make sure locale works for langpacks
|
|
|
+%{__cat} > dist/bin/defaults/preferences/firefox-l10n.js << EOF
|
|
|
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
|
|
|
+EOF
|
|
|
|
|
|
+export MOZ_APP_DISPLAYNAME="Fx for Vine Linux"
|
|
|
%{__make} install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
|
|
|
@@ -221,28 +247,25 @@ do
|
|
|
done
|
|
|
|
|
|
# set up the firefox start script
|
|
|
+#%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
|
|
|
+#%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{ffmajor},g' > \
|
|
|
+# $RPM_BUILD_ROOT%{_bindir}/firefox
|
|
|
+#%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox
|
|
|
%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
|
|
|
-%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{ffmajor},g' > \
|
|
|
+XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,g"`
|
|
|
+%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{ffmajor},g' \
|
|
|
+ | %{__sed} -e "s,XULRUNNER_DIRECTORY,$XULRUNNER_DIR,g" > \
|
|
|
$RPM_BUILD_ROOT%{_bindir}/firefox
|
|
|
%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox
|
|
|
|
|
|
-# set up our default preferences
|
|
|
-%{__cat} %{SOURCE12} | sed -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > vine-default-prefs
|
|
|
-%{__cat} vine-default-prefs >> $RPM_BUILD_ROOT/%{ffdir}/defaults/preferences/firefox.js
|
|
|
-%{__rm} vine-default-prefs
|
|
|
-
|
|
|
-# set up our default bookmarks
|
|
|
-%{__install} -p -D -m 664 %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/defaults/profile/US/bookmarks.html
|
|
|
-%{__install} -p -D -m 664 %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/defaults/profile/bookmarks.html
|
|
|
-
|
|
|
%{__cat} %{SOURCE50} | sed -e 's,FFDIR,%{ffdir},g' -e 's,LIBDIR,%{_libdir},g' > \
|
|
|
$RPM_BUILD_ROOT%{ffdir}/firefox-xremote-client
|
|
|
|
|
|
-%{__chmod} 755 $RPM_BUILD_ROOT%{ffdir}/firefox-xremote-client
|
|
|
+# Remove binary stub from xulrunner
|
|
|
+%{__rm} -rf $RPM_BUILD_ROOT/%{ffdir}/firefox
|
|
|
+
|
|
|
+#%{__chmod} 755 $RPM_BUILD_ROOT%{ffdir}/firefox-xremote-client
|
|
|
%{__install} -p -D -m 664 %{SOURCE30} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1
|
|
|
-%{__cat} %{SOURCE55} | sed -e 's,FFDIR,%{ffdir},g' > \
|
|
|
- $RPM_BUILD_ROOT/%{ffdir}/firefox-rebuild-databases.pl
|
|
|
-%{__chmod} 755 $RPM_BUILD_ROOT/%{ffdir}/firefox-rebuild-databases.pl
|
|
|
|
|
|
%{__rm} -f $RPM_BUILD_ROOT%{ffdir}/firefox-config
|
|
|
|
|
|
@@ -251,9 +274,42 @@ find . -maxdepth 1 -mindepth 1 -name "*" -type d -exec %{__rm} -rf {} \;
|
|
|
cd -
|
|
|
|
|
|
# install locales
|
|
|
-for lang in %{MOZ_BUILD_LOCALES} ; do
|
|
|
- %{__install} -p -D -m 664 dist/bin/chrome/$lang.{jar,manifest} $RPM_BUILD_ROOT%{ffdir}/chrome/
|
|
|
+#for lang in %{MOZ_BUILD_LOCALES} ; do
|
|
|
+# %{__install} -p -D -m 664 dist/bin/chrome/$lang.{jar,manifest} $RPM_BUILD_ROOT%{ffdir}/chrome/
|
|
|
+#done
|
|
|
+
|
|
|
+
|
|
|
+echo > ../%{name}.lang
|
|
|
+# Extract langpacks, make any mods needed, repack the langpack, and install it.
|
|
|
+%{__mkdir_p} $RPM_BUILD_ROOT%{langpackdir}
|
|
|
+%{__tar} xf %{SOURCE1000}
|
|
|
+for langpack in `ls firefox-langpacks/*.xpi`; do
|
|
|
+ language=`basename $langpack .xpi`
|
|
|
+ extensionID=langpack-$language@firefox.mozilla.org
|
|
|
+ %{__mkdir_p} $extensionID
|
|
|
+ unzip $langpack -d $extensionID
|
|
|
+ find $extensionID -type f | xargs chmod 644
|
|
|
+
|
|
|
+ sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
|
|
|
+ $extensionID/chrome/$language/locale/branding/browserconfig.properties
|
|
|
+
|
|
|
+ cd $extensionID
|
|
|
+ zip -r9mX ../${extensionID}.xpi *
|
|
|
+ cd -
|
|
|
+
|
|
|
+ %{__install} -m 644 ${extensionID}.xpi $RPM_BUILD_ROOT%{langpackdir}
|
|
|
+ language=`echo $language | sed -e 's/-/_/g'`
|
|
|
+ echo "%%lang($language) %{langpackdir}/${extensionID}.xpi" >> ../%{name}.lang
|
|
|
done
|
|
|
+%{__rm} -rf firefox-langpacks
|
|
|
+
|
|
|
+
|
|
|
+# System extensions
|
|
|
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_app_id}
|
|
|
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}
|
|
|
+
|
|
|
+# Copy over the LICENSE
|
|
|
+%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT/%{ffdir}
|
|
|
|
|
|
# another bug fixed by looking at the debian package
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT%{ffdir}/chrome/icons/default/
|
|
|
@@ -271,10 +327,6 @@ done
|
|
|
# own mozilla plugin dir (#135050)
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
|
|
|
|
|
|
-# ghost files
|
|
|
-touch $RPM_BUILD_ROOT%{ffdir}/components/compreg.dat
|
|
|
-touch $RPM_BUILD_ROOT%{ffdir}/components/xpti.dat
|
|
|
-
|
|
|
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
@@ -286,25 +338,17 @@ touch $RPM_BUILD_ROOT%{ffdir}/components/xpti.dat
|
|
|
%post
|
|
|
update-desktop-database %{_datadir}/applications >& /dev/null ||:
|
|
|
|
|
|
-umask 022
|
|
|
-%{ffdir}/firefox-rebuild-databases.pl || :
|
|
|
-
|
|
|
-# create extensions directory
|
|
|
-HOME=/root %{ffdir}/firefox -register ||:
|
|
|
-
|
|
|
%postun
|
|
|
update-desktop-database %{_datadir}/applications>& /dev/null ||:
|
|
|
umask 022
|
|
|
-# was this an upgrade?
|
|
|
-if [ $1 -gt 1 ]; then
|
|
|
- %{ffdir}/firefox-rebuild-databases.pl ||:
|
|
|
-fi
|
|
|
|
|
|
%preun
|
|
|
# is it a final removal?
|
|
|
if [ $1 -eq 0 ]; then
|
|
|
%{__rm} -rf %{ffdir}/components
|
|
|
%{__rm} -rf %{ffdir}/extensions
|
|
|
+ %{__rm} -rf %{ffdir}/plugins
|
|
|
+ %{__rm} -rf %{langpackdir}
|
|
|
fi
|
|
|
|
|
|
%files
|
|
|
@@ -317,12 +361,18 @@ fi
|
|
|
%{ffdir}
|
|
|
%{_libdir}/mozilla
|
|
|
|
|
|
-%ghost %{ffdir}/components/compreg.dat
|
|
|
-%ghost %{ffdir}/components/xpti.dat
|
|
|
-
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Mar 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 4.0-1
|
|
|
+- update to 4.0
|
|
|
+- BR: libjpeg-turbo-devel >= 1.1.0
|
|
|
+- BR: nspr-devel >= 4.8.7
|
|
|
+- BR: nss-devel >= 3.12.9
|
|
|
+- BR: cairo-devel >= 1.10.2-2
|
|
|
+- use langpacks.xpi instead of l10n source
|
|
|
+- update firefox startup script
|
|
|
+
|
|
|
* Thu Mar 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.6.15-1
|
|
|
- update to 3.6.15
|
|
|
|
daisuke
