rpms/ocaml-ocamlgraph/F-10 ocamlgraph-1.0-no-view-graph-doc.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 ocaml-ocamlgraph.spec, 1.1, 1.2 sources, 1.2, 1.3 ocamlgraph-makefile.patch, 1.1, NONE

[Alan Dunn]

Author: amdunn

Update of /cvs/pkgs/rpms/ocaml-ocamlgraph/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15531/F-10

Modified Files:
	.cvsignore import.log ocaml-ocamlgraph.spec sources 
Added Files:
	ocamlgraph-1.0-no-view-graph-doc.patch 
Removed Files:
	ocamlgraph-makefile.patch 
Log Message:
Backport of ocaml-ocamlgraph-1.0 to F-10 from F-11.


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

--- NEW FILE ocamlgraph-1.0-no-view-graph-doc.patch ---
--- 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)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2008 20:48:48 -0000	1.2
+++ .cvsignore	6 Mar 2009 21:33:33 -0000	1.3
@@ -1 +1 @@
-ocamlgraph-0.99c.tar.gz
+ocamlgraph-1.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Aug 2008 20:48:48 -0000	1.1
+++ import.log	6 Mar 2009 21:33:33 -0000	1.2
@@ -1 +1,2 @@
 ocaml-ocamlgraph-0_99c-2_fc9:HEAD:ocaml-ocamlgraph-0.99c-2.fc9.src.rpm:1219524338
+ocaml-ocamlgraph-1_0-4_fc10:F-10:ocaml-ocamlgraph-1.0-4.fc10.src.rpm:1236374907


Index: ocaml-ocamlgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-10/ocaml-ocamlgraph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-ocamlgraph.spec	23 Aug 2008 20:48:48 -0000	1.1
+++ ocaml-ocamlgraph.spec	6 Mar 2009 21:33:33 -0000	1.2
@@ -18,18 +18,24 @@
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 Name:		ocaml-ocamlgraph
-Version:	0.99c
-Release:	2%{?dist}
+Version:	1.0
+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 @@
 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 +80,10 @@
 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 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 @@
 %exclude %{ocaml_destdir}/*/*.mli
 %{_defaultdocdir}/%{name}-%{version}/LICENSE
 
+
 %files devel
 %defattr(-,root,root,-)
 %if %opt
@@ -115,10 +128,26 @@
 # Include all code and examples in the doc directory
 %{_defaultdocdir}/%{name}-%{version}-devel/
 
+
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at 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 at 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 at 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 at 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 at gmail.com> 0.99c-1
 - Initial Fedora RPM release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2008 20:48:48 -0000	1.2
+++ sources	6 Mar 2009 21:33:33 -0000	1.3
@@ -1 +1 @@
-3aff22a06afaa105ca40e31a5e15cf21  ocamlgraph-0.99c.tar.gz
+65dfcab73bc15776f7547860a78d682a  ocamlgraph-1.0.tar.gz


--- ocamlgraph-makefile.patch DELETED ---