dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-ocamlgraph-1.0.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 +0,0 @@
-ocaml-ocamlgraph-0_99c-2_fc9:HEAD:ocaml-ocamlgraph-0.99c-2.fc9.src.rpm:1219524338

ocaml-ocamlgraph.spec

@@ -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
+%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
 
-Name:		ocaml-ocamlgraph
-Version:	1.0
-Release:	4%{?dist}
-Summary:	OCaml library for arc and node graphs
+Name:           ocaml-ocamlgraph
+Version:        1.3
+Release:        3%{?dist}
+Summary:        OCaml library for arc and node graphs
 
-Group:		Development/Libraries
-License:	LGPLv2 with exceptions
+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
+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
+Patch0:         ocamlgraph-1.1-no-view-graph-doc.patch
+Patch1:         ocamlgraph-1.3-no-viewGraph_test.patch
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ocaml >= 3.08, ocaml-findlib-devel, ocaml-ocamldoc
+# 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 graphviz (graph visualization)
 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@gmail.com> - 1.3-3.fc11
+- Backport of Rawhide version
+
 * 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
 

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

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

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 @@
-65dfcab73bc15776f7547860a78d682a  ocamlgraph-1.0.tar.gz
+9bcff267d041d3caec5f4f8c514f9cc1  ocamlgraph-1.3.tar.gz