dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-ocamlgraph-1.1.tar.gz

.gitignore

@@ -0,0 +1 @@
+ocamlgraph-1.3.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ocaml-ocamlgraph
-# $Id$
-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 $$/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)

import.log

@@ -1,2 +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.spec

@@ -11,15 +11,18 @@
 # 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)
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
+%global debug_package %{nil}
-%define _use_internal_dependency_generator 0
+# Use new dependency generator in Fedora >= 13
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
+%if 0%{?fedora} <= 12
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+%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
 
 Name:           ocaml-ocamlgraph
-Version:        1.1
+Version:        1.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml library for arc and node graphs
 
 Group:          Development/Libraries
@@ -30,6 +33,11 @@ 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
@@ -65,6 +73,8 @@ developing applications that use %{name}.
 %setup -q -n ocamlgraph-%{version}
 
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 cp %{SOURCE1} .
 
@@ -73,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
 
@@ -88,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/
@@ -113,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
@@ -124,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
@@ -131,6 +143,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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
+  ocaml-ocamlgraph
+- define -> global
+- Update for new dependency generator in F13
+
+* Tue Jan 05 2010 Richard W.M. Jones <rjones@redhat.com> - 1.3-2.fc12.1
+- Backport version 1.3 from Rawhide (requested by David A. Wheeler).
+
 * Fri Aug 07 2009 Alan Dunn <amdunn@gmail.com> - 1.1-1
 - New upstream release 1.1.
 - Makefile patch updated (still not incorporated upstream).

ocamlgraph-1.3-install-dgraph-and-viewer.patch

@@ -0,0 +1,13 @@
+--- 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

@@ -0,0 +1,11 @@
+--- 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)

sources

@@ -1 +1 @@
-62cf4b0c273db2af1dbf4f8fac957bfc  ocamlgraph-1.1.tar.gz
+9bcff267d041d3caec5f4f8c514f9cc1  ocamlgraph-1.3.tar.gz