rpms/xulrunner/devel xulrunner.spec,1.204,1.205

[Martin Stransky]

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1000

Modified Files:
	xulrunner.spec 
Log Message:
Disabled oopp on unsupported arches (rhbz#614363)


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- xulrunner.spec	30 Jun 2010 14:01:16 -0000	1.204
+++ xulrunner.spec	14 Jul 2010 09:45:36 -0000	1.205
@@ -1,3 +1,10 @@
+# Separated plugins are supported on x86(64) only
+%ifarch i386 x86_64
+%define separated_plugins 1
+%else
+%define separated_plugins 0
+%endif
+
 # Minimal required versions
 %define nspr_version 4.8
 %define nss_version 3.12.6
@@ -16,7 +23,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.2.6
-Release:        1%{?pretag}%{?dist}
+Release:        2%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -152,6 +159,10 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %{__cat} %{SOURCE11} >> .mozconfig
 %endif
 
+%if !%{?separated_plugins}
+echo "ac_add_options --disable-ipc" >> .mozconfig
+%endif
+
 #---------------------------------------------------------------------
 
 %build
@@ -411,6 +422,9 @@ fi
 %{mozappdir}/dependentlibs.list
 %{_sysconfdir}/ld.so.conf.d/xulrunner*.conf
 %{mozappdir}/plugin-container
+%if %{?separated_plugins}
+%{mozappdir}/plugin-container
+%endif
 
 # XXX See if these are needed still
 %{mozappdir}/updater*
@@ -442,6 +456,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Jun 1 2010 Martin Stransky <stransky at redhat.com> 1.9.2.6-2
+- Disabled oopp on unsupported arches (rhbz#614363)
+
 * Wed Jun 30 2010 Jan Horak <jhorak at redhat.com> - 1.9.2.6-1
 - Update to 1.9.2.6