diff --git a/ppl.spec b/ppl.spec index 4afc71b..40ddcdc 100644 --- a/ppl.spec +++ b/ppl.spec @@ -2,7 +2,7 @@ Name: ppl Version: 0.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Parma Polyhedra Library: a library of numerical abstractions Group: Development/Libraries @@ -61,7 +61,7 @@ This package contains the mixed integer linear programming solver ppl_lpsol. the program ppl_lcdd for vertex/facet enumeration of convex polyhedra, and the parametric integer programming solver ppl_pips. -%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9 +%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9 %{arm} %package gprolog # The `gprolog' package is not available on ppc64: # the GNU Prolog interface must thus be disabled for that architecture. @@ -74,7 +74,7 @@ This package adds GNU Prolog support to the Parma Polyhedra Library (PPL). Install this package if you want to use the library in GNU Prolog programs. %endif -%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9 +%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9 %{arm} %package gprolog-static Summary: The static archive for the GNU Prolog interface of the Parma Polyhedra Library Group: Development/Libraries @@ -102,7 +102,7 @@ Requires: %{name}-swiprolog = %{version}-%{release} This package contains the static archive for the SWI-Prolog interface of the Parma Polyhedra Library. -%ifnarch sparc64 sparcv9 +%ifnarch sparc64 sparcv9 %{arm} %package yap Summary: The YAP Prolog interface of the Parma Polyhedra Library Group: Development/Libraries @@ -207,10 +207,10 @@ Install this package if you want to program with the PWL. %build CPPFLAGS="-I%{_includedir}/glpk" -%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9 +%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9 %{arm} CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include" %endif -%ifnarch sparc64 sparcv9 +%ifnarch sparc64 sparcv9 %{arm} CPPFLAGS="$CPPFLAGS -I`swipl -dump-runtime-variables | grep PLBASE= | sed 's/PLBASE="\(.*\)";/\1/'`/include" CPPFLAGS="$CPPFLAGS -I%{_includedir}/Yap" %endif @@ -301,7 +301,7 @@ mv \ %{_mandir}/man1/ppl_lpsol.1.gz %{_mandir}/man1/ppl_pips.1.gz -%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9 +%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9 %{arm} %files gprolog %defattr(-,root,root,-) %doc interfaces/Prolog/GNU/README.gprolog @@ -310,7 +310,7 @@ mv \ %{_libdir}/%{name}/libppl_gprolog.so %endif -%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9 +%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9 %{arm} %files gprolog-static %defattr(-,root,root,-) %{_libdir}/%{name}/libppl_gprolog.a @@ -327,7 +327,7 @@ mv \ %defattr(-,root,root,-) %{_libdir}/%{name}/libppl_swiprolog.a -%ifnarch sparc64 sparcv9 +%ifnarch sparc64 sparcv9 %{arm} %files yap %defattr(-,root,root,-) %doc interfaces/Prolog/YAP/README.yap @@ -420,6 +420,10 @@ mv \ rm -rf %{buildroot} %changelog +* Tue May 31 2011 Peter Robinson - 0.11.2-2 +- Merge 15 Branch to master as its newer +- Add ARM to platform excludes + * Mon Feb 28 2011 Roberto Bagnara - 0.11.2-1 - Updated for PPL 0.11.2.