[ocaml-pa-monad] OCaml 4.01.0 rebuild.

Richard W.M. Jones rjones at fedoraproject.org
Thu Sep 19 11:32:41 UTC 2013


commit d9c85bdb99b8e3c5fce74bb301abdf3aaefad106
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Sep 19 12:32:28 2013 +0100

    OCaml 4.01.0 rebuild.
    
    - Modernize the spec file.

 ocaml-pa-monad.spec |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/ocaml-pa-monad.spec b/ocaml-pa-monad.spec
index 53ca91b..72dd28f 100644
--- a/ocaml-pa-monad.spec
+++ b/ocaml-pa-monad.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-pa-monad
 Version:        6.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        OCaml syntax extension for monads
-
-Group:          Development/Libraries
 License:        LGPLv2+ with exceptions
+
 URL:            http://www.cas.mcmaster.ca/~carette/pa_monad/
 Source0:        http://www.cas.mcmaster.ca/~carette/pa_monad/pa_monad.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
@@ -18,9 +17,7 @@ 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 -i Asttypes -i Parsetree
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+%global __ocaml_requires_opts -i Asttypes -i Parsetree
 
 
 %description
@@ -43,24 +40,22 @@ make test
 
 %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
 make findlib-install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc COPYING README ChangeLog html-doc
 %{_libdir}/ocaml/monad
 
 
 %changelog
+* Thu Sep 19 2013 Richard W.M. Jones <rjones at redhat.com> - 6.0-13
+- OCaml 4.01.0 rebuild.
+- Modernize the spec file.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list