MozillaFirefox/MozillaFirefox.spec
branchfirefox31
changeset 755 8aa069920665
parent 750 e996b96840ba
child 770 a17aa3347767
--- a/MozillaFirefox/MozillaFirefox.spec	Sun Aug 31 09:38:46 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Aug 31 09:39:15 2014 +0200
@@ -18,8 +18,8 @@
 
 
 %define major 31
-%define mainver %major.0
-%define update_channel release
+%define mainver %major.1.0
+%define update_channel esr31
 
 %if %suse_version > 1210
 %if %suse_version > 1310
@@ -40,12 +40,15 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  libidl-devel
 BuildRequires:  libnotify-devel
+%if %suse_version > 1140
 BuildRequires:  makeinfo
+%endif
 BuildRequires:  python-devel
 BuildRequires:  startup-notification-devel
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-libXt-devel
+BuildRequires:  xz
 BuildRequires:  yasm
 BuildRequires:  zip
 %if %suse_version > 1110
@@ -74,7 +77,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2014072000
+%define         releasedate 2014082900
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -117,6 +120,7 @@
 Patch12:        mozilla-arm-disable-edsp.patch
 Patch13:        mozilla-ppc.patch
 Patch14:        mozilla-libproxy-compat.patch
+Patch15:        mozilla-nullptr-gcc45.patch
 # Gecko/Toolkit AArch64 Porting
 Patch30:        mozilla-aarch64-bmo-810631.patch
 
@@ -259,6 +263,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 %patch30 -p1
 
 # Firefox