Author: rjones
Update of /cvs/pkgs/rpms/ocaml-perl4caml/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18766
Modified Files:
ocaml-perl4caml.spec
Added Files:
perl4caml-0.9.5-svtrv.patch
Log Message:
* Tue Jun 8 2010 Richard W.M. Jones <rjones(a)redhat.com> - 0.9.5-14
- Fix for perl-libs dependency (RHBZ#533948).
- Include upstream patch for Perl 5.12 (Iain Arnell).
perl4caml-0.9.5-svtrv.patch:
perl_c.c | 7 +++++++
1 file changed, 7 insertions(+)
--- NEW FILE perl4caml-0.9.5-svtrv.patch ---
From: Iain Arnell <iarnell(a)gmail.com>
Date: Wed, 2 Jun 2010 16:34:43 +0000 (+0100)
Subject: Fix for Perl 5.12: SVt_RV missing.
X-Git-Url:
http://git.annexia.org/?p=perl4caml.git;a=commitdiff_plain;h=4cb12aa05bd5...
Fix for Perl 5.12: SVt_RV missing.
Also reported as the following Debian bug:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578800
Comment from the author of this patch:
"It seems simplest to pretend that SVt_RV still exists on the caml
side; attached patch will do just that."
---
diff --git a/perl_c.c b/perl_c.c
index 7970a81..66f2959 100644
--- a/perl_c.c
+++ b/perl_c.c
@@ -199,12 +199,17 @@ perl4caml_sv_no (value unit)
static int
sv_type (SV *sv)
{
+#if PERL_VERSION >= 11
+ if (SvROK(sv)) return 4;
+#endif
switch (SvTYPE (sv))
{
case SVt_IV: return 1;
case SVt_NV: return 2;
case SVt_PV: return 3;
+#if PERL_VERSION < 11
case SVt_RV: return 4;
+#endif
case SVt_PVAV: return 5;
case SVt_PVHV: return 6;
case SVt_PVCV: return 7;
@@ -302,7 +307,9 @@ perl4caml_deref (value svv)
case SVt_IV:
case SVt_NV:
case SVt_PV:
+#if PERL_VERSION < 11
case SVt_RV:
+#endif
case SVt_PVMG:
break;
default:
Index: ocaml-perl4caml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-perl4caml/devel/ocaml-perl4caml.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocaml-perl4caml.spec 1 Jun 2010 20:17:16 -0000 1.14
+++ ocaml-perl4caml.spec 8 Jun 2010 22:06:17 -0000 1.15
@@ -3,7 +3,7 @@
Name: ocaml-perl4caml
Version: 0.9.5
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: OCaml library for calling Perl libraries and code
Group: Development/Libraries
@@ -13,6 +13,10 @@ Source0:
http://merjis.com/_file/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
+# Include upstream patch for Perl 5.12:
+#
http://git.annexia.org/?p=perl4caml.git;a=commitdiff_plain;h=4cb12aa05bd5...
+Patch0: perl4caml-0.9.5-svtrv.patch
+
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-ocamldoc
BuildRequires: perl-devel >= 5.8
@@ -31,14 +35,8 @@ BuildRequires: perl(ExtUtils::Embed)
#Requires: perl-URI
#Requires: perl-WWW-Mechanize
-# Because we're embedding an rpath into the library, we need to
-# depend on that path. See:
-#
https://www.redhat.com/archives/fedora-packaging/2008-March/thread.html#0...
-#
https://www.redhat.com/archives/fedora-devel-list/2008-March/msg00922.html
-%global libperldir %(perl -MExtUtils::Embed -e ldopts 2> /dev/null | egrep -o
'/[^[:space:]]*CORE' | head -1)
-%if "%{?libperldir}" != "%{nil}"
-Requires: %{?libperldir}/libperl.so
-%endif
+# RHBZ#533948
+Requires: perl-libs%{?_isa}
# We're also going to pick up a versioned dependency, to help track things:
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -67,6 +65,7 @@ developing applications that use %{name}
%prep
%setup -q -n perl4caml-%{version}
+%patch0 -p1
find -name .cvsignore -exec rm {} \;
@@ -124,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jun 8 2010 Richard W.M. Jones <rjones(a)redhat.com> - 0.9.5-14
+- Fix for perl-libs dependency (RHBZ#533948).
+- Include upstream patch for Perl 5.12 (Iain Arnell).
+
* Tue Jun 01 2010 Marcela Maslanova <mmaslano(a)redhat.com> - 0.9.5-13
- Mass rebuild with perl-5.12.0