[ocaml-ounit] Rebuild for OCaml 4.00.1.

Richard W.M. Jones rjones at fedoraproject.org
Fri Oct 19 13:10:08 UTC 2012


commit 650746f81dc4ed9392439325631192bf0547b81c
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Oct 19 14:10:01 2012 +0100

    Rebuild for OCaml 4.00.1.
    
    - Clean up the spec file.

 ocaml-ounit.spec |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/ocaml-ounit.spec b/ocaml-ounit.spec
index 2160351..deb838a 100644
--- a/ocaml-ounit.spec
+++ b/ocaml-ounit.spec
@@ -1,16 +1,14 @@
-%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-ounit
 Version:        1.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Unit test framework for OCaml
 
-Group:          Development/Libraries
 License:        MIT
 URL:            http://ounit.forge.ocamlcore.org/
 Source0:        http://forge.ocamlcore.org/frs/download.php/886/ounit-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
@@ -18,10 +16,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
 OUnit is a unit test framework for OCaml. It allows one to easily
@@ -32,7 +26,6 @@ frameworks.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -56,7 +49,6 @@ make test
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 make install
@@ -65,12 +57,7 @@ make install
 rm -rf $RPM_BUILD_ROOT/usr/local/share/doc
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_libdir}/ocaml/oUnit
 %if %opt
@@ -81,7 +68,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc LICENSE.txt README.txt
 %doc _build/src/api-ounit.docdir/*
 %if %opt
@@ -92,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 19 2012 Richard W.M. Jones <rjones at redhat.com> - 1.1.2-4
+- Rebuild for OCaml 4.00.1.
+- Clean up the spec file.
+
 * Sat Jul 28 2012 Richard W.M. Jones <rjones at redhat.com> - 1.1.2-3
 - Bump and rebuild against new OCaml 4.00.0 official release.
 


More information about the scm-commits mailing list