From dbc8fc5a0486b590133e93053bd97e9acb6b8c7b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Thu, 20 Nov 2008 16:49:18 +0000
Subject: [PATCH] - New upstream release 1.0. - Patch0 removed - now upstream.
 - Added a patch to fix documentation problem. - Run tests with 'make
 --no-print-directory'.

---
 .cvsignore                             |  2 +-
 ocaml-ocamlgraph.spec                  | 33 ++++++++++++++++++++------
 ocamlgraph-1.0-no-view-graph-doc.patch | 11 +++++++++
 ocamlgraph-makefile.patch              | 11 ---------
 sources                                |  2 +-
 5 files changed, 39 insertions(+), 20 deletions(-)
 create mode 100644 ocamlgraph-1.0-no-view-graph-doc.patch
 delete mode 100644 ocamlgraph-makefile.patch

diff --git a/.cvsignore b/.cvsignore
index 0475770..4eba604 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ocamlgraph-0.99c.tar.gz
+ocamlgraph-1.0.tar.gz
diff --git a/ocaml-ocamlgraph.spec b/ocaml-ocamlgraph.spec
index 94be37d..79f4559 100644
--- a/ocaml-ocamlgraph.spec
+++ b/ocaml-ocamlgraph.spec
@@ -18,19 +18,23 @@
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 Name:		ocaml-ocamlgraph
-Version:	0.99c
-Release:	2%{?dist}
+Version:	1.0
+Release:	1%{?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
 
+
 %description
 Ocamlgraph provides several different implementations of graph data
 structures. It also provides implementations for a number of classical
@@ -42,23 +46,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
+%patch0 -p1
 
 cp %{SOURCE1} .
 
+
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
 
@@ -71,9 +78,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 +98,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 +114,7 @@ rm -rf %{buildroot}
 %exclude %{ocaml_destdir}/*/*.mli
 %{_defaultdocdir}/%{name}-%{version}/LICENSE
 
+
 %files devel
 %defattr(-,root,root,-)
 %if %opt
@@ -115,10 +126,18 @@ rm -rf %{buildroot}
 # Include all code and examples in the doc directory
 %{_defaultdocdir}/%{name}-%{version}-devel/
 
+
 %changelog
+* 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.
diff --git a/ocamlgraph-1.0-no-view-graph-doc.patch b/ocamlgraph-1.0-no-view-graph-doc.patch
new file mode 100644
index 0000000..40bd657
--- /dev/null
+++ b/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)
diff --git a/ocamlgraph-makefile.patch b/ocamlgraph-makefile.patch
deleted file mode 100644
index e0221b1..0000000
--- a/ocamlgraph-makefile.patch
+++ /dev/null
@@ -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
- 
diff --git a/sources b/sources
index f095052..5354d60 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3aff22a06afaa105ca40e31a5e15cf21  ocamlgraph-0.99c.tar.gz
+65dfcab73bc15776f7547860a78d682a  ocamlgraph-1.0.tar.gz