Hello community,

here is the log from the commit of package ppl for openSUSE:Factory checked in 
at 2013-03-06 09:45:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ppl (Old)
 and      /work/SRC/openSUSE:Factory/.ppl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ppl", Maintainer is "rguent...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/ppl/ppl-testsuite.changes        2011-09-23 
12:41:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ppl.new/ppl-testsuite.changes   2013-03-06 
09:45:48.000000000 +0100
@@ -1,0 +2,10 @@
+Tue Mar  5 19:30:04 UTC 2013 - idon...@suse.com
+
+- Add ppl-gmp-5.1.0.patch to fix build with new gmp
+
+-------------------------------------------------------------------
+Tue Jan 24 12:20:24 UTC 2012 - jeng...@medozas.de
+
+- Remove redundant sections (see specfile guidelines)
+
+-------------------------------------------------------------------
ppl.changes: same change

New:
----
  ppl-gmp-5.1.0.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ppl-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.Va8ZpU/_old  2013-03-06 09:45:49.000000000 +0100
+++ /var/tmp/diff_new_pack.Va8ZpU/_new  2013-03-06 09:45:49.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ppl-testsuite
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           ppl-testsuite
 Version:        0.11.2
 Release:        0
@@ -24,6 +25,7 @@
 Url:            http://www.cs.unipr.it/ppl/
 Source:         ppl-%{version}.tar.bz2
 Source1:        baselibs.conf
+Patch1:         ppl-gmp-5.1.0.patch
 BuildRequires:  c++_compiler
 BuildRequires:  gmp-devel >= 4.1.3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -46,9 +48,9 @@
 %package devel
 Summary:        Development tools for the Parma Polyhedra Library C and C++ 
interfaces
 Group:          Development/Libraries/C and C++
+Requires:       gmp-devel >= 4.1.3
 Requires:       libppl9 = %{version}-%{release}
 Requires:       libppl_c4 = %{version}-%{release}
-Requires:       gmp-devel >= 4.1.3
 %if 0%{suse_version} > 1000
 Recommends:     ppl-doc = %{version}-%{release}
 %endif
@@ -107,6 +109,7 @@
 
 %prep
 %setup -q -n ppl-%{version}
+%patch1 -p1
 
 %build
 %configure --enable-shared --with-pic --disable-rpath \
@@ -182,6 +185,7 @@
 %{_mandir}/man1/ppl-config.1.gz
 %{_mandir}/man3/libppl.3.gz
 %{_mandir}/man3/libppl_c.3.gz
+%dir %{_datadir}/aclocal
 %{_datadir}/aclocal/ppl.m4
 %{_datadir}/aclocal/ppl_c.m4
 
@@ -202,7 +206,4 @@
 %doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.pdf
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %changelog

++++++ ppl.spec ++++++
--- /var/tmp/diff_new_pack.Va8ZpU/_old  2013-03-06 09:45:49.000000000 +0100
+++ /var/tmp/diff_new_pack.Va8ZpU/_new  2013-03-06 09:45:49.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ppl
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           ppl
 Version:        0.11.2
 Release:        0
@@ -24,6 +25,7 @@
 Url:            http://www.cs.unipr.it/ppl/
 Source:         ppl-%{version}.tar.bz2
 Source1:        baselibs.conf
+Patch1:         ppl-gmp-5.1.0.patch
 BuildRequires:  c++_compiler
 BuildRequires:  gmp-devel >= 4.1.3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -46,9 +48,9 @@
 %package devel
 Summary:        Development tools for the Parma Polyhedra Library C and C++ 
interfaces
 Group:          Development/Libraries/C and C++
+Requires:       gmp-devel >= 4.1.3
 Requires:       libppl9 = %{version}-%{release}
 Requires:       libppl_c4 = %{version}-%{release}
-Requires:       gmp-devel >= 4.1.3
 %if 0%{suse_version} > 1000
 Recommends:     ppl-doc = %{version}-%{release}
 %endif
@@ -107,6 +109,7 @@
 
 %prep
 %setup -q -n ppl-%{version}
+%patch1 -p1
 
 %build
 %configure --enable-shared --with-pic --disable-rpath \
@@ -203,7 +206,4 @@
 %doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.pdf
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %changelog

++++++ ppl-gmp-5.1.0.patch ++++++
Index: ppl-0.11.2/src/mp_std_bits.cc
===================================================================
--- ppl-0.11.2.orig/src/mp_std_bits.cc
+++ ppl-0.11.2/src/mp_std_bits.cc
@@ -26,6 +26,9 @@ site: http://www.cs.unipr.it/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;
@@ -71,3 +74,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)
Index: ppl-0.11.2/src/mp_std_bits.defs.hh
===================================================================
--- ppl-0.11.2.orig/src/mp_std_bits.defs.hh
+++ ppl-0.11.2/src/mp_std_bits.defs.hh
@@ -39,6 +39,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
@@ -165,6 +168,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)
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to