[ocaml-deriving] Rebuild for OCaml 4.01.0.

[Richard W.M. Jones]

commit 689dc7dea4803e6e529024a1cf99dba24b04c64a
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat Sep 14 18:07:57 2013 +0100

    Rebuild for OCaml 4.01.0.
    
    - Modernize the spec file.

 ocaml-deriving.spec |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/ocaml-deriving.spec b/ocaml-deriving.spec
index 4488b02..fbd3e53 100644
--- a/ocaml-deriving.spec
+++ b/ocaml-deriving.spec
@@ -1,16 +1,15 @@
-%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-deriving
 Version:        0.1.1a
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Extension to OCaml for deriving functions from types
-
-Group:          Development/Libraries
 License:        MIT
+
 URL:            http://code.google.com/p/deriving/
 Source0:        http://deriving.googlecode.com/files/deriving-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         ocaml-deriving-no-link-libs.patch
@@ -24,10 +23,6 @@ BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
 
-%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
 Extension to OCaml for deriving functions from type declarations.
@@ -55,7 +50,13 @@ developing applications that use %{name}.
 
 
 %build
-make
+# Parallel builds don't work.
+unset MAKEFLAGS
+
+make \
+%if %opt
+  OCAMLOPT="ocamlopt.opt -g"
+%endif
 
 cat >META <<'EOF'
 name="deriving"
@@ -93,13 +94,15 @@ EOF
 
 
 %check
+# Parallel builds don't work.
+unset MAKEFLAGS
+
 cd tests
 make
 ./tests
 
 
 %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
@@ -110,12 +113,7 @@ ocamlfind install deriving \
 install -m 0755 syntax/deriving $RPM_BUILD_ROOT%{_bindir}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/ocaml/deriving
 %if %opt
@@ -128,7 +126,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc COPYING README CHANGES
 %if %opt
 %{_libdir}/ocaml/deriving/*.a
@@ -139,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 14 2013 Richard W.M. Jones <rjones at redhat.com> - 0.1.1a-20
+- Rebuild for OCaml 4.01.0.
+- Modernize the spec file.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1a-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild