diff -r 49dc6da2c835 -r 72f6f8dbdb4f MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Mon Feb 18 14:11:20 2013 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Sat Mar 09 21:52:26 2013 +0100 @@ -17,10 +17,16 @@ # -%define major 19 +%define major 20 %define mainver %major.98 %define update_channel aurora +%if %suse_version > 1220 +%define gstreamer_ver 1.0 +%else +%define gstreamer_ver 0.10 +%endif + Name: MozillaFirefox BuildRequires: Mesa-devel BuildRequires: autoconf213 @@ -44,17 +50,17 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.9.5 -BuildRequires: mozilla-nss-devel >= 3.14.2 +BuildRequires: mozilla-nspr-devel >= 4.9.6 +BuildRequires: mozilla-nss-devel >= 3.14.3 BuildRequires: nss-shared-helper-devel %if %suse_version > 1140 -BuildRequires: pkgconfig(gstreamer-0.10) -BuildRequires: pkgconfig(gstreamer-app-0.10) -BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) +BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) +BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) +BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) %endif Version: %{mainver} Release: 0 -%define releasedate 2013020200 +%define releasedate 2013030800 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -98,6 +104,7 @@ Patch13: mozilla-ppc.patch Patch14: mozilla-gstreamer-760140.patch Patch15: mozilla-libproxy-compat.patch +Patch16: mozilla-gstreamer-1.patch # Firefox/browser Patch30: firefox-browser-css.patch Patch31: firefox-kde.patch @@ -232,6 +239,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 # %patch30 -p1 %if %suse_version >= 1110 @@ -304,7 +312,7 @@ %endif %if %suse_version > 1140 cat << EOF >> $MOZCONFIG -ac_add_options --enable-gstreamer +ac_add_options --enable-gstreamer=%{gstreamer_ver} EOF %endif %if %branding