rpms/ppl/F-11 ppl-0.10.2-Makefile.patch, NONE, 1.1 ppl.hh, 1.2, 1.3 ppl.spec, 1.28, 1.29 ppl_c.h, 1.2, 1.3 pwl.hh, 1.2, 1.3 ppl-0.10.1-Makefile.patch, 1.1, NONE

[Roberto Bagnara]

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21903

Modified Files:
	ppl.hh ppl.spec ppl_c.h pwl.hh 
Added Files:
	ppl-0.10.2-Makefile.patch 
Removed Files:
	ppl-0.10.1-Makefile.patch 
Log Message:
Updated for PPL 0.10.2.

ppl-0.10.2-Makefile.patch:

--- NEW FILE ppl-0.10.2-Makefile.patch ---
diff -ur ppl-0.10.1/Watchdog/doc/Makefile.in ppl-0.10.1-patched/Watchdog/doc/Makefile.in
--- ppl-0.10.1/Watchdog/doc/Makefile.in	2000-04-11 10:36:59.000000000 +0100
+++ ppl-0.10.1-patched/Watchdog/doc/Makefile.in	2009-04-11 17:53:10.000000000 +0100
@@ -163,7 +163,7 @@
 debug_flag = @debug_flag@
 
 # All the documentation in docdir.
-docdir = @docdir@
+docdir = @docdir@/pwl
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@


Index: ppl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/ppl.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppl.hh	14 Apr 2009 06:14:28 -0000	1.2
+++ ppl.hh	18 Apr 2009 09:17:01 -0000	1.3
@@ -38,6 +38,12 @@
 #include "ppl-s390x.hh"
 #elif defined(__s390__)
 #include "ppl-s390.hh"
+#elif defined(__sh__)
+#include "ppl-sh.hh"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ppl-sparc64.hh"
+#elif defined(__sparc__)
+#include "ppl-sparc.hh"
 #else
 #error "This architecture is not supported by the currently installed ppl-devel packages."
 #endif


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/ppl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ppl.spec	14 Apr 2009 06:14:28 -0000	1.28
+++ ppl.spec	18 Apr 2009 09:17:01 -0000	1.29
@@ -1,7 +1,7 @@
 #%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ppl
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 
 Summary:        The Parma Polyhedra Library: a library of numerical abstractions
@@ -12,7 +12,7 @@
 Source1:        ppl.hh
 Source2:        ppl_c.h
 Source3:        pwl.hh
-Patch0:         ppl-0.10.1-Makefile.patch
+Patch0:         ppl-0.10.2-Makefile.patch
 #Patch1:
 #Icon:
 #Requires:
@@ -106,6 +106,7 @@
 Group:          Development/Libraries
 BuildRequires:  yap-devel >= 5.1.1
 Requires:       %{name} = %{version}-%{release}, %{name}-pwl = %{version}-%{release}, yap >= 5.1.1
+Obsoletes:      ppl-yap-static
 %description yap
 This package adds YAP Prolog support to the Parma Polyhedra Library (PPL).
 Install this package if you want to use the library in YAP Prolog programs.
@@ -226,7 +227,8 @@
 # the architecture for which the compiler is compiling.
 
 # Since our header files only depend on the sizeof things, we smash
-# ix86 onto i386 and arm* onto arm.
+# ix86 onto i386 and arm* onto arm.  For the SuperH RISC engine family,
+# we smash sh3 and sh4 onto sh.
 normalized_arch=%{_arch}
 %ifarch %{ix86}
 normalized_arch=i386
@@ -234,6 +236,9 @@
 %ifarch %{arm}
 normalized_arch=arm
 %endif
+%ifarch sh3 sh4
+normalized_arch=sh
+%endif
 
 mv %{buildroot}/%{_includedir}/ppl.hh %{buildroot}/%{_includedir}/ppl-${normalized_arch}.hh
 install -m644 %{SOURCE1} %{buildroot}/%{_includedir}/ppl.hh
@@ -405,6 +410,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Sat Apr 18 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.2-1
+- Updated for PPL 0.10.2.
+
 * Tue Apr 14 2009 Roberto Bagnara <bagnara at cs.unipr.it> 0.10.1-1
 - Updated for PPL 0.10.1.
 


Index: ppl_c.h
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/ppl_c.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ppl_c.h	14 Apr 2009 06:14:28 -0000	1.2
+++ ppl_c.h	18 Apr 2009 09:17:01 -0000	1.3
@@ -38,6 +38,12 @@
 #include "ppl_c-s390x.h"
 #elif defined(__s390__)
 #include "ppl_c-s390.h"
+#elif defined(__sh__)
+#include "ppl_c-sh.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ppl_c-sparc64.h"
+#elif defined(__sparc__)
+#include "ppl_c-sparc.h"
 #else
 #error "This architecture is not supported by the currently installed ppl-devel packages."
 #endif


Index: pwl.hh
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-11/pwl.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pwl.hh	14 Apr 2009 06:14:29 -0000	1.2
+++ pwl.hh	18 Apr 2009 09:17:01 -0000	1.3
@@ -38,6 +38,12 @@
 #include "pwl-s390x.hh"
 #elif defined(__s390__)
 #include "pwl-s390.hh"
+#elif defined(__sh__)
+#include "pwl-sh.hh"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "pwl-sparc64.hh"
+#elif defined(__sparc__)
+#include "pwl-sparc.hh"
 #else
 #error "This architecture is not supported by the currently installed ppl-pwl-devel packages."
 #endif


--- ppl-0.10.1-Makefile.patch DELETED ---