Sophie

Sophie

distrib > Mandriva > 2010.2 > i586 > media > main-release-src > by-pkgid > 5d3087b210e409a3386b832aa3d95cfe > files > 2

deltarpm-3.4-6mdv2010.1.src.rpm

--- deltarpm-3.4/Makefile.orig	2008-03-05 00:40:39.673933049 +0100
+++ deltarpm-3.4/Makefile	2008-03-05 00:57:27.617190886 +0100
@@ -5,7 +5,9 @@ mandir=$(datadir)/man
 rpmdumpheader=$(bindir)/rpmdumpheader
 zlibdir=zlib-1.2.2.f-rsyncable
 CFLAGS = -O2 -Wall
-CPPFLAGS = -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir)
+RPMMAJOR=$(shell LC_ALL=C rpm --version | sed -r 's/(DEVEL)|(^RPM version )|(^rpm \(RPM\) )//'|cut -d. -f1)
+CPPFLAGS = -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir) -DRPMMAJOR=$(RPMMAJOR)
+
 LDLIBS = -lbz2 $(zlibdir)/libz.a
 LDFLAGS =
 
--- deltarpm-3.4/rpmdumpheader.c.orig	2008-03-05 00:40:09.337269658 +0100
+++ deltarpm-3.4/rpmdumpheader.c	2008-03-05 00:53:51.960519592 +0100
@@ -7,6 +7,9 @@
 
 #include <fcntl.h>
 #include <string.h>
+#if RPMMAJOR >= 5
+#include <rpm/rpm4compat.h>
+#endif
 #include <rpm/rpmlib.h>
 #include <rpm/rpmts.h>
 #include <rpm/rpmdb.h>