From 593a0c795f3fb32db2170ce4d15b7f3251c7fd1d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 17 Feb 2015 09:57:16 +0000 Subject: [PATCH] Drop upstream patch. --- ...e-Pervasives.format_of_string-instea.patch | 26 ------------------- ocaml-gettext.spec | 9 +++---- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 0001-gettextCompat-Use-Pervasives.format_of_string-instea.patch diff --git a/0001-gettextCompat-Use-Pervasives.format_of_string-instea.patch b/0001-gettextCompat-Use-Pervasives.format_of_string-instea.patch deleted file mode 100644 index d7e5bbe..0000000 --- a/0001-gettextCompat-Use-Pervasives.format_of_string-instea.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9cc38ee61f2ae03e79a2ee7f72719783c29c6eac Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 15 Jul 2014 15:58:49 +0000 -Subject: [PATCH] gettextCompat: Use Pervasives.format_of_string instead of - Obj.magic. - ---- - libgettext-ocaml/gettextCompat.ml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgettext-ocaml/gettextCompat.ml b/libgettext-ocaml/gettextCompat.ml -index 1a8ac44..08f00d5 100644 ---- a/libgettext-ocaml/gettextCompat.ml -+++ b/libgettext-ocaml/gettextCompat.ml -@@ -25,7 +25,7 @@ open GettextCategory;; - open GettextModules;; - - let unsafe_format_of_string fmt str = -- if true then -+ if false then - Obj.magic str - else - format_of_string fmt --- -2.0.1 - diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec index 93be5ab..39523d7 100644 --- a/ocaml-gettext.spec +++ b/ocaml-gettext.spec @@ -2,7 +2,7 @@ Name: ocaml-gettext Version: 0.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for i18n License: LGPLv2+ with exceptions @@ -12,9 +12,6 @@ ExcludeArch: sparc64 s390 s390x Source0: https://forge.ocamlcore.org/frs/download.php/1433/%{name}-%{version}.tar.gz Patch1: ocaml-gettext-0.3.4-use-ocamlopt-g.patch -# Fix for segfault which only happens with OCaml >= 4.02.0. -# The bug was found on aarch64, but affects _all_ architectures. -Patch2: 0001-gettextCompat-Use-Pervasives.format_of_string-instea.patch BuildRequires: ocaml >= 4.00.1 BuildRequires: ocaml-findlib-devel >= 1.3.3-3 @@ -93,7 +90,6 @@ signature files for developing applications that use %setup -q %patch1 -p1 -%patch2 -p1 %build @@ -202,8 +198,9 @@ chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so %changelog -* Tue Feb 17 2015 Richard W.M. Jones - 0.3.5-2 +* Tue Feb 17 2015 Richard W.M. Jones - 0.3.5-3 - Bump release and rebuild. +- Drop upstream patch. * Mon Feb 16 2015 Richard W.M. Jones - 0.3.5-1 - New upstream version 0.3.5.