OCaml 4.12.0 build

- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-03-01 16:57:44 +00:00 · 2021-01-26 22:02:06 +00:00 · 2020-11-09 16:47:54 -07:00 · 2020-09-01 20:33:10 +01:00 · 2020-08-21 12:23:20 +01:00 · 2020-08-05 10:26:49 -06:00
12 changed files with 893 additions and 154 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-ocamlgraph-1.3.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,4 @@
+/ocamlgraph-1.8.5.tar.gz
+/ocamlgraph-1.8.6.tar.gz
+/ocamlgraph-1.8.7.tar.gz
+/ocamlgraph-1.8.8.tar.gz
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: ocaml-ocamlgraph
-# $Id: Makefile,v 1.1 2008/08/23 03:40:55 toshio Exp $
-NAME := ocaml-ocamlgraph
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/import.log
+++ b/import.log
@ -1,3 +0,0 @@
-ocaml-ocamlgraph-0_99c-2_fc9:HEAD:ocaml-ocamlgraph-0.99c-2.fc9.src.rpm:1219524338
-ocaml-ocamlgraph-1_1-1_fc10:HEAD:ocaml-ocamlgraph-1.1-1.fc10.src.rpm:1249699549
-ocaml-ocamlgraph-1_3-3_fc12:HEAD:ocaml-ocamlgraph-1.3-3.fc12.src.rpm:1265858472
--- a/ocaml-ocamlgraph.spec
+++ b/ocaml-ocamlgraph.spec
@ -1,50 +1,31 @@
-# Note: rpmlint complains that this package is not marked as
-# noarch. This is not really an error as this is current standard
-# practice for OCaml libraries even though they do not contain
-# architecture dependent files themselves (the devel packages do
-# instead).
-#
-# See https://www.redhat.com/archives/fedora-packaging/2008-August/msg00017.html
-# for a discussion and
-# https://www.redhat.com/archives/fedora-packaging/2008-August/msg00020.html
-# for a potential fix. However, this is probably not the time and
-# place to try to change the standard practice, so for now I will
-# follow standard practice.
-
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%global debug_package %{nil}
-# Use new dependency generator in Fedora >= 13
-%if 0%{?fedora} <= 12
-%global _use_internal_dependency_generator 0
-%global __find_requires /usr/lib/rpm/ocaml-find-requires.sh
-%global __find_provides /usr/lib/rpm/ocaml-find-provides.sh
-%endif
+%global ocaml_destdir %{_libdir}/ocaml

 Name:           ocaml-ocamlgraph
-Version:        1.3
-Release:        3%{?dist}
+Version:        1.8.8
+Release:        25%{?dist}
 Summary:        OCaml library for arc and node graphs

-Group:          Development/Libraries
 License:        LGPLv2 with exceptions
-
-URL:            http://ocamlgraph.lri.fr/
+URL:            http://ocamlgraph.lri.fr/index.en.html
 Source0:        http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz
 Source1:        ocamlgraph-test.result
+# When building the byte variant, do not try to install artifacts that were
+# not built.
+Patch0:         ocamlgraph-1.8.6-byte-install.patch

-Patch0:         ocamlgraph-1.1-no-view-graph-doc.patch
-Patch1:         ocamlgraph-1.3-no-viewGraph_test.patch
+# Fix the tests - unclear why this is necessary.
+Patch1:         ocamlgraph-1.8.7-fix-tests.patch

-# Makefile does not install some files that other applications expect
-# - difference comes in install-findlib
-Patch2:         ocamlgraph-1.3-install-dgraph-and-viewer.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    sparc64 s390 s390x
-BuildRequires:  ocaml >= 3.08, ocaml-findlib-devel, ocaml-ocamldoc
+BuildRequires:  libart_lgpl-devel
+BuildRequires:  libgnomecanvas-devel
+BuildRequires:  make
+BuildRequires:  ocaml
+BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-lablgtk-devel
-BuildRequires:  gtk2-devel, libgnomecanvas-devel
+BuildRequires:  ocaml-ocamldoc

+%global __requires_exclude ocaml\\\(Sig\\\)
+%global libname %(sed -e 's/^ocaml-//' <<< %{name})

 %description
 Ocamlgraph provides several different implementations of graph data
@ -60,8 +41,7 @@ tools.

 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}


 %description    devel
@ -69,21 +49,38 @@ The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.


+%package        tools
+Summary:        Graph editing tools for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+
+%description    tools
+The %{name}-tools package contains graph editing tools for use with
+%{name}.
+
+
 %prep
-%setup -q -n ocamlgraph-%{version}
-
-%patch0 -p1
+%setup -q -n %{libname}-%{version}
+%ifnarch %{ocaml_native_compiler}
+%patch0
+%endif
 %patch1 -p1
-%patch2 -p1

-cp %{SOURCE1} .
+cp -p %{SOURCE1} .
+
+# Fix encoding
+for fil in CHANGES COPYING CREDITS; do
+  iconv -f latin1 -t utf-8 $fil > $fil.utf8
+  touch -r $fil $fil.utf8
+  mv -f $fil.utf8 $fil
+done


 %build
-./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
+%configure

-%if %opt
-%global opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt
+%ifarch %{ocaml_native_compiler}
+%global opt_option OCAMLBEST=opt OCAMLOPT='ocamlopt.opt -g'
 %else
 %global opt_option OCAMLBEST=byte OCAMLC=ocamlc
 %endif
@ -91,58 +88,298 @@ make depend
 make %{opt_option}
 make doc

+# Skip the tests on i386; see https://github.com/ocaml/ocaml/issues/9800
+%ifnarch %{ix86}
+%ifarch %{ocaml_native_compiler}
 %check
 make --no-print-directory check >& test
-diff test ocamlgraph-test.result
+diff -u test ocamlgraph-test.result
+%endif
+%endif


 %install
-rm -rf %{buildroot}
-
-%global ocaml_destdir %{_libdir}/ocaml
 mkdir -p %{buildroot}%{ocaml_destdir}
 make OCAMLFIND_DESTDIR=%{buildroot}%{ocaml_destdir} install-findlib
+%ifarch %{ocaml_native_compiler}
+install -m 0755 -p graph.cmxs %{buildroot}%{ocaml_destdir}/%{libname}
+%endif

-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}/
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/examples/
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/
-cp -p LICENSE %{buildroot}%{_defaultdocdir}/%{name}-%{version}/
-cp -p README %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/
-cp -p examples/*.ml %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/examples/
-cp -p doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/
+# Include all code and examples in the docs
+mkdir -p dox-devel/examples
+mkdir -p dox-devel/API
+cp -p examples/*.ml dox-devel/examples
+cp -p doc/* dox-devel/API

-
-%clean
-rm -rf %{buildroot}
+# Install the graph editing tools
+mkdir -p %{buildroot}%{_bindir}
+%ifarch %{ocaml_native_compiler}
+install -m 0755 -p editor/editor.opt %{buildroot}/%{_bindir}/ocaml-graph-editor
+install -m 0755 -p dgraph/dgraph.opt %{buildroot}%{_bindir}/ocaml-graph-viewer
+install -m 0755 -p view_graph/viewgraph.opt \
+    %{buildroot}%{_bindir}/ocaml-viewgraph
+%else
+install -m 0755 -p editor/editor.byte %{buildroot}/%{_bindir}/ocaml-graph-editor
+install -m 0755 -p dgraph/dgraph.byte %{buildroot}%{_bindir}/ocaml-graph-viewer
+install -m 0755 -p view_graph/viewgraph.byte \
+     %{buildroot}%{_bindir}/ocaml-viewgraph
+%endif


 %files
-%defattr(-,root,root,-)
-%{ocaml_destdir}/ocamlgraph/
-%if %opt
+%doc CREDITS FAQ
+%license COPYING LICENSE
+%{ocaml_destdir}/%{libname}/
+%ifarch %{ocaml_native_compiler}
 %exclude %{ocaml_destdir}/*/*.a
 %exclude %{ocaml_destdir}/*/*.cmxa
 %exclude %{ocaml_destdir}/*/*.cmx
 %exclude %{ocaml_destdir}/*/*.o
 %endif
 %exclude %{ocaml_destdir}/*/*.mli
-%{_defaultdocdir}/%{name}-%{version}/LICENSE


 %files devel
-%defattr(-,root,root,-)
-%if %opt
+%doc CHANGES README.adoc dox-devel/*
+%ifarch %{ocaml_native_compiler}
 %{ocaml_destdir}/*/*.a
 %{ocaml_destdir}/*/*.cmxa
 %{ocaml_destdir}/*/*.cmx
 %{ocaml_destdir}/*/*.o
 %endif
 %{ocaml_destdir}/*/*.mli
-# Include all code and examples in the doc directory
-%{_defaultdocdir}/%{name}-%{version}-devel/
+
+
+%files tools
+%{_bindir}/*


 %changelog
+* Mon Mar  1 16:57:43 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-25
+- OCaml 4.12.0 build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-23
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-22
+- OCaml 4.11.0 rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-21
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-19
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-18
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-17
+- OCaml 4.11.0 pre-release
+
+* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-16
+- Update all OCaml dependencies for RPM 4.16.
+
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-15
+- OCaml 4.10.0 final.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-13
+- OCaml 4.10.0+beta1 rebuild.
+
+* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-12
+- OCaml 4.09.0 for riscv64
+
+* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-11
+- OCaml 4.09.0 (final) rebuild.
+
+* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-10
+- OCaml 4.08.1 (final) rebuild.
+
+* Sat Aug 10 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-9
+- Rebuild against new ocaml-lablgtk.
+
+* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-8
+- OCaml 4.08.1 (rc2) rebuild.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-4
+- OCaml 4.07.0 (final) rebuild.
+
+* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-3
+- OCaml 4.07.0-rc1 rebuild.
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-1
+- New upstream version 1.8.8.
+
+* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-11
+- OCaml 4.06.0 rebuild.
+
+* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-10
+- OCaml 4.05.0 rebuild.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-7
+- OCaml 4.04.2 rebuild.
+
+* Fri May 12 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-6
+- Bump release and rebuild.
+
+* Thu May 11 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-5
+- OCaml 4.04.1 rebuild.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 1.8.7-3
+- rebuild for s390x codegen bug
+
+* Sun Nov 06 2016 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-2
+- Rebuild for OCaml 4.04.0.
+
+* Sat Apr 16 2016 Jerry James <loganjerry@gmail.com> - 1.8.7-1
+- New upstream release
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-5
+- OCaml 4.02.3 rebuild.
+
+* Wed Jul 22 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-4
+- Enable bytecode builds.
+
+* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-3
+- ocaml-4.02.2 final rebuild.
+
+* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-2
+- ocaml-4.02.2 rebuild.
+
+* Wed Mar 18 2015 Jerry James <loganjerry@gmail.com> - 1.8.6-1
+- New upstream release
+- Reenable documentation generation
+
+* Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.5-10
+- ocaml-4.02.1 rebuild.
+
+* Thu Oct 30 2014 Jerry James <loganjerry@gmail.com> - 1.8.5-9
+- Rebuild for new ocaml-lablgtk
+- Fix license handling
+
+* Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 1.8.5-8
+- ocaml-4.02.0 final rebuild.
+
+* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1.8.5-7
+- ocaml-4.02.0+rc1 rebuild.
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Aug 01 2014 Richard W.M. Jones <rjones@redhat.com> - 1.8.5-5
+- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
+
+* Wed Jul 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1.8.5-4
+- OCaml 4.02.0 beta rebuild.
+- Disable documentation generation.
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon Apr 21 2014 Jerry James <loganjerry@gmail.com> - 1.8.5-1
+- New upstream release
+
+* Tue Apr 15 2014 Richard W.M. Jones <rjones@redhat.com> - 1.8.4-2
+- Remove ocaml_arches macro (RHBZ#1087794).
+
+* Wed Feb 26 2014 Jerry James <loganjerry@gmail.com> - 1.8.4-1
+- New upstream release, 1.8.4+dev, where the "+dev" refers to a bug fix
+  that was applied immediately after the 1.8.4 release
+- Drop upstreamed patch
+- Install graph.cmxs and enable the -debuginfo subpackage
+- Update expected test results
+- BR ocaml-findlib only, not ocaml-findlib-devel
+- Install graph editing tools into -tools subpackage
+- Fix the bytecode build
+
+* Wed Oct 02 2013 Richard W.M. Jones <rjones@redhat.com> - 1.8.3-5
+- Rebuild for ocaml-lablgtk 2.18.
+
+* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 1.8.3-4
+- Rebuild for OCaml 4.01.0.
+
+* Tue Aug  6 2013 Jerry James <loganjerry@gmail.com> - 1.8.3-3
+- Adapt to Rawhide unversioned docdir change (bz 994002)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue May 14 2013 Jerry James <loganjerry@gmail.com> - 1.8.3-1
+- New upstream release
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Oct 17 2012 Jerry James <loganjerry@gmail.com> - 1.8.2-2
+- Rebuild for OCaml 4.00.1.
+
+* Mon Jul 30 2012 Jerry James <loganjerry@gmail.com> - 1.8.2-1
+- New upstream release
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jun 11 2012 Richard W.M. Jones <rjones@redhat.com> - 1.8.1-3
+- Rebuild for OCaml 4.00.0.
+
+* Sat Jan  7 2012 Jerry James <loganjerry@gmail.com> - 1.8.1-2
+- Rebuild for OCaml 3.12.1
+
+* Tue Oct 25 2011 Jerry James <loganjerry@gmail.com> - 1.8.1-1
+- New upstream release
+
+* Mon Jul 11 2011 Jerry James <loganjerry@gmail.com> - 1.7-1
+- New upstream release
+- Drop unnecessary spec file elements (BuildRoot, etc.)
+- Drop dependency generation workaround for Fedora 12 and earlier
+- Remove spurious executable bits on source files
+- Replace the definition of __ocaml_requires_opts to "-i Sig", which removes
+  the legitimate Requires: ocaml(GtkSignal), with __requires_exclude.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jan 21 2011 Richard W.M. Jones <rjones@redhat.com> - 1.6-2
+- Ignore ocaml(Sig) symbol.
+
+* Mon Jan 10 2011 Richard W.M. Jones <rjones@redhat.com> - 1.6-1
+- New upstream version 1.6.
+- Rebuild for OCaml 3.12.
+- Remove obsolete patches and add patch to fix install-findlib rule.
+
 * Wed Feb 10 2010 Alan Dunn <amdunn@gmail.com> - 1.3-3
 - Include files (including .cmo files) and install more files that are
  needed by other applications (eg: Frama-C) that depend on
--- a/ocamlgraph-1.1-no-view-graph-doc.patch
+++ b/ocamlgraph-1.1-no-view-graph-doc.patch
@ -1,11 +0,0 @@
--- ocamlgraph-1.1/Makefile.in.orig	2009-08-07 22:07:11.000000000 -0400
-+++ ocamlgraph-1.1/Makefile.in	2009-08-07 22:07:29.000000000 -0400
-@@ -298,7 +298,7 @@
- 	mkdir -p doc
- 	rm -f doc/*
- 	$(OCAMLDOC) -d doc -html $(INCLUDES) $(DOC_SRC)
-	$(MAKE) -C $(VIEWER_DIR) doc
-+#	$(MAKE) -C $(VIEWER_DIR) doc
- 
- # literate programming
- $(NAME).tex: $(DOC_SRC)
--- a/ocamlgraph-1.3-install-dgraph-and-viewer.patch
+++ b/ocamlgraph-1.3-install-dgraph-and-viewer.patch
@ -1,13 +0,0 @@
--- ocamlgraph-1.3-old/Makefile.in	2009-10-02 07:48:39.000000000 -0400
-+++ ocamlgraph-1.3/Makefile.in	2010-01-17 10:20:12.076904950 -0500
-@@ -335,7 +335,9 @@
- 	$(OCAMLFIND) install ocamlgraph META \
- 		$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
- 		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \
-		$(VIEWER_CMX) $(VIEWER_CMO) $(DGRAPH_CMX) $(DGRAPH_CMO)
-+		$(VIEWER_CMX) $(VIEWER_CMO) $(DGRAPH_CMX) $(DGRAPH_CMO) \
-+		$(VIEWER_CMILIB) $(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) $(VIEWER_CMOLIB) \
-+		$(DGRAPH_CMILIB) $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) $(DGRAPH_CMOLIB)
- else
- 	$(OCAMLFIND) install ocamlgraph META \
- 		$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
--- a/ocamlgraph-1.3-no-viewGraph_test.patch
+++ b/ocamlgraph-1.3-no-viewGraph_test.patch
@ -1,11 +0,0 @@
--- ocamlgraph-1.3.orig/Makefile.in	2009-10-02 12:48:39.000000000 +0100
-+++ ocamlgraph-1.3.no-vg/Makefile.in	2009-10-08 14:02:34.396309817 +0100
-@@ -144,7 +144,7 @@
- 
- viewer: $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.$(OCAMLBEST)
- 
-VIEWER_CMO=viewGraph_core viewGraph_select viewGraph_utils viewGraph_test
-+VIEWER_CMO=viewGraph_core viewGraph_select viewGraph_utils
- VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO))
- VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx)
- VIEWER_CMI=$(VIEWER_CMO:.cmo=.cmi)
--- a/ocamlgraph-1.8.6-byte-install.patch
+++ b/ocamlgraph-1.8.6-byte-install.patch
@ -0,0 +1,23 @@
+--- Makefile.in.orig	2015-01-23 00:24:01.000000000 -0700
+++ Makefile.in	2015-03-17 20:00:00.000000000 -0600
+@@ -426,16 +426,13 @@
+ ifeq (@LABLGNOMECANVAS@,yes)
+ 	$(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
+ 		$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
+-		graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \
+-		$(CMA) $(CMXA) \
+-		$(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
+-                $(VIEWER_CMXLIB:.cmx=.o) \
+-                $(DGRAPH_CMXLIB) $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) \
+-                $(DGRAPH_CMXLIB:.cmx=.o)
+		graph.cmo graph.cmi $(CMA) \
+		$(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
+		$(DGRAPH_CMOLIB) $(DGRAPH_CMILIB)
+ else
+ 	$(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
+ 		$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
+-		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
+		graph.cmo graph.cmi $(CMA)
+ endif
+ endif
+ 
--- a/ocamlgraph-1.8.7-fix-tests.patch
+++ b/ocamlgraph-1.8.7-fix-tests.patch
@ -0,0 +1,10 @@
+--- ocamlgraph-1.8.7/tests/test_clique.ml~	2016-04-12 07:47:33.000000000 +0100
+++ ocamlgraph-1.8.7/tests/test_clique.ml	2016-11-06 19:49:38.527278156 +0000
+@@ -1,5 +1,7 @@
+ (* Test file for Brom-Kerbosch *)
+ 
+#directory ".";;
+
+ open Graph
+ 
+ module G = Persistent.Graph.Concrete (struct 
--- a/ocamlgraph-test.result
+++ b/ocamlgraph-test.result
@ -1,25 +1,550 @@
-ocaml graph.cma tests/check.ml
-iter:
-pre 3
-pre 5
-pre 4
-pre 2
-post 2
-post 4
-post 5
-pre 6
-post 6
-post 3
-prefix:
-pre 3
-pre 6
-pre 5
-pre 4
-pre 2
-step:
-visit 6
-visit 5
-visit 4
-visit 2
-visit 3
-visit 1
+mkdir -p bin
+ocamlopt.opt -o bin/test-ts unix.cmxa graph.cmxa tests/test_topsort.ml
+ocaml -I . graph.cma tests/test_clique.ml tests/check.ml
+bin/test-ts 10
+0 1 2 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=1 num(y)=2
+x-->y=true  y-->x=false
+x=0 y=2 num(x)=1 num(y)=3
+x-->y=true  y-->x=false
+x=1 y=0 num(x)=2 num(y)=1
+x-->y=false  y-->x=true
+x=1 y=1 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=2 num(y)=3
+x-->y=true  y-->x=false
+x=2 y=0 num(x)=3 num(y)=1
+x-->y=false  y-->x=true
+x=2 y=1 num(x)=3 num(y)=2
+x-->y=false  y-->x=true
+x=2 y=2 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+0 1 2 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=1 num(y)=2
+x-->y=false  y-->x=false
+x=0 y=2 num(x)=1 num(y)=3
+x-->y=false  y-->x=false
+x=1 y=0 num(x)=2 num(y)=1
+x-->y=false  y-->x=false
+x=1 y=1 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=2 num(y)=3
+x-->y=false  y-->x=false
+x=2 y=0 num(x)=3 num(y)=1
+x-->y=false  y-->x=false
+x=2 y=1 num(x)=3 num(y)=2
+x-->y=false  y-->x=false
+x=2 y=2 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+0 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+0 1 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=1 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=0 num(x)=2 num(y)=1
+x-->y=true  y-->x=true
+x=1 y=1 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+0 1 2 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=1 num(y)=2
+x-->y=true  y-->x=true
+x=0 y=2 num(x)=1 num(y)=3
+x-->y=true  y-->x=false
+x=1 y=0 num(x)=2 num(y)=1
+x-->y=true  y-->x=true
+x=1 y=1 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=2 num(y)=3
+x-->y=true  y-->x=false
+x=2 y=0 num(x)=3 num(y)=1
+x-->y=false  y-->x=true
+x=2 y=1 num(x)=3 num(y)=2
+x-->y=false  y-->x=true
+x=2 y=2 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+0 2 1 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=1 num(y)=3
+x-->y=true  y-->x=false
+x=0 y=2 num(x)=1 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=0 num(x)=3 num(y)=1
+x-->y=false  y-->x=true
+x=1 y=1 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=3 num(y)=2
+x-->y=false  y-->x=true
+x=2 y=0 num(x)=2 num(y)=1
+x-->y=true  y-->x=true
+x=2 y=1 num(x)=2 num(y)=3
+x-->y=true  y-->x=false
+x=2 y=2 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+1 2 0 
+x=0 y=0 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=3 num(y)=1
+x-->y=false  y-->x=true
+x=0 y=2 num(x)=3 num(y)=2
+x-->y=false  y-->x=true
+x=1 y=0 num(x)=1 num(y)=3
+x-->y=true  y-->x=false
+x=1 y=1 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=1 num(y)=2
+x-->y=true  y-->x=true
+x=2 y=0 num(x)=2 num(y)=3
+x-->y=true  y-->x=false
+x=2 y=1 num(x)=2 num(y)=1
+x-->y=true  y-->x=true
+x=2 y=2 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+1 2 3 4 0 
+x=0 y=0 num(x)=5 num(y)=5
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=5 num(y)=1
+x-->y=false  y-->x=true
+x=0 y=2 num(x)=5 num(y)=2
+x-->y=false  y-->x=true
+x=0 y=3 num(x)=5 num(y)=3
+x-->y=false  y-->x=false
+x=0 y=4 num(x)=5 num(y)=4
+x-->y=false  y-->x=false
+x=1 y=0 num(x)=1 num(y)=5
+x-->y=true  y-->x=false
+x=1 y=1 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=1 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=3 num(x)=1 num(y)=3
+x-->y=false  y-->x=false
+x=1 y=4 num(x)=1 num(y)=4
+x-->y=false  y-->x=false
+x=2 y=0 num(x)=2 num(y)=5
+x-->y=true  y-->x=false
+x=2 y=1 num(x)=2 num(y)=1
+x-->y=true  y-->x=true
+x=2 y=2 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+x=2 y=3 num(x)=2 num(y)=3
+x-->y=false  y-->x=false
+x=2 y=4 num(x)=2 num(y)=4
+x-->y=false  y-->x=false
+x=3 y=0 num(x)=3 num(y)=5
+x-->y=false  y-->x=false
+x=3 y=1 num(x)=3 num(y)=1
+x-->y=false  y-->x=false
+x=3 y=2 num(x)=3 num(y)=2
+x-->y=false  y-->x=false
+x=3 y=3 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+x=3 y=4 num(x)=3 num(y)=4
+x-->y=true  y-->x=true
+x=4 y=0 num(x)=4 num(y)=5
+x-->y=false  y-->x=false
+x=4 y=1 num(x)=4 num(y)=1
+x-->y=false  y-->x=false
+x=4 y=2 num(x)=4 num(y)=2
+x-->y=false  y-->x=false
+x=4 y=3 num(x)=4 num(y)=3
+x-->y=true  y-->x=true
+x=4 y=4 num(x)=4 num(y)=4
+x-->y=true  y-->x=true
+0 1 2 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=1 num(y)=2
+x-->y=true  y-->x=false
+x=0 y=2 num(x)=1 num(y)=3
+x-->y=true  y-->x=false
+x=1 y=0 num(x)=2 num(y)=1
+x-->y=false  y-->x=true
+x=1 y=1 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=2 num(y)=3
+x-->y=true  y-->x=true
+x=2 y=0 num(x)=3 num(y)=1
+x-->y=false  y-->x=true
+x=2 y=1 num(x)=3 num(y)=2
+x-->y=true  y-->x=true
+x=2 y=2 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+0 1 2 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=1 num(y)=2
+x-->y=true  y-->x=false
+x=0 y=2 num(x)=1 num(y)=3
+x-->y=true  y-->x=false
+x=1 y=0 num(x)=2 num(y)=1
+x-->y=false  y-->x=true
+x=1 y=1 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=2 num(y)=3
+x-->y=true  y-->x=true
+x=2 y=0 num(x)=3 num(y)=1
+x-->y=false  y-->x=true
+x=2 y=1 num(x)=3 num(y)=2
+x-->y=true  y-->x=true
+x=2 y=2 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+2 3 0 1 
+x=0 y=0 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=3 num(y)=4
+x-->y=true  y-->x=true
+x=0 y=2 num(x)=3 num(y)=1
+x-->y=false  y-->x=true
+x=0 y=3 num(x)=3 num(y)=2
+x-->y=false  y-->x=true
+x=1 y=0 num(x)=4 num(y)=3
+x-->y=true  y-->x=true
+x=1 y=1 num(x)=4 num(y)=4
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=4 num(y)=1
+x-->y=false  y-->x=true
+x=1 y=3 num(x)=4 num(y)=2
+x-->y=false  y-->x=true
+x=2 y=0 num(x)=1 num(y)=3
+x-->y=true  y-->x=false
+x=2 y=1 num(x)=1 num(y)=4
+x-->y=true  y-->x=false
+x=2 y=2 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=2 y=3 num(x)=1 num(y)=2
+x-->y=true  y-->x=true
+x=3 y=0 num(x)=2 num(y)=3
+x-->y=true  y-->x=false
+x=3 y=1 num(x)=2 num(y)=4
+x-->y=true  y-->x=false
+x=3 y=2 num(x)=2 num(y)=1
+x-->y=true  y-->x=true
+x=3 y=3 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+0 1 2 3 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=1 num(y)=2
+x-->y=true  y-->x=true
+x=0 y=2 num(x)=1 num(y)=3
+x-->y=true  y-->x=false
+x=0 y=3 num(x)=1 num(y)=4
+x-->y=true  y-->x=false
+x=1 y=0 num(x)=2 num(y)=1
+x-->y=true  y-->x=true
+x=1 y=1 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=2 num(y)=3
+x-->y=true  y-->x=false
+x=1 y=3 num(x)=2 num(y)=4
+x-->y=true  y-->x=false
+x=2 y=0 num(x)=3 num(y)=1
+x-->y=false  y-->x=true
+x=2 y=1 num(x)=3 num(y)=2
+x-->y=false  y-->x=true
+x=2 y=2 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+x=2 y=3 num(x)=3 num(y)=4
+x-->y=true  y-->x=true
+x=3 y=0 num(x)=4 num(y)=1
+x-->y=false  y-->x=true
+x=3 y=1 num(x)=4 num(y)=2
+x-->y=false  y-->x=true
+x=3 y=2 num(x)=4 num(y)=3
+x-->y=true  y-->x=true
+x=3 y=3 num(x)=4 num(y)=4
+x-->y=true  y-->x=true
+0 1 2 3 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=1 num(y)=2
+x-->y=true  y-->x=true
+x=0 y=2 num(x)=1 num(y)=3
+x-->y=true  y-->x=true
+x=0 y=3 num(x)=1 num(y)=4
+x-->y=true  y-->x=true
+x=1 y=0 num(x)=2 num(y)=1
+x-->y=true  y-->x=true
+x=1 y=1 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=2 num(y)=3
+x-->y=true  y-->x=true
+x=1 y=3 num(x)=2 num(y)=4
+x-->y=true  y-->x=true
+x=2 y=0 num(x)=3 num(y)=1
+x-->y=true  y-->x=true
+x=2 y=1 num(x)=3 num(y)=2
+x-->y=true  y-->x=true
+x=2 y=2 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+x=2 y=3 num(x)=3 num(y)=4
+x-->y=true  y-->x=true
+x=3 y=0 num(x)=4 num(y)=1
+x-->y=true  y-->x=true
+x=3 y=1 num(x)=4 num(y)=2
+x-->y=true  y-->x=true
+x=3 y=2 num(x)=4 num(y)=3
+x-->y=true  y-->x=true
+x=3 y=3 num(x)=4 num(y)=4
+x-->y=true  y-->x=true
+3 0 1 2 4 
+x=0 y=0 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=2 num(y)=3
+x-->y=true  y-->x=true
+x=0 y=2 num(x)=2 num(y)=4
+x-->y=true  y-->x=true
+x=0 y=3 num(x)=2 num(y)=1
+x-->y=false  y-->x=true
+x=0 y=4 num(x)=2 num(y)=5
+x-->y=true  y-->x=false
+x=1 y=0 num(x)=3 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=1 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=3 num(y)=4
+x-->y=true  y-->x=true
+x=1 y=3 num(x)=3 num(y)=1
+x-->y=false  y-->x=true
+x=1 y=4 num(x)=3 num(y)=5
+x-->y=true  y-->x=false
+x=2 y=0 num(x)=4 num(y)=2
+x-->y=true  y-->x=true
+x=2 y=1 num(x)=4 num(y)=3
+x-->y=true  y-->x=true
+x=2 y=2 num(x)=4 num(y)=4
+x-->y=true  y-->x=true
+x=2 y=3 num(x)=4 num(y)=1
+x-->y=false  y-->x=true
+x=2 y=4 num(x)=4 num(y)=5
+x-->y=true  y-->x=false
+x=3 y=0 num(x)=1 num(y)=2
+x-->y=true  y-->x=false
+x=3 y=1 num(x)=1 num(y)=3
+x-->y=true  y-->x=false
+x=3 y=2 num(x)=1 num(y)=4
+x-->y=true  y-->x=false
+x=3 y=3 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=3 y=4 num(x)=1 num(y)=5
+x-->y=true  y-->x=false
+x=4 y=0 num(x)=5 num(y)=2
+x-->y=false  y-->x=true
+x=4 y=1 num(x)=5 num(y)=3
+x-->y=false  y-->x=true
+x=4 y=2 num(x)=5 num(y)=4
+x-->y=false  y-->x=true
+x=4 y=3 num(x)=5 num(y)=1
+x-->y=false  y-->x=true
+x=4 y=4 num(x)=5 num(y)=5
+x-->y=true  y-->x=true
+0 1 2 3 4 5 6 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=1 num(y)=2
+x-->y=true  y-->x=true
+x=0 y=2 num(x)=1 num(y)=3
+x-->y=true  y-->x=false
+x=0 y=3 num(x)=1 num(y)=4
+x-->y=true  y-->x=false
+x=0 y=4 num(x)=1 num(y)=5
+x-->y=true  y-->x=false
+x=0 y=5 num(x)=1 num(y)=6
+x-->y=true  y-->x=false
+x=0 y=6 num(x)=1 num(y)=7
+x-->y=true  y-->x=false
+x=1 y=0 num(x)=2 num(y)=1
+x-->y=true  y-->x=true
+x=1 y=1 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=2 num(y)=3
+x-->y=true  y-->x=false
+x=1 y=3 num(x)=2 num(y)=4
+x-->y=true  y-->x=false
+x=1 y=4 num(x)=2 num(y)=5
+x-->y=true  y-->x=false
+x=1 y=5 num(x)=2 num(y)=6
+x-->y=true  y-->x=false
+x=1 y=6 num(x)=2 num(y)=7
+x-->y=true  y-->x=false
+x=2 y=0 num(x)=3 num(y)=1
+x-->y=false  y-->x=true
+x=2 y=1 num(x)=3 num(y)=2
+x-->y=false  y-->x=true
+x=2 y=2 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+x=2 y=3 num(x)=3 num(y)=4
+x-->y=true  y-->x=true
+x=2 y=4 num(x)=3 num(y)=5
+x-->y=true  y-->x=false
+x=2 y=5 num(x)=3 num(y)=6
+x-->y=true  y-->x=false
+x=2 y=6 num(x)=3 num(y)=7
+x-->y=true  y-->x=false
+x=3 y=0 num(x)=4 num(y)=1
+x-->y=false  y-->x=true
+x=3 y=1 num(x)=4 num(y)=2
+x-->y=false  y-->x=true
+x=3 y=2 num(x)=4 num(y)=3
+x-->y=true  y-->x=true
+x=3 y=3 num(x)=4 num(y)=4
+x-->y=true  y-->x=true
+x=3 y=4 num(x)=4 num(y)=5
+x-->y=true  y-->x=false
+x=3 y=5 num(x)=4 num(y)=6
+x-->y=true  y-->x=false
+x=3 y=6 num(x)=4 num(y)=7
+x-->y=true  y-->x=false
+x=4 y=0 num(x)=5 num(y)=1
+x-->y=false  y-->x=true
+x=4 y=1 num(x)=5 num(y)=2
+x-->y=false  y-->x=true
+x=4 y=2 num(x)=5 num(y)=3
+x-->y=false  y-->x=true
+x=4 y=3 num(x)=5 num(y)=4
+x-->y=false  y-->x=true
+x=4 y=4 num(x)=5 num(y)=5
+x-->y=true  y-->x=true
+x=4 y=5 num(x)=5 num(y)=6
+x-->y=true  y-->x=true
+x=4 y=6 num(x)=5 num(y)=7
+x-->y=true  y-->x=true
+x=5 y=0 num(x)=6 num(y)=1
+x-->y=false  y-->x=true
+x=5 y=1 num(x)=6 num(y)=2
+x-->y=false  y-->x=true
+x=5 y=2 num(x)=6 num(y)=3
+x-->y=false  y-->x=true
+x=5 y=3 num(x)=6 num(y)=4
+x-->y=false  y-->x=true
+x=5 y=4 num(x)=6 num(y)=5
+x-->y=true  y-->x=true
+x=5 y=5 num(x)=6 num(y)=6
+x-->y=true  y-->x=true
+x=5 y=6 num(x)=6 num(y)=7
+x-->y=true  y-->x=true
+x=6 y=0 num(x)=7 num(y)=1
+x-->y=false  y-->x=true
+x=6 y=1 num(x)=7 num(y)=2
+x-->y=false  y-->x=true
+x=6 y=2 num(x)=7 num(y)=3
+x-->y=false  y-->x=true
+x=6 y=3 num(x)=7 num(y)=4
+x-->y=false  y-->x=true
+x=6 y=4 num(x)=7 num(y)=5
+x-->y=true  y-->x=true
+x=6 y=5 num(x)=7 num(y)=6
+x-->y=true  y-->x=true
+x=6 y=6 num(x)=7 num(y)=7
+x-->y=true  y-->x=true
+0 1 2 3 4 5 6 
+x=0 y=0 num(x)=1 num(y)=1
+x-->y=true  y-->x=true
+x=0 y=1 num(x)=1 num(y)=2
+x-->y=true  y-->x=true
+x=0 y=2 num(x)=1 num(y)=3
+x-->y=true  y-->x=false
+x=0 y=3 num(x)=1 num(y)=4
+x-->y=true  y-->x=false
+x=0 y=4 num(x)=1 num(y)=5
+x-->y=true  y-->x=false
+x=0 y=5 num(x)=1 num(y)=6
+x-->y=true  y-->x=false
+x=0 y=6 num(x)=1 num(y)=7
+x-->y=true  y-->x=false
+x=1 y=0 num(x)=2 num(y)=1
+x-->y=true  y-->x=true
+x=1 y=1 num(x)=2 num(y)=2
+x-->y=true  y-->x=true
+x=1 y=2 num(x)=2 num(y)=3
+x-->y=true  y-->x=false
+x=1 y=3 num(x)=2 num(y)=4
+x-->y=true  y-->x=false
+x=1 y=4 num(x)=2 num(y)=5
+x-->y=true  y-->x=false
+x=1 y=5 num(x)=2 num(y)=6
+x-->y=true  y-->x=false
+x=1 y=6 num(x)=2 num(y)=7
+x-->y=true  y-->x=false
+x=2 y=0 num(x)=3 num(y)=1
+x-->y=false  y-->x=true
+x=2 y=1 num(x)=3 num(y)=2
+x-->y=false  y-->x=true
+x=2 y=2 num(x)=3 num(y)=3
+x-->y=true  y-->x=true
+x=2 y=3 num(x)=3 num(y)=4
+x-->y=true  y-->x=true
+x=2 y=4 num(x)=3 num(y)=5
+x-->y=true  y-->x=true
+x=2 y=5 num(x)=3 num(y)=6
+x-->y=true  y-->x=true
+x=2 y=6 num(x)=3 num(y)=7
+x-->y=true  y-->x=true
+x=3 y=0 num(x)=4 num(y)=1
+x-->y=false  y-->x=true
+x=3 y=1 num(x)=4 num(y)=2
+x-->y=false  y-->x=true
+x=3 y=2 num(x)=4 num(y)=3
+x-->y=true  y-->x=true
+x=3 y=3 num(x)=4 num(y)=4
+x-->y=true  y-->x=true
+x=3 y=4 num(x)=4 num(y)=5
+x-->y=true  y-->x=true
+x=3 y=5 num(x)=4 num(y)=6
+x-->y=true  y-->x=true
+x=3 y=6 num(x)=4 num(y)=7
+x-->y=true  y-->x=true
+x=4 y=0 num(x)=5 num(y)=1
+x-->y=false  y-->x=true
+x=4 y=1 num(x)=5 num(y)=2
+x-->y=false  y-->x=true
+x=4 y=2 num(x)=5 num(y)=3
+x-->y=true  y-->x=true
+x=4 y=3 num(x)=5 num(y)=4
+x-->y=true  y-->x=true
+x=4 y=4 num(x)=5 num(y)=5
+x-->y=true  y-->x=true
+x=4 y=5 num(x)=5 num(y)=6
+x-->y=true  y-->x=true
+x=4 y=6 num(x)=5 num(y)=7
+x-->y=true  y-->x=true
+x=5 y=0 num(x)=6 num(y)=1
+x-->y=false  y-->x=true
+x=5 y=1 num(x)=6 num(y)=2
+x-->y=false  y-->x=true
+x=5 y=2 num(x)=6 num(y)=3
+x-->y=true  y-->x=true
+x=5 y=3 num(x)=6 num(y)=4
+x-->y=true  y-->x=true
+x=5 y=4 num(x)=6 num(y)=5
+x-->y=true  y-->x=true
+x=5 y=5 num(x)=6 num(y)=6
+x-->y=true  y-->x=true
+x=5 y=6 num(x)=6 num(y)=7
+x-->y=true  y-->x=true
+x=6 y=0 num(x)=7 num(y)=1
+x-->y=false  y-->x=true
+x=6 y=1 num(x)=7 num(y)=2
+x-->y=false  y-->x=true
+x=6 y=2 num(x)=7 num(y)=3
+x-->y=true  y-->x=true
+x=6 y=3 num(x)=7 num(y)=4
+x-->y=true  y-->x=true
+x=6 y=4 num(x)=7 num(y)=5
+x-->y=true  y-->x=true
+x=6 y=5 num(x)=7 num(y)=6
+x-->y=true  y-->x=true
+x=6 y=6 num(x)=7 num(y)=7
+x-->y=true  y-->x=true
+All tests succeeded.
+
--- a/2
+++ b/2
@ -1 +1 @@
-9bcff267d041d3caec5f4f8c514f9cc1  ocamlgraph-1.3.tar.gz
+SHA512 (ocamlgraph-1.8.8.tar.gz) = ccb07d4a7fb0c3026ad2d4563e1ca0a88483ac3cf43c9378989ae5c031961853a11c9673c06b54a16733c5755d9c0a2783c5f475afdcc7692d2bf3d4778f5bc5
Author	SHA1	Message	Date
Richard W.M. Jones	1c397e65ac	OCaml 4.12.0 build	2021-03-01 16:57:44 +00:00
Fedora Release Engineering	efe11413c4	- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-01-26 22:02:06 +00:00
Jerry James	eae6842713	Explicitly BR make.	2020-11-09 16:47:54 -07:00
Richard W.M. Jones	087ca378a5	OCaml 4.11.1 rebuild	2020-09-01 20:33:10 +01:00
Richard W.M. Jones	e67ce1277a	OCaml 4.11.0 rebuild	2020-08-21 12:23:20 +01:00
Jerry James	89f7da510a	Disable tests on i386 due to PIE issue.	2020-08-05 10:26:49 -06:00
Fedora Release Engineering	b3d9984585	- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-08-01 06:40:03 +00:00
Fedora Release Engineering	5764bbeff2	- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-07-28 12:14:11 +00:00
Richard W.M. Jones	462e3fc831	OCaml 4.11.0+dev2-2020-04-22 rebuild	2020-05-05 00:00:55 +01:00
Richard W.M. Jones	06f19bdccc	OCaml 4.11.0 pre-release attempt 2	2020-04-21 19:49:04 +01:00
Richard W.M. Jones	475059402f	OCaml 4.11.0 pre-release	2020-04-17 21:35:28 +01:00
Richard W.M. Jones	88433e4e9a	Update all OCaml dependencies for RPM 4.16.	2020-04-02 23:08:05 +01:00
Richard W.M. Jones	c2a6ef1449	OCaml 4.10.0 final.	2020-02-26 14:17:09 +00:00
Fedora Release Engineering	6eb2f20252	- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-01-29 19:40:34 +00:00
Richard W.M. Jones	27c9570599	OCaml 4.10.0+beta1 rebuild.	2020-01-19 16:54:52 +00:00
Richard W.M. Jones	801f05e1df	OCaml 4.09.0 for riscv64	2020-01-09 22:22:09 +00:00
Richard W.M. Jones	a3aa873332	OCaml 4.09.0 (final) rebuild.	2019-12-06 12:52:06 +00:00
Richard W.M. Jones	a00a210f7c	OCaml 4.08.1 (final) rebuild.	2019-08-16 13:12:03 +01:00
Richard W.M. Jones	13518c8052	Rebuild against new ocaml-lablgtk.	2019-08-10 10:39:39 +01:00
Richard W.M. Jones	e0204097a2	OCaml 4.08.1 (rc2) rebuild.	2019-07-31 22:11:48 +01:00
Fedora Release Engineering	fd4e02df3c	- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-07-25 22:57:01 +00:00
Fedora Release Engineering	f68c523888	- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-02-01 16:54:00 +00:00
Fedora Release Engineering	b23aecaee1	- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-07-13 14:46:02 +00:00
Richard W.M. Jones	5ad3f0bd75	OCaml 4.07.0 (final) rebuild.	2018-07-11 14:57:15 +01:00
Richard W.M. Jones	b784d3e69b	OCaml 4.07.0-rc1 rebuild.	2018-06-19 22:22:53 +01:00
Fedora Release Engineering	390232d1c2	- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-02-08 08:54:28 +00:00
Richard W.M. Jones	c667791fb7	New upstream version 1.8.8.	2017-11-08 17:56:09 +00:00
Richard W.M. Jones	b66866e56d	Bump release and rebuild.	2017-11-08 17:22:07 +00:00
Richard W.M. Jones	57363b969e	Bump release and rebuild.	2017-11-08 16:42:13 +00:00
Richard W.M. Jones	832e0e6d1a	Bump release and rebuild.	2017-11-08 15:42:04 +00:00
Richard W.M. Jones	69afba0195	OCaml 4.06.0 rebuild.	2017-11-07 23:26:15 +00:00
Richard W.M. Jones	4b65f79d61	OCaml 4.05.0 rebuild.	2017-08-07 20:02:01 +01:00
Fedora Release Engineering	92753a8606	- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild	2017-08-03 04:17:52 +00:00
Fedora Release Engineering	35cd69091d	- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild	2017-07-27 01:29:51 +00:00
Richard W.M. Jones	0920c5adfe	OCaml 4.04.2 rebuild.	2017-06-26 19:04:46 +01:00
Richard W.M. Jones	fd95484c12	Bump release and rebuild.	2017-05-12 08:33:26 +01:00
Richard W.M. Jones	1ac26ce3f5	OCaml 4.04.1 rebuild.	2017-05-11 22:15:15 +01:00
Fedora Release Engineering	68c80c00ee	- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild	2017-02-11 00:33:50 +00:00
Dan Horák	39128591bc	- rebuild for s390x codegen bug	2016-11-09 19:00:01 +01:00
Richard W.M. Jones	4251ad60d8	Fix the tests.	2016-11-06 19:51:13 +00:00
Richard W.M. Jones	f609630572	Rebuild for OCaml 4.04.0.	2016-11-06 19:39:58 +00:00
Jerry James	8345187200	New upstream release.	2016-04-16 22:09:35 -06:00
Fedora Release Engineering	a77d13b46a	- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild	2016-02-04 11:08:53 +00:00
Richard W.M. Jones	64f250e757	OCaml 4.02.3 rebuild.	2015-07-28 16:37:33 +01:00
Richard W.M. Jones	1c8d9d1ff3	Enable bytecode builds.	2015-07-22 16:34:38 +01:00
Richard W.M. Jones	74ce89687e	ocaml-4.02.2 final rebuild.	2015-06-24 17:47:31 +01:00
Richard W.M. Jones	61ccec1e37	ocaml-4.02.2 rebuild.	2015-06-17 16:30:13 +01:00
Jerry James	57eba89f14	New upstream release. Also reenable documentation generation.	2015-03-19 11:55:02 -06:00
Richard W.M. Jones	09e67b9253	ocaml-4.02.1 rebuild.	2015-02-16 18:37:27 +00:00
Jerry James	c1523bbec5	Rebuild for new ocaml-lablgtk. Fix license handling.	2014-10-30 14:54:53 -06:00
Richard W.M. Jones	06cef26c0b	ocaml-4.02.0 final rebuild.	2014-08-30 19:02:31 +01:00
Richard W.M. Jones	8e06551b3c	ocaml-4.02.0+rc1 rebuild.	2014-08-23 17:36:11 +01:00
Peter Robinson	f8ce2e9f2f	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild	2014-08-17 13:00:42 +00:00
Richard W.M. Jones	d5f823d76f	ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.	2014-08-01 21:35:20 +01:00
Richard W.M. Jones	36fa87419f	Disable documentation generation.	2014-07-25 12:17:40 +01:00
Richard W.M. Jones	1cea254ddd	OCaml 4.02.0 beta rebuild.	2014-07-23 15:14:03 +01:00
Dennis Gilmore	0f96391965	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild	2014-06-07 10:43:45 -05:00
Jerry James	52bf5b57dd	New upstream release.	2014-04-21 16:00:50 -06:00
Richard W.M. Jones	efb30521f9	Remove ocaml_arches macro (RHBZ#1087794).	2014-04-15 13:41:23 +01:00
Jerry James	9f346d1442	New upstream release, 1.8.4+dev, where the "+dev" refers to a bug fix that was applied immediately after the 1.8.4 release. Also: - Drop upstreamed patch. - Install graph.cmxs and enable the -debuginfo subpackage. - Update expected test results. - BR ocaml-findlib only, not ocaml-findlib-devel. - Install graph editing tools into -tools subpackage. - Fix the bytecode build.	2014-02-26 07:35:57 -07:00
Richard W.M. Jones	6e4162533d	Rebuild for ocaml-lablgtk 2.18.	2013-10-02 14:16:11 +01:00
Richard W.M. Jones	d098408faf	Rebuild for OCaml 4.01.0.	2013-09-14 14:24:10 +01:00
Jerry James	b5dddefdc2	Adapt to Rawhide unversioned docdir change (bz 994002).	2013-08-06 09:12:38 -06:00
Dennis Gilmore	d6f096b0c9	- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild	2013-08-03 09:57:58 -05:00
Jerry James	5ccbe52e8b	New upstream release.	2013-05-14 13:43:27 -06:00
Dennis Gilmore	c38d1516ed	- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild	2013-02-14 03:01:00 -06:00
Jerry James	b8ac872f7e	Rebuild for OCaml 4.00.1.	2012-10-17 09:31:56 -06:00
Jerry James	8afa35f243	New upstream release.	2012-07-30 16:51:03 -06:00
Dennis Gilmore	da04023d61	- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild	2012-07-20 01:05:09 -05:00
Richard W.M. Jones	135f4ed531	Rebuild for OCaml 4.00.0.	2012-06-11 09:26:28 +01:00
Jerry James	b6ab39c6c7	Rebuild for OCaml 3.12.1.	2012-01-07 17:50:55 -07:00
Jerry James	c1691efb93	New upstream release.	2011-10-28 10:57:20 -06:00
Jerry James	256528d223	New upstream release. Drop unnecessary spec file elements (BuildRoot, etc.). Drop dependency generation workaround for Fedora 12 and earlier. Remove spurious executable bits on source files. Replace the definition of __ocaml_requires_opts to "-i Sig", which removes the legitimate Requires: ocaml(GtkSignal), with __requires_exclude.	2011-07-11 15:31:14 -06:00
Dennis Gilmore	6dc8edb851	- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild	2011-02-08 19:59:27 -06:00
Richard W.M. Jones	c4d5392b03	Ignore ocaml(Sig) symbol.	2011-01-21 15:54:18 +00:00
Richard W.M. Jones	1fbf4fd712	- New upstream version 1.6. - Rebuild for OCaml 3.12. - Remove obsolete patches and add patch to fix install-findlib rule.	2011-01-10 13:35:00 +00:00
Fedora Release Engineering	1e15d9bd69	dist-git conversion	2010-07-29 04:46:04 +00:00