ESR changes esr17
authorWolfgang Rosenauer <wr@rosenauer.org>
Thu, 22 Nov 2012 10:56:17 +0100
branchesr17
changeset 586 1d3e0f4f48af
parent 584 0541c6b43891
child 590 882053767ede
ESR changes SLE11 buildfixes
xulrunner/mozilla-gcc43-enums.patch
xulrunner/mozilla-gcc43-template_hacks.patch
xulrunner/mozilla-gcc43-templates_instantiation.patch
xulrunner/xulrunner-esr.changes
xulrunner/xulrunner-esr.spec
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner/mozilla-gcc43-enums.patch	Thu Nov 22 10:56:17 2012 +0100
@@ -0,0 +1,1 @@
+../mozilla-gcc43-enums.patch
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner/mozilla-gcc43-template_hacks.patch	Thu Nov 22 10:56:17 2012 +0100
@@ -0,0 +1,1 @@
+../mozilla-gcc43-template_hacks.patch
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner/mozilla-gcc43-templates_instantiation.patch	Thu Nov 22 10:56:17 2012 +0100
@@ -0,0 +1,1 @@
+../mozilla-gcc43-templates_instantiation.patch
\ No newline at end of file
--- a/xulrunner/xulrunner-esr.changes	Wed Nov 21 12:23:12 2012 +0100
+++ b/xulrunner/xulrunner-esr.changes	Thu Nov 22 10:56:17 2012 +0100
@@ -1,7 +1,11 @@
 -------------------------------------------------------------------
-Wed Nov 21 10:37:50 UTC 2012 - wr@rosenauer.org
+Thu Nov 22 09:54:46 UTC 2012 - wr@rosenauer.org
 
 - rebrand to xulrunner-esr
+- build on SLE11
+  * mozilla-gcc43-enums.patch
+  * mozilla-gcc43-template_hacks.patch
+  * mozilla-gcc43-templates_instantiation.patch
 
 -------------------------------------------------------------------
 Tue Nov 20 20:15:23 UTC 2012 - wr@rosenauer.org
--- a/xulrunner/xulrunner-esr.spec	Wed Nov 21 12:23:12 2012 +0100
+++ b/xulrunner/xulrunner-esr.spec	Thu Nov 22 10:56:17 2012 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package xulrunner
+# spec file for package xulrunner-esr
 #
 # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #               2006-2012 Wolfgang Rosenauer
@@ -17,7 +17,7 @@
 #
 
 
-Name:           xulrunner
+Name:           xulrunner-esr
 BuildRequires:  Mesa-devel
 BuildRequires:  autoconf213
 BuildRequires:  dbus-1-glib-devel
@@ -56,12 +56,14 @@
 Url:            http://www.mozilla.org/
 Provides:       gecko
 %ifarch %ix86
-Provides:       xulrunner-32bit = %{version}-%{release}
+Provides:       %{name}-32bit = %{version}-%{release}
 %endif
+# conflict with regular xulrunner
+Conflicts:      xulrunner
 Source:         xulrunner-%{version}-source.tar.bz2
 Source1:        l10n-%{version}.tar.bz2
 Source2:        find-external-requires.sh
-Source3:        %{name}-rpmlintrc
+Source3:        xulrunner-rpmlintrc
 Source4:        xulrunner-openSUSE-prefs.js
 Source5:        add-plugins.sh.in
 Source6:        create-tar.sh
@@ -77,6 +79,10 @@
 Patch7:         mozilla-ntlm-full-path.patch
 Patch9:         mozilla-sle11.patch
 Patch14:        mozilla-ppc.patch
+# SLE11 patches
+Patch20:        mozilla-gcc43-enums.patch
+Patch21:        mozilla-gcc43-template_hacks.patch
+Patch22:        mozilla-gcc43-templates_instantiation.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       mozilla-js = %{version}
 Requires(post):  update-alternatives coreutils
@@ -191,6 +197,12 @@
 %patch9 -p1
 %endif
 %patch14 -p1
+# SLE patches
+%if %suse_version <= 1110
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%endif
 
 %build
 # no need to add build time to binaries