|
|
@@ -1,11 +1,11 @@
|
|
|
## do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 4.0
|
|
|
-%global geckomajor 2.0
|
|
|
-%global ffminor 1
|
|
|
-%global ffversion %{ffmajor}.%{ffminor}
|
|
|
+%global ffmajor 5.0
|
|
|
+%global geckomajor 5.0
|
|
|
+#global ffminor 1
|
|
|
+%global ffversion %{ffmajor}
|
|
|
%define ffdir %{_libdir}/firefox-%{ffmajor}
|
|
|
%global langpackdir %{ffdir}/langpacks
|
|
|
-%define tarballdir mozilla-2.0
|
|
|
+%define tarballdir mozilla-release
|
|
|
|
|
|
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
|
|
|
%define homepage http://vinelinux.org/
|
|
|
@@ -29,8 +29,8 @@
|
|
|
%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
|
|
|
|
|
|
@@ -41,8 +41,8 @@ ExclusiveArch: i386 i586 i686 x86_64 ia64 ppc s390 s390x
|
|
|
%define separated_plugins 0
|
|
|
%endif
|
|
|
|
|
|
-Summary: Fx4 for Vine Linux
|
|
|
-Summary(ja): Fx4 for Vine Linux
|
|
|
+Summary: Fx Browser
|
|
|
+Summary(ja): Fx ウェブブラウザ
|
|
|
Name: firefox
|
|
|
Version: %{ffversion}
|
|
|
Release: %{ffrelease}
|
|
|
@@ -51,8 +51,8 @@ License: MPL/LGPL
|
|
|
Group: Applications/Internet
|
|
|
Source0: firefox-%{version}.source.tar.bz2
|
|
|
|
|
|
-Source220: mozconfig-firefox4-vine5
|
|
|
-Source230: mozconfig-firefox4-vine6
|
|
|
+Source220: mozconfig-firefox5-vine5
|
|
|
+Source230: mozconfig-firefox5-vine6
|
|
|
|
|
|
Source11: firefox-vine-default-bookmarks.html
|
|
|
Source12: firefox-vine-default-prefs.js
|
|
|
@@ -69,7 +69,7 @@ Source100: find-external-requires
|
|
|
# locale sources
|
|
|
%define MOZ_BUILD_LOCALES "ja"
|
|
|
Source1000: firefox-%{ffversion}-langpacks.tar.bz2
|
|
|
-Source1010: firefox-unofficial-branding-fx4.tar.bz2
|
|
|
+Source1010: firefox-unofficial-branding-fx.tar.bz2
|
|
|
#
|
|
|
Source2000: firefox-searchplugins-4.0-ja.tar.bz2
|
|
|
|
|
|
@@ -78,15 +78,18 @@ Source2000: firefox-searchplugins-4.0-ja.tar.bz2
|
|
|
# build patches
|
|
|
Patch0: firefox-version.patch
|
|
|
|
|
|
+# bugfix
|
|
|
+Patch14: firefox-5.0-asciidel.patch
|
|
|
+
|
|
|
# customization patches
|
|
|
Patch26: firefox-1.5-default-a4-paper.patch
|
|
|
|
|
|
## Vine patch
|
|
|
# http://bugzilla.mozilla.org/show_bug.cgi?id=179248
|
|
|
-Patch1000: firefox-3.6.2-sjisalias.patch
|
|
|
+#Patch1000: firefox-3.6.2-sjisalias.patch
|
|
|
|
|
|
# vine customization patch
|
|
|
-Patch2000: firefox-4.0-vine.patch
|
|
|
+Patch2000: firefox-5.0-vine.patch
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
@@ -98,15 +101,20 @@ BuildRequires: gtk2-devel
|
|
|
BuildRequires: gnome-vfs2-devel
|
|
|
BuildRequires: libgnome-devel
|
|
|
BuildRequires: pango-devel
|
|
|
+BuildRequires: alsa-lib-devel
|
|
|
+BuildRequires: lcms-devel
|
|
|
+BuildRequires: libvpx-devel
|
|
|
+BuildRequires: libpng-devel
|
|
|
%if %{build_vine6}
|
|
|
BuildRequires: libnotify-devel
|
|
|
BuildRequires: cairo-devel >= %{cairo_version}
|
|
|
BuildRequires: libjpeg-turbo-devel >= %{libjpeg-turbo_version}
|
|
|
+BuildRequires: sqlite3-devel >= %{sqlite_version}
|
|
|
%endif
|
|
|
%if %{build_vine5}
|
|
|
BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
BuildRequires: nss-devel >= %{nss_version}
|
|
|
-BuildRequires: gecko-devel = %{gecko_version}
|
|
|
+#BuildRequires: gecko-devel = %{gecko_version}
|
|
|
BuildRequires: libXt-devel
|
|
|
BuildRequires: libXrender-devel
|
|
|
BuildRequires: startup-notification-devel
|
|
|
@@ -115,12 +123,13 @@ BuildRequires: autoconf213
|
|
|
BuildRequires: freetype2-devel
|
|
|
BuildRequires: yasm
|
|
|
BuildRequires: unzip
|
|
|
+BuildRequires: zip
|
|
|
|
|
|
Requires: desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
%if %{build_vine5}
|
|
|
Requires: nspr >= %{nspr_version}
|
|
|
Requires: nss >= %{nss_version}
|
|
|
-Requires: gecko-libs >= %{gecko_version}
|
|
|
+#Requires: gecko-libs >= %{gecko_version}
|
|
|
%endif
|
|
|
|
|
|
Obsoletes: phoenix, mozilla-firebird, MozillaFirebird
|
|
|
@@ -132,9 +141,13 @@ Provides: webclient
|
|
|
%define __find_requires %{SOURCE100}
|
|
|
|
|
|
%description
|
|
|
-Fx3.6 is an open-source web browser based on mozilla technology.
|
|
|
+Fx Browser is an open-source web browser based on mozilla technology.
|
|
|
This is unofficial build of firefox browser.
|
|
|
|
|
|
+%description -l ja
|
|
|
+FX ウェブブラウザは Mozilla テクノロジーをベースとしたオープンソースの
|
|
|
+ウェブブラウザです。
|
|
|
+
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%prep
|
|
|
@@ -145,11 +158,13 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ffmajor}/' \
|
|
|
%{P:%%PATCH0} > version.patch
|
|
|
%{__patch} -p1 -b --suffix .version < version.patch
|
|
|
|
|
|
+%patch14 -p1 -b .asciidel
|
|
|
+
|
|
|
%patch26 -p1
|
|
|
|
|
|
#
|
|
|
-%patch1000 -p0
|
|
|
-%patch2000 -p1
|
|
|
+#%patch1000 -p0
|
|
|
+%patch2000 -p1 -b .vine
|
|
|
|
|
|
%{__rm} -f .mozconfig
|
|
|
|
|
|
@@ -158,7 +173,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ffmajor}/' \
|
|
|
%{__cp} -f %{SOURCE220} .mozconfig
|
|
|
%endif
|
|
|
|
|
|
-echo "ac_add_options --with-libxul-sdk=`pkg-config --variable=sdkdir libxul`" >> .mozconfig
|
|
|
+#echo "ac_add_options --with-libxul-sdk=`pkg-config --variable=sdkdir libxul`" >> .mozconfig
|
|
|
|
|
|
%if !%{?separated_plugins}
|
|
|
echo "ac_add_options --disable-ipc" >> .mozconfig
|
|
|
@@ -187,7 +202,7 @@ export CXXFLAGS=$MOZ_OPT_FLAGS
|
|
|
|
|
|
export MOZILLA_OFFICIAL=1
|
|
|
export BUILD_OFFICIAL=1
|
|
|
-export MOZ_APP_DISPLAYNAME="Fx for Vine Linux"
|
|
|
+export MOZ_APP_DISPLAYNAME="Fx Browser"
|
|
|
|
|
|
export PREFIX='%{_prefix}'
|
|
|
export LIBDIR='%{_libdir}'
|
|
|
@@ -215,7 +230,7 @@ cd %{tarballdir}
|
|
|
|
|
|
# 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
|
|
|
+%{__cat} %{SOURCE12} | sed -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > dist/bin/defaults/pref/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\
|
|
|
@@ -227,11 +242,11 @@ cd %{tarballdir}
|
|
|
%{__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
|
|
|
+%{__cat} > dist/bin/defaults/pref/firefox-l10n.js << EOF
|
|
|
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
|
|
|
EOF
|
|
|
|
|
|
-export MOZ_APP_DISPLAYNAME="Fx for Vine Linux"
|
|
|
+export MOZ_APP_DISPLAYNAME="Fx Browser"
|
|
|
%{__make} install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
|
|
|
@@ -270,7 +285,7 @@ XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,
|
|
|
$RPM_BUILD_ROOT%{ffdir}/firefox-xremote-client
|
|
|
|
|
|
# Remove binary stub from xulrunner
|
|
|
-%{__rm} -rf $RPM_BUILD_ROOT/%{ffdir}/firefox
|
|
|
+#%{__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
|
|
|
@@ -367,6 +382,13 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Jul 07 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 5.0-1
|
|
|
+- update to 5.0
|
|
|
+- do not build with external xulrunner
|
|
|
+ - remove BR: gecko-devel, R: gecko-libs
|
|
|
+- add BR: alsa-lib-devel, lcms-devel, libvpx-devel, libpng-devel,
|
|
|
+ sqlite3-devel, zip
|
|
|
+
|
|
|
* 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
|
daisuke