[ocaml-bin-prot] Update to 2.0.6.

Michael Ekstrand ekstrand at fedoraproject.org
Thu Sep 29 00:58:59 UTC 2011


commit e0ef1624dfa5c1e584091a7fa41e896121d65200
Author: Michael Ekstrand <michael at elehack.net>
Date:   Wed Sep 28 19:55:48 2011 -0500

    Update to 2.0.6.

 .gitignore          |    1 +
 ocaml-bin-prot.spec |   55 +++++++++++++++++++++++++--------------------------
 sources             |    2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 45a61ae..e9cf026 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 release-1.2.21.tar.bz2
 /release-1.2.24.tar.bz2
+/bin-prot-2.0.6.tar.gz
diff --git a/ocaml-bin-prot.spec b/ocaml-bin-prot.spec
index 41f4146..39ab161 100644
--- a/ocaml-bin-prot.spec
+++ b/ocaml-bin-prot.spec
@@ -1,25 +1,26 @@
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %global debug_package %{nil}
 
+%define dlnode  698
+
 Name:           ocaml-bin-prot
-Version:        1.2.24
-Release:        2%{?dist}
+Version:        2.0.6
+Release:        1%{?dist}
 Summary:        Read and write OCaml values in a type-safe binary protocol
 
 Group:          Development/Libraries
 License:        LGPLv2+ with exceptions
-URL:            http://www.ocaml.info/home/ocaml_sources.html#bin-prot
-Source0:        http://hg.ocaml.info/release/bin-prot/archive/release-%{version}.tar.bz2
+URL:            http://forge.ocamlcore.org/projects/bin-prot
+Source0:        http://forge.ocamlcore.org/frs/download.php/%{dlnode}/bin-prot-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ocaml >= 3.10.0
+BuildRequires:  ocaml >= 3.12.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-ounit-devel
-BuildRequires:  ocaml-type-conv >= 1.5.0
+BuildRequires:  ocaml-type-conv >= 3.0.4
 BuildRequires:  chrpath
-BuildRequires:  dos2unix
 
 
 %description
@@ -48,27 +49,26 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n bin-prot-release-%{version}
-dos2unix LICENSE.Tywith
+%setup -q -n bin-prot-%{version}
+ocaml setup.ml -configure --prefix %{_prefix} \
+      --libdir %{_libdir} \
+      --libexecdir %{_libexecdir} \
+      --exec-prefix %{_exec_prefix} \
+      --bindir %{_bindir} \
+      --sbindir %{_sbindir} \
+      --mandir %{_mandir} \
+      --datadir %{_datadir} \
+      --localstatedir %{_localstatedir} \
+      --sharedstatedir %{_sharedstatedir} \
+      --destdir $RPM_BUILD_ROOT
 
 
 %build
-make
-
-cat > README.Fedora <<EOT
-This package is available for non-x86 architectures in Fedora, but
-there may be shortcomings.  In particular, you will not be able to
-interchange data between little-endian and big-endian machines.
-For more details see:
-http://caml.inria.fr/pub/ml-archives/caml-list/2008/05/56cf55b101f21b608feb64c75b92c679.en.html
-- RWMJ 2008/05/05
-EOT
+ocaml setup.ml -build
 
 
 %check
-# I couldn't find a 'make test' rule, but this works as well:
-./lib_test/test_runner
-./lib_test/mac_test
+ocaml setup.ml -test
 
 
 %install
@@ -76,7 +76,7 @@ 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
+ocaml setup.ml -install
 
 strip $OCAMLFIND_DESTDIR/stublibs/dll*.so
 chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so
@@ -95,25 +95,24 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/ocaml/bin_prot/*.cmxa
 %endif
 %exclude %{_libdir}/ocaml/bin_prot/*.mli
-%exclude %{_libdir}/ocaml/bin_prot/*.ml
 %{_libdir}/ocaml/stublibs/*.so
 %{_libdir}/ocaml/stublibs/*.so.owner
 
 
 %files devel
 %defattr(-,root,root,-)
-%doc Changelog README.txt README.Fedora
+%doc Changelog README.txt
 %if %opt
 %{_libdir}/ocaml/bin_prot/*.a
 %{_libdir}/ocaml/bin_prot/*.cmxa
 %endif
 %{_libdir}/ocaml/bin_prot/*.mli
-# This is fine because there is no corresponding .mli file for
-# the .ml file which is included.
-%{_libdir}/ocaml/bin_prot/*.ml
 
 
 %changelog
+* Wed Sep 28 2011 Michael Ekstrand <michael at elehack.net> - 2.0.6-1
+- New upstream version from forge.ocamlcore.org (#741484)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.24-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 480d6a4..66ec360 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32aa23ec08f92162ce6236acb3cdf7ef  release-1.2.24.tar.bz2
+a80332c8a2ddf6497c13a463fa2c8f68  bin-prot-2.0.6.tar.gz


More information about the scm-commits mailing list