[ocaml-bisect] New upstream version 1.1.

[Richard W.M. Jones]

commit 9ebf18a0d1caaac86c4fa85fa8967b0a6304a2f4
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Jan 13 13:33:57 2012 +0000

    New upstream version 1.1.
    
    - Rebuild for OCaml 3.12.1.

 .gitignore              |    1 +
 bisect-1.0-Ast.patch    |   13 -------------
 bisect-1.0-thread.patch |   19 -------------------
 ocaml-bisect.spec       |   37 +++++++++++++++++++++----------------
 sources                 |    2 +-
 5 files changed, 23 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c5f9a3..08f4e5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 bisect-1.0.tar.gz
+/bisect-1.1.tar.gz
diff --git a/ocaml-bisect.spec b/ocaml-bisect.spec
index 889511a..5af8005 100644
--- a/ocaml-bisect.spec
+++ b/ocaml-bisect.spec
@@ -2,8 +2,8 @@
 %global debug_package %{nil}
 
 Name:           ocaml-bisect
-Version:        1.0
-Release:        5%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        OCaml code coverage tool
 
 Group:          Development/Libraries
@@ -14,9 +14,6 @@ ExcludeArch:    sparc64 s390 s390x
 URL:            http://bisect.x9c.fr/
 Source0:        http://bisect.x9c.fr/distrib/bisect-%{version}.tar.gz
 
-Patch0:         bisect-1.0-thread.patch
-Patch1:         bisect-1.0-Ast.patch
-
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
@@ -46,11 +43,10 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n bisect-%{version}
-%patch0 -p1
-%patch1 -p1
 
 
 %build
+sh configure
 make PATH_OCAML_BIN=%{_bindir} all
 
 
@@ -62,15 +58,20 @@ make PATH_OCAML_BIN=%{_bindir} all
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/bisect
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR
 
-install -m 0755 bin/bisect-report.opt \
-  $RPM_BUILD_ROOT%{_bindir}/bisect-report
-strip $RPM_BUILD_ROOT%{_bindir}/bisect-report
+# FFS ... please use DESTDIR ...
 
-install -m 0644 bin/*.{a,cmi,cma,cmx,cmxa} \
-  $RPM_BUILD_ROOT%{_libdir}/ocaml/bisect
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+pushd $RPM_BUILD_ROOT%{_bindir}
+ln -s %{_bindir}/ocamlbuild
+popd
+make install PATH_OCAML_PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+pushd $RPM_BUILD_ROOT%{_bindir}
+rm ocamlbuild
+popd
 
 
 %clean
@@ -85,7 +86,6 @@ rm -rf $RPM_BUILD_ROOT
 %if %opt
 %exclude %{_libdir}/ocaml/bisect/*.a
 %exclude %{_libdir}/ocaml/bisect/*.cmxa
-%exclude %{_libdir}/ocaml/bisect/*.cmx
 %endif
 
 
@@ -95,11 +95,16 @@ rm -rf $RPM_BUILD_ROOT
 %if %opt
 %{_libdir}/ocaml/bisect/*.a
 %{_libdir}/ocaml/bisect/*.cmxa
-%{_libdir}/ocaml/bisect/*.cmx
 %endif
 
 
 %changelog
+* Fri Jan 13 2012 Richard W.M. Jones <rjones at redhat.com> - 1.1-1
+- New upstream version 1.1.
+- Rebuild for OCaml 3.12.1.
+- Remove two patches, upstream.
+- Add a bunch of hacks because of lack of proper DESTDIR.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index ab872b2..a687c01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-275bf4760cb9f256820f0846d7c0ee20  bisect-1.0.tar.gz
+6e4be9696c902f74908fd835a84353e9  bisect-1.1.tar.gz