From 7a2e434df978de6e43407283dc53b5e06801ab33 Mon Sep 17 00:00:00 2001 From: nanardon Date: Fri, 14 Dec 2007 11:07:14 +0000 Subject: - fix compil against rpm.org 4.4.2.2 git-svn-id: svn+ssh://haiku.zarb.org/home/projects/rpm4/svn/trunk@144 971eb68f-4bfb-0310-8326-d2484c010a4c --- RPM4/src/Makefile.PL | 2 +- RPM4/src/RPM4.xs | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/RPM4/src/Makefile.PL b/RPM4/src/Makefile.PL index 595fea8..1e2c621 100644 --- a/RPM4/src/Makefile.PL +++ b/RPM4/src/Makefile.PL @@ -43,7 +43,7 @@ foreach (qw( $v = $_; $v =~ s/\./_/g; print $FH "#define RPM$v\n"; - $rpmv eq $_ and last; + $rpmv =~ /^\Q$_/ and last; } print $FH "\n#endif\n"; close($FH); diff --git a/RPM4/src/RPM4.xs b/RPM4/src/RPM4.xs index bc430c2..59dc370 100644 --- a/RPM4/src/RPM4.xs +++ b/RPM4/src/RPM4.xs @@ -446,7 +446,15 @@ void _newspec(rpmts ts, char * filename, SV * svpassphrase, SV * svrootdir, SV * verify = SvIV(svverify); if (filename) { - if (!parseSpec(ts, filename, rootdir, 0, passphrase, cookies, anyarch, force, verify)) + if (!parseSpec(ts, filename, rootdir +#ifndef RPM_4_4_8 + , 0 +#endif + ,0 , passphrase, cookies, anyarch, force +#ifdef RPM_4_4_8 + , verify +#endif + )) spec = rpmtsSetSpec(ts, NULL); #ifdef HHACK } else { -- cgit v1.2.1