Updated for PPL 0.10.1.

This commit is contained in:
Roberto Bagnara 2009-04-14 07:09:31 +00:00
parent 4f93c2ff1a
commit 34697a09cb
5 changed files with 109 additions and 61 deletions

12
ppl-0.10.1-Makefile.patch Normal file
View File

@ -0,0 +1,12 @@
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@

2
ppl.hh
View File

@ -1,5 +1,5 @@
/* This is the header file switcher of the Parma Polyhedra Library. /* This is the header file switcher of the Parma Polyhedra Library.
Copyright (C) 2001-2008 Roberto Bagnara <bagnara@cs.unipr.it> Copyright (C) 2001-2009 Roberto Bagnara <bagnara@cs.unipr.it>
This file is part of the Parma Polyhedra Library (PPL). This file is part of the Parma Polyhedra Library (PPL).

152
ppl.spec
View File

@ -1,8 +1,8 @@
#%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) #%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
Name: ppl Name: ppl
Version: 0.10 Version: 0.10.1
Release: 3%{?dist} Release: 1%{?dist}
Summary: The Parma Polyhedra Library: a library of numerical abstractions Summary: The Parma Polyhedra Library: a library of numerical abstractions
Group: Development/Libraries Group: Development/Libraries
@ -12,8 +12,8 @@ Source0: ftp://ftp.cs.unipr.it/pub/ppl/releases/%{version}/%{name}-%{vers
Source1: ppl.hh Source1: ppl.hh
Source2: ppl_c.h Source2: ppl_c.h
Source3: pwl.hh Source3: pwl.hh
#Patch0: none Patch0: ppl-0.10.1-Makefile.patch
#Patch1: none #Patch1:
#Icon: #Icon:
#Requires: #Requires:
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
@ -60,7 +60,7 @@ BuildRequires: glpk-devel >= 4.13
This package contains the mixed integer linear programming solver ppl_lpsol This package contains the mixed integer linear programming solver ppl_lpsol
and the program ppl_lcdd for vertex/facet enumeration of convex polyhedra. and the program ppl_lcdd for vertex/facet enumeration of convex polyhedra.
%ifnarch ppc64 %ifnarch ia64 ppc64 s390 s390x
%package gprolog %package gprolog
# The `gprolog' package is not available on ppc64: # The `gprolog' package is not available on ppc64:
# the GNU Prolog interface must thus be disabled for that architecture. # the GNU Prolog interface must thus be disabled for that architecture.
@ -73,7 +73,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. Install this package if you want to use the library in GNU Prolog programs.
%endif %endif
%ifnarch ppc64 %ifnarch ia64 ppc64 s390 s390x
%package gprolog-static %package gprolog-static
Summary: The static archive for the GNU Prolog interface of the Parma Polyhedra Library Summary: The static archive for the GNU Prolog interface of the Parma Polyhedra Library
Group: Development/Libraries Group: Development/Libraries
@ -198,16 +198,16 @@ Install this package if you want to program with the PWL.
%prep %prep
%setup -q %setup -q
#%patch0 -p1 %patch0 -p1
#%patch1 -p1 #%patch1 -p1
%build %build
CPPFLAGS="-I%{_includedir}/glpk" CPPFLAGS="-I%{_includedir}/glpk"
%ifnarch ppc64 %ifnarch ia64 ppc64 s390 s390x
CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include" CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include"
%endif %endif
CPPFLAGS="$CPPFLAGS -I%{_includedir}/Yap" CPPFLAGS="$CPPFLAGS -I%{_includedir}/Yap"
%configure --enable-shared --disable-rpath --enable-interfaces="c++ c gnu_prolog swi_prolog yap_prolog java" CPPFLAGS="$CPPFLAGS" %configure --docdir=%{_datadir}/doc/%{name}-%{version} --enable-shared --disable-rpath --enable-interfaces="c++ c gnu_prolog swi_prolog yap_prolog java" CPPFLAGS="$CPPFLAGS"
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' Watchdog/libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' Watchdog/libtool
@ -245,27 +245,25 @@ install -m644 %{SOURCE3} %{buildroot}/%{_includedir}/pwl.hh
# Install the Javadocs for ppl-java. # Install the Javadocs for ppl-java.
mkdir -p %{buildroot}%{_javadocdir} mkdir -p %{buildroot}%{_javadocdir}
mv \ mv \
%{buildroot}/%{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}-html \ %{buildroot}/%{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}-html \
%{buildroot}%{_javadocdir}/%{name}-java %{buildroot}%{_javadocdir}/%{name}-java
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name}/BUGS %doc %{_datadir}/doc/%{name}-%{version}/BUGS
%doc %{_datadir}/doc/%{name}/COPYING %doc %{_datadir}/doc/%{name}-%{version}/COPYING
%doc %{_datadir}/doc/%{name}/CREDITS %doc %{_datadir}/doc/%{name}-%{version}/CREDITS
%doc %{_datadir}/doc/%{name}/ChangeLog %doc %{_datadir}/doc/%{name}-%{version}/NEWS
%doc %{_datadir}/doc/%{name}/NEWS %doc %{_datadir}/doc/%{name}-%{version}/README
%doc %{_datadir}/doc/%{name}/README %doc %{_datadir}/doc/%{name}-%{version}/README.configure
%doc %{_datadir}/doc/%{name}/README.configure %doc %{_datadir}/doc/%{name}-%{version}/TODO
%doc %{_datadir}/doc/%{name}/TODO %doc %{_datadir}/doc/%{name}-%{version}/gpl.txt
%doc %{_datadir}/doc/%{name}/gpl.*
%{_libdir}/libppl.so.* %{_libdir}/libppl.so.*
%{_libdir}/libppl_c.so.* %{_libdir}/libppl_c.so.*
%{_bindir}/ppl-config %{_bindir}/ppl-config
%{_mandir}/man1/ppl-config.1.gz %{_mandir}/man1/ppl-config.1.gz
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%dir %{_datadir}/doc/%{name} %dir %{_datadir}/doc/%{name}-%{version}
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -290,7 +288,7 @@ mv \
%{_mandir}/man1/ppl_lcdd.1.gz %{_mandir}/man1/ppl_lcdd.1.gz
%{_mandir}/man1/ppl_lpsol.1.gz %{_mandir}/man1/ppl_lpsol.1.gz
%ifnarch ppc64 %ifnarch ia64 ppc64 s390 s390x
%files gprolog %files gprolog
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc interfaces/Prolog/GNU/README.gprolog %doc interfaces/Prolog/GNU/README.gprolog
@ -299,7 +297,7 @@ mv \
%{_libdir}/%{name}/libppl_gprolog.so %{_libdir}/%{name}/libppl_gprolog.so
%endif %endif
%ifnarch ppc64 %ifnarch ia64 ppc64 s390 s390x
%files gprolog-static %files gprolog-static
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/%{name}/libppl_gprolog.a %{_libdir}/%{name}/libppl_gprolog.a
@ -346,33 +344,36 @@ mv \
%files docs %files docs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name}/README.doc %doc %{_datadir}/doc/%{name}-%{version}/ChangeLog*
%doc %{_datadir}/doc/%{name}/fdl.* %doc %{_datadir}/doc/%{name}-%{version}/README.doc
%doc %{_datadir}/doc/%{name}/ppl-user-%{version}-html/ %doc %{_datadir}/doc/%{name}-%{version}/fdl.*
%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}-html/ %doc %{_datadir}/doc/%{name}-%{version}/gpl.pdf
#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}-html/ %doc %{_datadir}/doc/%{name}-%{version}/gpl.ps.gz
%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}-html/ %doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}-html/
%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.pdf %doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}-html/
%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.pdf #%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}-html/
%doc %{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}.pdf %doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}-html/
#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}.pdf %doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}.pdf
%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}.pdf %doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}.pdf
%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.ps.gz %doc %{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}.pdf
%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.ps.gz #%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}.pdf
%doc %{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}.ps.gz %doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}.pdf
#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}.ps.gz %doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}.ps.gz
%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}.ps.gz %doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}.ps.gz
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}.ps.gz
#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}.ps.gz
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}.ps.gz
%files pwl %files pwl
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc %{_datadir}/doc/pwl/BUGS %doc %{_datadir}/doc/%{name}-%{version}/pwl/BUGS
%doc %{_datadir}/doc/pwl/COPYING %doc %{_datadir}/doc/%{name}-%{version}/pwl/COPYING
%doc %{_datadir}/doc/pwl/CREDITS %doc %{_datadir}/doc/%{name}-%{version}/pwl/CREDITS
%doc %{_datadir}/doc/pwl/ChangeLog %doc %{_datadir}/doc/%{name}-%{version}/pwl/NEWS
%doc %{_datadir}/doc/pwl/NEWS %doc %{_datadir}/doc/%{name}-%{version}/pwl/README
%doc %{_datadir}/doc/pwl/README %doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.txt
%doc %{_datadir}/doc/pwl/gpl.*
%{_libdir}/libpwl.so.* %{_libdir}/libpwl.so.*
%dir %{_datadir}/doc/%{name}-%{version}/pwl
%files pwl-devel %files pwl-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -386,11 +387,14 @@ mv \
%files pwl-docs %files pwl-docs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc %{_datadir}/doc/pwl/README.doc %doc %{_datadir}/doc/%{name}-%{version}/pwl/ChangeLog*
%doc %{_datadir}/doc/pwl/fdl.* %doc %{_datadir}/doc/%{name}-%{version}/pwl/README.doc
%doc %{_datadir}/doc/pwl/pwl-user-0.5-html/ %doc %{_datadir}/doc/%{name}-%{version}/pwl/fdl.*
%doc %{_datadir}/doc/pwl/pwl-user-0.5.pdf %doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.ps.gz
%doc %{_datadir}/doc/pwl/pwl-user-0.5.ps.gz %doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.pdf
%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7-html/
%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7.pdf
%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7.ps.gz
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
@ -401,13 +405,45 @@ mv \
rm -rf %{buildroot} rm -rf %{buildroot}
%changelog %changelog
* Thu Nov 4 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-3 * Tue Apr 14 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10.1-1
- Updated for PPL 0.10.1.
* Sun Mar 29 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-11
- Moved changelogs and PostScript and PDF versions of the GPL to the
`docs' subpackages. This saves considerable space on the live media.
* Tue Mar 24 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-10
- There are no GNU Prolog packages available on ia64: disable the GNU Prolog
interface also on those platforms (besides ppc64, s390 and s390x).
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild.
* Wed Feb 18 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-8
- Install the documentation according to the Fedora packaging conventions.
* Wed Feb 17 2009 Karsten Hopp <karsten@redhat.comt> 0.10-7
- There are no GNU Prolog packages available on s390 and s390x: disable
the GNU Prolog interface also on those platforms (besides ppc64).
* Wed Feb 04 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-6
- Better workaround for the bug affecting PPL 0.10 on big-endian
architectures.
* Tue Feb 03 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-5
- Work around the bug affecting PPL 0.10 on big-endian architectures.
* Fri Dec 05 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-4
- Added `%%dir %%{_datadir}/doc/pwl' to the `%%files' section
of the `ppl-pwl' package.
* Thu Nov 04 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-3
- Fixed the requirements of the `ppl-java' package. - Fixed the requirements of the `ppl-java' package.
* Thu Nov 4 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-2 * Thu Nov 04 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-2
- Added m4 >= 1.4.8 to build requirements. - Added m4 >= 1.4.8 to build requirements.
* Thu Nov 4 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-1 * Thu Nov 04 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-1
- Updated and extended for PPL 0.10. In particular, the `ppl-config' - Updated and extended for PPL 0.10. In particular, the `ppl-config'
program, being useful also for non-development activities, has been program, being useful also for non-development activities, has been
brought back to the main package. brought back to the main package.
@ -415,17 +451,17 @@ rm -rf %{buildroot}
* Tue Sep 30 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-25 * Tue Sep 30 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-25
- The `swiprolog' package now requires pl >= 5.6.57-2. - The `swiprolog' package now requires pl >= 5.6.57-2.
* Mon Sep 8 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-24 * Mon Sep 08 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-24
- Changed ppl-0.9-swiprolog.patch so as to invoke `plld' with - Changed ppl-0.9-swiprolog.patch so as to invoke `plld' with
the `-v' option. the `-v' option.
* Mon Sep 8 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-23 * Mon Sep 08 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-23
- Fixed ppl-0.9-swiprolog.patch. - Fixed ppl-0.9-swiprolog.patch.
* Mon Sep 8 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-22 * Mon Sep 08 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-22
- Implemented a workaround to cope with the new location of SWI-Prolog.h. - Implemented a workaround to cope with the new location of SWI-Prolog.h.
* Mon Sep 8 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-21 * Mon Sep 08 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-21
- Fixed the SWI-Prolog interface dependencies. - Fixed the SWI-Prolog interface dependencies.
* Mon May 19 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-20 * Mon May 19 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-20

View File

@ -1,5 +1,5 @@
/* Header file switcher for the C interface. -*- C -*- /* Header file switcher for the C interface. -*- C -*-
Copyright (C) 2001-2008 Roberto Bagnara <bagnara@cs.unipr.it> Copyright (C) 2001-2009 Roberto Bagnara <bagnara@cs.unipr.it>
This file is part of the Parma Polyhedra Library (PPL). This file is part of the Parma Polyhedra Library (PPL).

2
pwl.hh
View File

@ -1,5 +1,5 @@
/* This is the header file switcher of the Parma Watchdog Library. /* This is the header file switcher of the Parma Watchdog Library.
Copyright (C) 2001-2008 Roberto Bagnara <bagnara@cs.unipr.it> Copyright (C) 2001-2009 Roberto Bagnara <bagnara@cs.unipr.it>
This file is part of the Parma Watchdog Library (PWL). This file is part of the Parma Watchdog Library (PWL).