[ocaml-ulex] OCaml 4.01.0 rebuild.

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


commit c414b4575c1fd37a4b857847c4df51babe505942
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Sep 19 13:53:25 2013 +0100

    OCaml 4.01.0 rebuild.
    
    - Modernize the spec file.

 ocaml-ulex.spec |   27 ++++++++++-----------------
 1 files changed, 10 insertions(+), 17 deletions(-)
---
diff --git a/ocaml-ulex.spec b/ocaml-ulex.spec
index 8f16601..b566c61 100644
--- a/ocaml-ulex.spec
+++ b/ocaml-ulex.spec
@@ -1,24 +1,21 @@
-%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-ulex
 Version:        1.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        OCaml lexer generator for Unicode
-
-Group:          Development/Libraries
 License:        MIT
+
 URL:            http://www.cduce.org/download.html#side
 Source0:        http://www.cduce.org/download/ulex-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0-7, ocaml-findlib-devel, ocaml-camlp4-devel
 BuildRequires:  gawk
 
-%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
 Ulex is an OCaml lexer generator for Unicode
@@ -34,7 +31,6 @@ Ulex is an OCaml lexer generator for Unicode
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -55,19 +51,13 @@ make all.opt
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR
 make install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc CHANGES README LICENSE
 %{_libdir}/ocaml/ulex
 %if %opt
@@ -78,7 +68,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc CHANGES README LICENSE
 %if %opt
 %{_libdir}/ocaml/ulex/*.a
@@ -88,6 +77,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 19 2013 Richard W.M. Jones <rjones at redhat.com> - 1.1-18
+- OCaml 4.01.0 rebuild.
+- Modernize the spec file.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list