[ocaml-pa-do] New upstream version 0.8.15.

[Richard W.M. Jones]

commit 034eb9701236cf3a3c7cb11d817936d0b9ed8960
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Oct 29 13:37:39 2012 +0000

    New upstream version 0.8.15.
    
    - Remove patches, now upstream.
    - Rebuild for OCaml 4.00.1.
    - Clean up the spec file.

 .gitignore                               |    1 +
 ocaml-pa-do.spec                         |   60 +++++++++++++-----------------
 pa_do-0.8.13-disable-some-examples.patch |   12 ------
 pa_do-0.8.13-fix-dynlink-detection.patch |   15 -------
 pa_do-0.8.13-fix-examples.patch          |   47 -----------------------
 pa_do-0.8.13-fix-toploop.patch           |   12 ------
 sources                                  |    2 +-
 7 files changed, 28 insertions(+), 121 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b44cb34..1749bd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 pa_do-0.8.10.tar.gz
 /pa_do-0.8.12_OCaml3.12.tar.gz
 /pa_do-0.8.13_OCaml3.12.tar.gz
+/pa_do-0.8.15.tar.gz
diff --git a/ocaml-pa-do.spec b/ocaml-pa-do.spec
index 8ea50d9..560a8ca 100644
--- a/ocaml-pa-do.spec
+++ b/ocaml-pa-do.spec
@@ -1,25 +1,18 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
 
 Name:           ocaml-pa-do
-Version:        0.8.13
-Release:        3%{?dist}
+Version:        0.8.15
+Release:        1%{?dist}
 Summary:        OCaml syntax extension for delimited overloading
 
-Group:          Development/Libraries
 License:        LGPLv2+ with exceptions
 
 URL:            http://forge.ocamlcore.org/projects/pa-do/
-Source0:        ttp://forge.ocamlcore.org/frs/download.php/616/pa_do-%{version}_OCaml3.12.tar.gz
+Source0:        https://forge.ocamlcore.org/frs/download.php/1018/pa_do-0.8.15.tar.gz
 
 Patch0:         ocaml-pa-do-0.8.9-pdfpagelabels-off.patch
 
-# Fixes for OCaml 4.00.0.  Sent upstream on 2012-07-03.
-Patch1:         pa_do-0.8.13-disable-some-examples.patch
-Patch2:         pa_do-0.8.13-fix-dynlink-detection.patch
-Patch3:         pa_do-0.8.13-fix-examples.patch
-Patch4:         pa_do-0.8.13-fix-toploop.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
@@ -27,7 +20,6 @@ BuildRequires:  ocaml >= 3.12.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
-BuildRequires:  ocaml-omake
 
 # This package requires graphics.cmxa for some reason.
 BuildRequires:  ocaml-x11
@@ -35,9 +27,7 @@ BuildRequires:  ocaml-x11
 # For pdflatex, used to build the documentation.
 BuildRequires:  texlive-latex
 
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+%global __ocaml_requires_opts -i Asttypes -i Parsetree
 
 
 %description
@@ -52,7 +42,6 @@ This package contains three syntax extensions.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -62,53 +51,56 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n pa_do-%{version}_OCaml3.12
+%setup -q -n pa_do-%{version}
 
 %patch0 -p2
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+ocaml setup.ml -configure \
+  --prefix %{_prefix} \
+  --docdir %{_docdir} \
+  --destdir $RPM_BUILD_ROOT
 
 
 %build
-omake --verbose
-omake doc
+make
+make doc
 
 
 %check
 %ifnarch ppc64
-omake test
+make test
 %endif
 
 
 %install
 # These rules work if the library uses 'ocamlfind install' to install itself.
-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
-omake INSTALL_FLAGS= install
+make install
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Install API docs using %doc section.
+mv $RPM_BUILD_ROOT%{_docdir}/api .
 
 
 %files
-%defattr(-,root,root,-)
-%doc LICENSE
+%doc LICENSE.txt
 %{_libdir}/ocaml/pa_do
 %exclude %{_libdir}/ocaml/pa_do/*.mli
 
 
 %files devel
-%defattr(-,root,root,-)
-%doc README
+%doc AUTHORS.txt INSTALL.txt LICENSE.txt README.txt api
 %{_libdir}/ocaml/pa_do/*.mli
 
 
 %changelog
+* Mon Oct 29 2012 Richard W.M. Jones <rjones at redhat.com> - 0.8.15-1
+- New upstream version 0.8.15.
+- Remove patches, now upstream.
+- Rebuild for OCaml 4.00.1.
+- Clean up the spec file.
+
 * Mon Jul 30 2012 Richard W.M. Jones <rjones at redhat.com> - 0.8.13-3
 - Rebuild for OCaml 4.00.0 official.
 
diff --git a/sources b/sources
index a1fcba9..7329a1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50290c1754e6d4ee3c055544e2e4b1fc  pa_do-0.8.13_OCaml3.12.tar.gz
+0092aaa3369f9e8fe954345e891a7ee0  pa_do-0.8.15.tar.gz