From 17655447c06cef700644e6291fbca0d013f49ccf Mon Sep 17 00:00:00 2001
From: pcpa <paulo.cesar.pereira.de.andrade@gmail.com>
Date: Feb 07 2013 17:07:49 +0000
Subject: Correct broken dependencies and conflict with gmp (#907477, #905420).


---

diff --git a/ppl-gmp-5.1.0.patch b/ppl-gmp-5.1.0.patch
new file mode 100644
index 0000000..b8b359d
--- /dev/null
+++ b/ppl-gmp-5.1.0.patch
@@ -0,0 +1,43 @@
+diff -up ppl-1.0/src/mp_std_bits.cc.orig ppl-1.0/src/mp_std_bits.cc
+--- ppl-1.0/src/mp_std_bits.cc.orig	2013-01-30 00:54:04.362716243 -0200
++++ ppl-1.0/src/mp_std_bits.cc	2013-01-30 00:56:18.260721371 -0200
+@@ -25,6 +25,9 @@ site: http://bugseng.com/products/ppl/ .
+ #include "ppl-config.h"
+ #include "mp_std_bits.defs.hh"
+ 
++#if __GNU_MP_VERSION < 5 \
++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ const bool std::numeric_limits<mpz_class>::is_specialized;
+ const int std::numeric_limits<mpz_class>::digits;
+ const int std::numeric_limits<mpz_class>::digits10;
+@@ -70,3 +73,6 @@ const bool std::numeric_limits<mpq_class
+ const bool std::numeric_limits<mpq_class>::traps;
+ const bool std::numeric_limits<mpq_class>::tininess_before;
+ const std::float_round_style std::numeric_limits<mpq_class>::round_style;
++
++#endif // __GNU_MP_VERSION < 5
++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
+diff -up ppl-1.0/src/mp_std_bits.defs.hh.orig ppl-1.0/src/mp_std_bits.defs.hh
+--- ppl-1.0/src/mp_std_bits.defs.hh.orig	2013-01-30 00:54:10.339716472 -0200
++++ ppl-1.0/src/mp_std_bits.defs.hh	2013-01-30 00:55:45.852720130 -0200
+@@ -38,6 +38,9 @@ void swap(mpz_class& x, mpz_class& y);
+ #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
+ void swap(mpq_class& x, mpq_class& y);
+ 
++#if __GNU_MP_VERSION < 5 \
++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ namespace std {
+ 
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+@@ -164,6 +167,9 @@ public:
+ 
+ } // namespace std
+ 
++#endif // __GNU_MP_VERSION < 5
++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ #include "mp_std_bits.inlines.hh"
+ 
+ #endif // !defined(PPL_mp_std_bits_defs_hh)
diff --git a/ppl.spec b/ppl.spec
index b033eec..6c76db0 100644
--- a/ppl.spec
+++ b/ppl.spec
@@ -1,6 +1,6 @@
 Name:			ppl
 Version:		1.0
-Release:		3%{?dist}.3
+Release:		3%{?dist}.5
 Summary:		The Parma Polyhedra Library: a library of numerical abstractions
 Group:			Development/Libraries
 License:		GPLv3+
@@ -20,6 +20,7 @@ Provides:		libppl.so.9()(64bit)
 %else
 Provides:		libppl.so.9
 %endif
+Patch0:			%{name}-gmp-5.1.0.patch
 
 %description
 The Parma Polyhedra Library (PPL) is a library for the manipulation of
@@ -125,8 +126,8 @@ Install this package if you want to use the library in YAP Prolog programs.
 Summary:	The Java interface of the Parma Polyhedra Library
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
-Requires:	java%{?_isa} >= 1:1.6.0
-Requires:	jpackage-utils%{?_isa}
+Requires:	java >= 1:1.6.0
+Requires:	jpackage-utils
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description java
@@ -136,7 +137,7 @@ Install this package if you want to use the library in Java programs.
 %package java-javadoc
 Summary:	Javadocs for %{name}-java
 Requires:	%{name}-java%{?_isa} = %{version}-%{release}
-Requires:	jpackage-utils%{?_isa}
+Requires:	jpackage-utils
 
 %description java-javadoc
 This package contains the API documentation for Java interface
@@ -153,6 +154,7 @@ Install this package if you want to program with the PPL.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 CPPFLAGS="-I%{_includedir}/glpk"
@@ -304,6 +306,15 @@ mv \
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Feb  7 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.0-3.5
+- The gmp patch itself is conditional, no need to conditionally apply
+- Correct jpackage-utils requires as it is noarch
+- Correct java requires as the virtual provides in noarch
+- Rebuild for newer swiprolog and glpk (#907477, #905420)
+
+* Wed Jan 30 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.0-3.4
+- Correct problem with gmp 5.1.0 or newer (#905420)
+
 * Wed Dec 26 2012 Kevin Fenzi <kevin@scrye.com> 1.0-3.3
 - Rebuild for new libswipl