rpms/ocaml-ocamlgraph/F-11 ocamlgraph-1.1-no-view-graph-doc.patch, NONE, 1.1 ocamlgraph-1.3-install-dgraph-and-viewer.patch, NONE, 1.1 ocamlgraph-1.3-no-viewGraph_test.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 ocaml-ocamlgraph.spec, 1.5, 1.6 sources, 1.3, 1.4 ocamlgraph-1.0-no-view-graph-doc.patch, 1.1, NONE

Alan Dunn amdunn at fedoraproject.org
Thu Feb 11 11:52:31 UTC 2010 

Author: amdunn

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

Modified Files:
	.cvsignore import.log ocaml-ocamlgraph.spec sources 
Added Files:
	ocamlgraph-1.1-no-view-graph-doc.patch 
	ocamlgraph-1.3-install-dgraph-and-viewer.patch 
	ocamlgraph-1.3-no-viewGraph_test.patch 
Removed Files:
	ocamlgraph-1.0-no-view-graph-doc.patch 
Log Message:
* Thu Feb 11 2010 Alan Dunn <amdunn at gmail.com> - 1.3-3.fc11
- Backport of Rawhide version


ocamlgraph-1.1-no-view-graph-doc.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

ocamlgraph-1.3-install-dgraph-and-viewer.patch:
 Makefile.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE ocamlgraph-1.3-install-dgraph-and-viewer.patch ---
--- 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 \

ocamlgraph-1.3-no-viewGraph_test.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ocamlgraph-1.3-no-viewGraph_test.patch ---
--- 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)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Nov 2008 16:49:18 -0000	1.3
+++ .cvsignore	11 Feb 2010 11:52:31 -0000	1.4
@@ -1 +1 @@
-ocamlgraph-1.0.tar.gz
+ocamlgraph-1.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	23 Aug 2008 20:48:48 -0000	1.1
+++ import.log	11 Feb 2010 11:52:31 -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_3-3_fc12:F-11:ocaml-ocamlgraph-1.3-3.fc12.src.rpm:1265889065


Index: ocaml-ocamlgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-11/ocaml-ocamlgraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ocaml-ocamlgraph.spec	26 Feb 2009 07:19:11 -0000	1.5
+++ ocaml-ocamlgraph.spec	11 Feb 2010 11:52:31 -0000	1.6
@@ -11,28 +11,37 @@
 # place to try to change the standard practice, so for now I will
 # follow standard practice.
 
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
-
-Name:		ocaml-ocamlgraph
-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-%{version}.tar.gz
-Source1:	ocamlgraph-test.result
-
-Patch0:         ocamlgraph-1.0-no-view-graph-doc.patch
+%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
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ocaml >= 3.08, ocaml-findlib-devel, ocaml-ocamldoc
+Name:           ocaml-ocamlgraph
+Version:        1.3
+Release:        3%{?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-%{version}.tar.gz
+Source1:        ocamlgraph-test.result
+
+Patch0:         ocamlgraph-1.1-no-view-graph-doc.patch
+Patch1:         ocamlgraph-1.3-no-viewGraph_test.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:  ocaml-lablgtk-devel
 BuildRequires:  gtk2-devel, libgnomecanvas-devel
 
@@ -49,13 +58,13 @@ Language file format and Dot and Neato g
 tools.
 
 
-%package	devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 
 
-%description	devel
+%description    devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
@@ -64,6 +73,8 @@ developing applications that use %{name}
 %setup -q -n ocamlgraph-%{version}
 
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 cp %{SOURCE1} .
 
@@ -72,10 +83,11 @@ cp %{SOURCE1} .
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
 
 %if %opt
-%define opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt
+%global opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt
 %else
-%define opt_option OCAMLBEST=byte OCAMLC=ocamlc
+%global opt_option OCAMLBEST=byte OCAMLC=ocamlc
 %endif
+make depend
 make %{opt_option}
 make doc
 
@@ -87,10 +99,9 @@ diff test ocamlgraph-test.result
 %install
 rm -rf %{buildroot}
 
-%define ocaml_destdir %{_libdir}/ocaml
+%global ocaml_destdir %{_libdir}/ocaml
 mkdir -p %{buildroot}%{ocaml_destdir}
 make OCAMLFIND_DESTDIR=%{buildroot}%{ocaml_destdir} install-findlib
-rm -f %{buildroot}%{ocaml_destdir}/ocamlgraph/*.cmo
 
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}/
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/examples/
@@ -112,6 +123,7 @@ rm -rf %{buildroot}
 %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
@@ -123,6 +135,7 @@ rm -rf %{buildroot}
 %{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
@@ -130,6 +143,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 11 2010 Alan Dunn <amdunn at gmail.com> - 1.3-3.fc11
+- Backport of Rawhide version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Nov 2008 16:49:18 -0000	1.3
+++ sources	11 Feb 2010 11:52:31 -0000	1.4
@@ -1 +1 @@
-65dfcab73bc15776f7547860a78d682a  ocamlgraph-1.0.tar.gz
+9bcff267d041d3caec5f4f8c514f9cc1  ocamlgraph-1.3.tar.gz


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

More information about the scm-commits mailing list