disable branding
authorWolfgang Rosenauer <wr@rosenauer.org>
Sat, 19 Apr 2014 23:37:58 +0200
changeset 719 8d80a56bb0a8
parent 718 6cb1ac7cd223
child 725 b688c34894ee
disable branding switch to GStreamer 1.x only for higher than 13.1
MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Apr 17 23:33:07 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat Apr 19 23:37:58 2014 +0200
@@ -21,10 +21,13 @@
 %define mainver %major.98
 %define update_channel aurora
 
-%if %suse_version > 1220
+%if %suse_version > 1210
+%if %suse_version > 1310
+%define gstreamer_ver 1.0
+%define gstreamer 1
+%else
 %define gstreamer_ver 0.10
-%else
-%define gstreamer_ver 1.0
+%endif
 %endif
 
 Name:           MozillaFirefox
@@ -59,9 +62,15 @@
 BuildRequires:  pkgconfig(gstreamer-%gstreamer_ver)
 BuildRequires:  pkgconfig(gstreamer-app-%gstreamer_ver)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-%gstreamer_ver)
-Requires:       libgstreamer-1_0
+%if 0%{?gstreamer} == 1
+Requires:       libgstreamer-1_0-0
 Recommends:     gstreamer-fluendo-mp3
-#Recommends:     gstreamer-0_10-plugins-ffmpeg
+Recommends:     gstreamer-plugin-libav
+%else
+Requires:       libgstreamer-0_10-0
+Recommends:     gstreamer-0_10-fluendo-mp3
+Recommends:     gstreamer-0_10-plugins-ffmpeg
+%endif
 %endif
 Version:        %{mainver}
 Release:        0
@@ -148,7 +157,7 @@
 # Note: these are for the openSUSE Firefox builds ONLY. For your own distribution,
 # please get your own set of keys.
 %define _google_api_key AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q
-%define branding 1
+%define branding 0
 %define localize 1
 %ifarch aarch64 ppc ppc64 ppc64le s390 s390x ia64 %arm
 %define crashreporter 0
@@ -320,6 +329,9 @@
 ac_add_options --enable-startup-notification
 #ac_add_options --enable-chrome-format=jar
 ac_add_options --enable-update-channel=%{update_channel}
+%if 0%{?gstreamer} == 1
+ac_add_options --enable-gstreamer=1.0
+%endif
 %if %suse_version > 1130
 ac_add_options --disable-gnomevfs
 ac_add_options --enable-gio