Backport to F-9 from F-11 of ocaml-ocamlgraph-1.0.

.cvsignore

@@ -1 +1 @@
-ocamlgraph-0.99c.tar.gz
+ocamlgraph-1.0.tar.gz

import.log

@@ -1 +1,2 @@
 ocaml-ocamlgraph-0_99c-2_fc9:F-9:ocaml-ocamlgraph-0.99c-2.fc9.src.rpm:1219524667
+ocaml-ocamlgraph-1_0-4_fc10:F-9:ocaml-ocamlgraph-1.0-4.fc10.src.rpm:1236375101

ocaml-ocamlgraph.spec

@@ -18,18 +18,24 @@
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 Name:		ocaml-ocamlgraph
-Version:	0.99c
+Version:	1.0
-Release:	2%{?dist}
+Release:	4%{?dist}
 Summary:	OCaml library for arc and node graphs
 
 Group:		Development/Libraries
 License:	LGPLv2 with exceptions
+
 URL:		http://ocamlgraph.lri.fr/
-Source0:	http://ocamlgraph.lri.fr/download/ocamlgraph-0.99c.tar.gz
+Source0:	http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz
 Source1:	ocamlgraph-test.result
-Patch0:		ocamlgraph-makefile.patch
+
+Patch0:         ocamlgraph-1.0-no-view-graph-doc.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ocaml >= 3.08, ocaml-findlib-devel, ocaml-ocamldoc
+BuildRequires:  ocaml-lablgtk-devel
+BuildRequires:  gtk2-devel, libgnomecanvas-devel
+
 
 %description
 Ocamlgraph provides several different implementations of graph data
@@ -42,23 +48,26 @@ reusability. Also has input and output capability for Graph Modeling
 Language file format and Dot and Neato graphviz (graph visualization)
 tools.
 
+
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
+
 %description	devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
+
 %prep
 %setup -q -n ocamlgraph-%{version}
 
-# Fixes makefile to avoid error during findlib install and properly copy .mli files into devel package
+%patch0 -p1
-%patch0
 
 cp %{SOURCE1} .
 
+
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
 
@@ -71,9 +80,10 @@ make %{opt_option}
 make doc
 
 %check
-make check >& test
+make --no-print-directory check >& test
 diff test ocamlgraph-test.result
 
+
 %install
 rm -rf %{buildroot}
 
@@ -90,9 +100,11 @@ 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/
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
 %{ocaml_destdir}/ocamlgraph/
@@ -104,6 +116,7 @@ rm -rf %{buildroot}
 %exclude %{ocaml_destdir}/*/*.mli
 %{_defaultdocdir}/%{name}-%{version}/LICENSE
 
+
 %files devel
 %defattr(-,root,root,-)
 %if %opt
@@ -115,10 +128,26 @@ rm -rf %{buildroot}
 # Include all code and examples in the doc directory
 %{_defaultdocdir}/%{name}-%{version}-devel/
 
+
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Dec  5 2008 Richard W.M. Jones <rjones@redhat.com> - 1.0-3
+- Rebuild for OCaml 3.11.0.
+- Requires lablgtk2.
+- Pull in gtk / libgnomecanvas too.
+
+* Thu Nov 20 2008 Richard W.M. Jones <rjones@redhat.com> - 1.0-1
+- New upstream release 1.0.
+- Patch0 removed - now upstream.
+- Added a patch to fix documentation problem.
+- Run tests with 'make --no-print-directory'.
+
 * Wed Aug 13 2008 Alan Dunn <amdunn@gmail.com> 0.99c-2
 - Incorporates changes suggested during review:
 - License information was incorrect
 - rpmlint error now properly justified
+
 * Thu Aug 07 2008 Alan Dunn <amdunn@gmail.com> 0.99c-1
 - Initial Fedora RPM release.

ocamlgraph-1.0-no-view-graph-doc.patch

@@ -0,0 +1,11 @@
+--- ocamlgraph-1.0/Makefile.in.orig	2008-11-20 16:38:27.000000000 +0000
++++ ocamlgraph-1.0/Makefile.in	2008-11-20 16:38:42.000000000 +0000
+@@ -293,7 +293,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)

ocamlgraph-makefile.patch

@@ -1,11 +0,0 @@
---- Makefile.in	2008-04-03 11:16:32.000000000 -0400
-+++ Makefile.in	2008-08-07 06:31:20.000000000 -0400
-@@ -213,7 +213,7 @@
- 
- install-findlib: META
- ifdef OCAMLFIND
--	$(OCAMLFIND) install ocamlgraph META *.mli \
-+	$(OCAMLFIND) install ocamlgraph META src/*.mli \
- 		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
- endif
- 

sources

@@ -1 +1 @@
-3aff22a06afaa105ca40e31a5e15cf21  ocamlgraph-0.99c.tar.gz
+65dfcab73bc15776f7547860a78d682a  ocamlgraph-1.0.tar.gz