[ocaml-sqlite] New upstream release. Build for OCaml 4.01.0. Enable debuginfo. Modernize spec file. Drop all patche

[Jerry James]

commit 03ae5f6e95eecb4a40b23a374bc81cd0436d7917
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Tue Sep 17 14:30:22 2013 -0600

    New upstream release.
    Build for OCaml 4.01.0.
    Enable debuginfo.
    Modernize spec file.
    Drop all patches, none are needed.

 .gitignore                                 |    5 +--
 ocaml-sqlite-1.6.3-no-warn-error.patch     |   34 -----------------
 ocaml-sqlite-debian-install-no-mktop.patch |   26 -------------
 ocaml-sqlite.spec                          |   54 ++++++++++------------------
 sources                                    |    2 +-
 5 files changed, 21 insertions(+), 100 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3ac9e6d..2531fbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-release-1.5.6.tar.bz2
-/release-1.5.9.tar.bz2
-/release-1.6.1.tar.bz2
-/sqlite3-ocaml-1.6.3.tar.gz
+/sqlite3-ocaml-2.0.4.tar.gz
diff --git a/ocaml-sqlite.spec b/ocaml-sqlite.spec
index df21bc7..c71839f 100644
--- a/ocaml-sqlite.spec
+++ b/ocaml-sqlite.spec
@@ -1,21 +1,15 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
 
 Name:           ocaml-sqlite
-Version:        1.6.3
-Release:        5%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 Summary:        OCaml library for accessing SQLite3 databases
 
 Group:          Development/Libraries
 License:        BSD
 URL:            https://bitbucket.org/mmottl/sqlite3-ocaml
 Source0:        https://bitbucket.org/mmottl/sqlite3-ocaml/downloads/sqlite3-ocaml-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    sparc64 s390 s390x
-
-Patch0:         ocaml-sqlite-debian-install-no-mktop.patch
-# Disable all use of -warn-error.
-Patch1:         ocaml-sqlite-1.6.3-no-warn-error.patch
+ExclusiveArch:  %{ocaml_arches}
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -24,10 +18,6 @@ BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  sqlite-devel >= 3
 BuildRequires:  chrpath
 
-%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
-
 
 %description
 SQLite 3 database library wrapper for OCaml.
@@ -36,7 +26,8 @@ SQLite 3 database library wrapper for OCaml.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       sqlite-devel%{?_isa} >= 3
 
 
 %description    devel
@@ -46,44 +37,31 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n sqlite3-ocaml-%{version}
-%patch0 -p1
-%patch1 -p1
-
-./configure --libdir=%{_libdir}
 
 
 %build
+./configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_pkgdocdir} \
+  --destdir $RPM_BUILD_ROOT
 make all
 
 
 %check
-pushd test
-tests="test_agg test_db test_exec test_stmt test_fun"
-for f in $tests; do
-  ocamlopt -I .. str.cmxa sqlite3.cmxa $f.ml -o $f
-  ./$f
-done
-popd
+./configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_pkgdocdir} \
+  --destdir $RPM_BUILD_ROOT --enable-tests
+make test
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 make install
 
-strip $OCAMLFIND_DESTDIR/stublibs/dll*.so
 chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING.txt
 %{_libdir}/ocaml/sqlite3
 %if %opt
 %exclude %{_libdir}/ocaml/sqlite3/*.a
@@ -96,8 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
-%doc COPYING Changelog doc README.txt TODO
+%doc CHANGES.txt README.md TODO.md
 %if %opt
 %{_libdir}/ocaml/sqlite3/*.a
 %{_libdir}/ocaml/sqlite3/*.cmxa
@@ -107,6 +84,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 17 2013 Jerry James <loganjerry at gmail.com>
+- New upstream release
+- Build for OCaml 4.01.0
+- Enable debuginfo
+- Modernize spec file
+- Drop all patches, none are needed
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index aac4046..d9911d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb27e99eed1c35989854272f7e83a232  sqlite3-ocaml-1.6.3.tar.gz
+ae90c81f24322afad47678ffdc6c2a64  sqlite3-ocaml-2.0.4.tar.gz