[ocaml-type-conv] Drop 3.12 compatibility patch

Michael Ekstrand ekstrand at fedoraproject.org
Tue Jan 15 16:40:22 UTC 2013


commit 060eda8405983a71db5249754bbfc796d3dd110d
Author: Michael Ekstrand <michael at elehack.net>
Date:   Tue Jan 15 10:28:50 2013 -0600

    Drop 3.12 compatibility patch

 ocaml-type-conv.spec                |   10 ++++------
 type-conv-ocaml-3.12.0-compat.patch |   12 ------------
 2 files changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/ocaml-type-conv.spec b/ocaml-type-conv.spec
index 727d7aa..1916e31 100644
--- a/ocaml-type-conv.spec
+++ b/ocaml-type-conv.spec
@@ -5,7 +5,7 @@
 
 Name:           ocaml-type-conv
 Version:        3.0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OCaml base library for type conversion
 
 Group:          Development/Libraries
@@ -15,10 +15,6 @@ Source0:        http://forge.ocamlcore.org/frs/download.php/%{dlnode}/type_conv-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
-# Ugly patch to make it build on OCaml 3.12.0.
-# NOTE: This patch should be removed when OCaml 3.12.1 is available
-Patch0:         type-conv-ocaml-3.12.0-compat.patch
-
 BuildRequires:  ocaml >= 3.12.0
 BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-ocamldoc
@@ -38,7 +34,6 @@ ability to use these preprocessors simultaneously.
 
 %prep
 %setup -q -n type_conv-%{version}
-%patch0 -p1 -b .compat3120
 ocaml setup.ml -configure --prefix %{_prefix} \
       --libdir %{_libdir} \
       --libexecdir %{_libexecdir} \
@@ -75,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan 15 2013 Michael Ekstrand <michael at elehack.net> - 3.0.5-4
+- Drop 3.12 compatbility patch (#741482)
+
 * Mon Oct 29 2012 Richard W.M. Jones <rjones at redhat.com> - 3.0.5-3
 - Rebuild for OCaml 4.00.1.
 


More information about the scm-commits mailing list