[python-polybori] fix build on non-x86 arches where __M4RI_HAVE_SSE2 is defined as 0

[Dan Horák]

commit dc8ee704de397db5cc0501e3e52dba8ae77ae6ff
Author: Dan Horák <dan at danny.cz>
Date:   Fri Oct 7 16:08:58 2011 +0200

    fix build on non-x86 arches where __M4RI_HAVE_SSE2 is defined as 0

 polybori-0.7.2-m4ri.patch |   12 ++++++++++++
 python-polybori.spec      |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/polybori-0.7.2-m4ri.patch b/polybori-0.7.2-m4ri.patch
new file mode 100644
index 0000000..b00cac5
--- /dev/null
+++ b/polybori-0.7.2-m4ri.patch
@@ -0,0 +1,12 @@
+diff -up polybori-0.7.2/SConstruct.secondary polybori-0.7.2/SConstruct
+--- polybori-0.7.2/SConstruct.secondary	2011-10-07 15:39:24.000000000 +0200
++++ polybori-0.7.2/SConstruct	2011-10-07 15:40:06.000000000 +0200
+@@ -503,7 +503,7 @@ if not env.GetOption('clean'):
+         }
+         """  %  \
+         ("%s", ''.join(["""
+-        #if defined(__M4RI_HAVE_%(macro)s) || defined(HAVE_%(macro)s )
++        #if defined(__M4RI_HAVE_%(macro)s) && __M4RI_HAVE_%(macro)s || defined(HAVE_%(macro)s )
+           printf("-m%(option)s ");
+         #endif""" % \
+         dict(macro=opt.replace('.','_').upper(), option=opt) for opt in \
diff --git a/python-polybori.spec b/python-polybori.spec
index 7d4c545..b9c3284 100644
--- a/python-polybori.spec
+++ b/python-polybori.spec
@@ -2,7 +2,7 @@
 
 Name:           python-%{rootname}
 Version:        0.7.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Framework for Boolean Rings
 Group:          Development/Libraries
 License:        GPLv2+
@@ -19,6 +19,8 @@ Patch1:         polybori-import.patch
 Patch2:         polybori-warning.patch
 # This patch was produced by upstream.  It adapts to ipython 0.11.
 Patch3:         polybori-ipython.patch
+# Fix CFLAFS detection with system m4ri library - __M4RI_HAVE_SSE2 can be defined as 0
+Patch4:         polybori-0.7.2-m4ri.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  cudd-devel
@@ -94,6 +96,7 @@ Static libraries for %{name}.
 %patch1
 %patch2
 %patch3
+%patch4 -p1
 
 # Remove private copy of system libs (cudd, m4ri, singular, and pyparsing)
 rm -rf Cudd M4RI Singular PyPolyBoRi/pyparsing.py
@@ -205,6 +208,9 @@ fi
 
 
 %changelog
+* Fri Oct  7 2011 Dan Horák <dan[at]danny.cz> - 0.7.2-2
+- fix build on non-x86 arches where __M4RI_HAVE_SSE2 is defined as 0
+
 * Wed Sep  7 2011 Jerry James <loganjerry at gmail.com> - 0.7.2-1
 - New upstream version
 - Drop upstreamed m4ri patch