[ocaml-newt] OCaml 4.01.0 rebuild.

Richard W.M. Jones rjones at fedoraproject.org
Thu Sep 19 08:38:23 UTC 2013


commit 3bedae7ec673a82410b3e3664e1b454ad811b2ab
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Sep 19 09:38:11 2013 +0100

    OCaml 4.01.0 rebuild.
    
    - Enable debuginfo.
    - Modernize the spec file.

 ocaml-newt.spec |   34 +++++++++++++---------------------
 1 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/ocaml-newt.spec b/ocaml-newt.spec
index b7b71b4..92c6384 100644
--- a/ocaml-newt.spec
+++ b/ocaml-newt.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)
 
 Name:           ocaml-newt
 Version:        0.9
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        OCaml library for using newt text mode window system
-
-Group:          Development/Libraries
 License:        LGPLv2+ with exceptions
+
 URL:            http://et.redhat.com/~rjones/ocaml-newt/
 Source0:        http://et.redhat.com/~rjones/ocaml-newt/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 ExcludeArch:    sparc64 s390 s390x
 
 BuildRequires:  ocaml >= 3.10.0
@@ -21,10 +19,6 @@ BuildRequires:  ocaml-camlidl-devel
 #BuildRequires:  newt-devel > 0.52.7
 BuildRequires:  newt-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
 This is a set of OCaml bindings to newt.
@@ -33,13 +27,12 @@ The newt windowing system is a terminal-based window and widget
 library designed for writing applications with a simple, but
 user-friendly, interface.  While newt is not intended to provide the
 rich feature set advanced applications may require, it has proven to
-be flexible enough for a wide range of applications (most notably, Red
-Hat's installation process).
+be flexible enough for a wide range of applications (most notably, the
+Red Hat installation process).
 
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       newt-devel
 
@@ -54,6 +47,8 @@ developing applications that use %{name}.
 
 
 %build
+# Parallel builds don't work.
+unset MAKEFLAGS
 ./configure --libdir=%{_libdir}
 # Dependencies are broken in the upstream package.
 make newt_int.mli
@@ -68,22 +63,15 @@ make doc
 
 
 %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
 make install
 
-strip $OCAMLFIND_DESTDIR/stublibs/dll*.so
 chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_libdir}/ocaml/newt
 %if %opt
@@ -97,7 +85,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc COPYING.LIB README examples/*.ml html
 %if %opt
 %{_libdir}/ocaml/newt/*.a
@@ -108,6 +95,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 19 2013 Richard W.M. Jones <rjones at redhat.com> - 0.9-17
+- OCaml 4.01.0 rebuild.
+- Enable debuginfo.
+- Modernize the spec file.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list