diff -r 0b1f7ee785d3 -r 2268d308dc15 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sat Sep 28 13:21:55 2013 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Sat Oct 05 22:22:35 2013 +0200 @@ -57,6 +57,9 @@ BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) +Requires: libgstreamer-0_10-0 +Recommends: gstreamer-0_10-fluendo-mp3 +Recommends: gstreamer-0_10-plugins-ffmpeg %endif Version: %{mainver} Release: 0 @@ -165,7 +168,7 @@ %package translations-common Summary: Common translations for Firefox Group: System/Localization -Provides: locale(%{name}:ar;ca;cs;da;de;el;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) +Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;el;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -300,30 +303,44 @@ ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar ac_add_options --enable-update-channel=%{update_channel} +EOF %if %suse_version > 1130 +cat << EOF >> $MOZCONFIG ac_add_options --disable-gnomevfs ac_add_options --enable-gio +EOF %endif %if %suse_version < 1220 +cat << EOF >> $MOZCONFIG ac_add_options --disable-gstreamer +EOF %endif %if %branding +cat << EOF >> $MOZCONFIG ac_add_options --enable-official-branding +EOF %endif %if %suse_version > 1110 +cat << EOF >> $MOZCONFIG ac_add_options --enable-libproxy +EOF %endif %if ! %crashreporter +cat << EOF >> $MOZCONFIG ac_add_options --disable-crashreporter +EOF %endif # Disable neon for arm as it does not build correctly %ifarch %arm +cat << EOF >> $MOZCONFIG ac_add_options --disable-neon +EOF %endif %ifnarch %ix86 x86_64 +cat << EOF >> $MOZCONFIG ac_add_options --disable-webrtc +EOF %endif -EOF make -f client.mk build %install @@ -375,7 +392,7 @@ rm -rf $RPM_BUILD_ROOT%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/hyphenation # check against the fixed common list and sort into the right filelist _matched=0 - for _match in ar ca cs da de el en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do + for _match in ar ca cs da de en-GB el es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do [ "$_match" = "$locale" ] && _matched=1 done [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other