[ocaml-type-conv] Bump to 3.0.4

[Michael Ekstrand]

commit d4b53c10fad7a5a9843256fabce03fb24bd3d22d
Author: Michael Ekstrand <michael at elehack.net>
Date:   Tue Sep 20 18:06:35 2011 -0500

    Bump to 3.0.4
    
    * Use forge.ocamlcore.org as upstream source
    * Bump to 3.0.4
    * Use OASIS to build

 .gitignore           |    3 +--
 ocaml-type-conv.spec |   40 +++++++++++++++++++++++++++-------------
 sources              |    2 +-
 3 files changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a501298..37c4ffc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-release-1.6.10.tar.bz2
-/release-2.0.2.tar.bz2
+/type-conv-3.0.4.tar.gz
diff --git a/ocaml-type-conv.spec b/ocaml-type-conv.spec
index dc343ab..52f7eaf 100644
--- a/ocaml-type-conv.spec
+++ b/ocaml-type-conv.spec
@@ -1,23 +1,24 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
+%define dlnode 697
+
 Name:           ocaml-type-conv
-Version:        2.0.2
-Release:        2%{?dist}
+Version:        3.0.4
+Release:        1%{?dist}
 Summary:        OCaml base library for type conversion
 
 Group:          Development/Libraries
 License:        LGPLv2+ with exceptions and BSD
-URL:            http://www.ocaml.info/home/ocaml_sources.html#type-conv
-Source0:        http://hg.ocaml.info/release/type-conv/archive/release-%{version}.tar.bz2
+URL:            http://forge.ocamlcore.org/projects/type-conv/
+Source0:        http://forge.ocamlcore.org/frs/download.php/%{dlnode}/type-conv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
-BuildRequires:  ocaml >= 3.10.0
-BuildRequires:  ocaml-findlib-devel
+BuildRequires:  ocaml >= 3.12.0
+BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
-BuildRequires:  dos2unix
 
 %define _use_internal_dependency_generator 0
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
@@ -32,20 +33,30 @@ ability to use these preprocessors simultaneously.
 
 
 %prep
-%setup -q -n type-conv-release-%{version}
-dos2unix LICENSE.Tywith
+%setup -q -n type-conv-%{version}
+ocaml setup.ml -configure --prefix %{_prefix} \
+      --libdir %{_libdir} \
+      --libexecdir %{_libexecdir} \
+      --exec-prefix %{_exec_prefix} \
+      --bindir %{_bindir} \
+      --sbindir %{_sbindir} \
+      --mandir %{_mandir} \
+      --datadir %{_datadir} \
+      --localstatedir %{_localstatedir} \
+      --sharedstatedir %{_sharedstatedir} \
+      --destdir $RPM_BUILD_ROOT
 
 
 %build
-make
+ocaml setup.ml -build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export DESTDIR=$RPM_BUILD_ROOT
-export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+# export DESTDIR=$RPM_BUILD_ROOT
+# export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
-make install
+ocaml setup.ml -install
 
 
 %clean
@@ -59,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 20 2011 Michael Ekstrand <michael at elehack.net> - 3.0.4-1
+- New upstream release from forge.ocamlcore.org
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index d55bb62..5eb5cb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db0fa0bc68d9475f40ad65b1175ecc1b  release-2.0.2.tar.bz2
+3dbc1b4d339911fcc07880fefc91617e  type-conv-3.0.4.tar.gz