[ocaml-preludeml] OCaml 4.01.0 rebuild.

Richard W.M. Jones rjones at fedoraproject.org
Thu Sep 19 12:50:25 UTC 2013


commit 8ea876d5498d1eacdbd8b6451657abf10ab586d2
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Sep 19 13:50:12 2013 +0100

    OCaml 4.01.0 rebuild.
    
    - Modernize the spec file.

 ocaml-preludeml.spec |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)
---
diff --git a/ocaml-preludeml.spec b/ocaml-preludeml.spec
index 440aed7..a109d9f 100644
--- a/ocaml-preludeml.spec
+++ b/ocaml-preludeml.spec
@@ -1,19 +1,17 @@
-%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}
 
 # There are no official releases, so we just use git dates.
 # This software is much more stable than the "0.1" version
 # number might indicate.
-%define gitdate 20100314
+%global gitdate 20100314
 
 Name:           ocaml-preludeml
 Version:        0.1
-Release:        0.24.%{gitdate}%{?dist}
+Release:        0.25.%{gitdate}%{?dist}
 Summary:        OCaml utility functions
-
-Group:          Development/Libraries
 License:        MIT
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 ExcludeArch:    sparc64 s390 s390x
 
 # To recreate the source tarball, do:
@@ -32,10 +30,6 @@ BuildRequires:  ocaml-ounit-devel
 BuildRequires:  ruby
 BuildRequires:  libX11-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
 Prelude.ml is a collection of utility functions for OCaml programs.
@@ -80,7 +74,6 @@ omake test ||:
 
 
 %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
@@ -95,12 +88,7 @@ ocamlfind install preludeml \
   src/prelude.cmxa
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE
 %{_libdir}/ocaml/preludeml
 %if %opt
@@ -112,7 +100,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc LICENSE README TESTING
 %if %opt
 %{_libdir}/ocaml/preludeml/*.a
@@ -123,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 19 2013 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.25.20100314
+- OCaml 4.01.0 rebuild.
+- Modernize the spec file.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.24.20100314
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list