Author: glen Date: Wed Jan 23 10:51:38 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- (partial) rpm 4.4.2 support
---- Files affected:
SOURCES:
rpm-specdump.c (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/rpm-specdump.c
diff -u SOURCES/rpm-specdump.c:1.5 SOURCES/rpm-specdump.c:1.6
--- SOURCES/rpm-specdump.c:1.5 Wed Jan 23 02:39:26 2008
+++ SOURCES/rpm-specdump.c Wed Jan 23 11:51:33 2008
@@ -91,6 +91,15 @@
#define ARG_UID 1030
#define ARG_GID 1031
+// macros from kernel
+#define RPM_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+#define RPM_VERSION_CODE RPM_VERSION(RPM_FORMAT_VERSION,
RPM_MAJOR_VERSION, RPM_MINOR_VERSION)
+
+// RPM 4.4.2
+#ifndef RPMFILE_SOURCE
+# define RPMFILE_SOURCE RPMBUILD_ISSOURCE
+#endif
+
static struct option const
CMDLINE_OPTIONS[] = {
{ "help", no_argument, 0, 'h' },
@@ -263,7 +272,11 @@
setMacros(args.macros.values, args.macros.cnt);
rpmts ts = rpmtsCreate();
- if (parseSpec(ts, args.specfile, NULL, 0, NULL, NULL, 0, 1, 1) != 0) {
+#if RPM_VERSION_CODE >= RPM_VERSION(4,4,9)
+ if (parseSpec(ts, args.specfile, NULL, 0, NULL, NULL, 1, 1, 0) != 0) {
+#else
+ if (parseSpec(ts, args.specfile, NULL, NULL, 0, NULL, NULL, 1, 1) != 0)
{
+#endif
return EXIT_FAILURE;
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-specdump.c?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
