RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Arkadiusz Miskiewicz
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 29-Jul-2008 17:37:44
Branch: HEAD Handle: 2008072915374400
Modified files:
rpm/tools rpmspecdump.c
Log:
Drop compat.
Summary:
Revision Changes Path
2.2 +25 -59 rpm/tools/rpmspecdump.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tools/rpmspecdump.c
============================================================================
$ cvs diff -u -r2.1 -r2.2 rpmspecdump.c
--- rpm/tools/rpmspecdump.c 29 Jul 2008 15:36:09 -0000 2.1
+++ rpm/tools/rpmspecdump.c 29 Jul 2008 15:37:44 -0000 2.2
@@ -1,5 +1,5 @@
/*
- * $Id: rpmspecdump.c,v 2.1 2008/07/29 15:36:09 arekm Exp $
+ * $Id: rpmspecdump.c,v 2.2 2008/07/29 15:37:44 arekm Exp $
*
* Prints out following information in same format as %dump for builder:
* $ rpmbuild --nodigest --nosignature --nobuild -bp --define 'prep
%{echo:dummy: PACKAGE_NAME %{name} }%dump' qemu.spec 2>&1 | awk '$2 ~
/^SOURCEURL/ {print} $2 ~ /^PATCHURL/ {print} $2 ~ /^nosource/ {print} $2 ~
/^PACKAGE_/ {print}'
@@ -64,10 +64,6 @@
#define _GNU_SOURCE
-// 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)
-
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -83,9 +79,6 @@
#include <rpmbuild.h>
#include <rpmlib.h>
-#if RPM_VERSION_CODE < RPM_VERSION(5,0,0)
-#include <header.h>
-#endif
#include <rpmts.h>
#define ARG_WITH 1024
@@ -97,11 +90,6 @@
#define ARG_UID 1030
#define ARG_GID 1031
-// RPM 4.4.2
-#if RPM_VERSION_CODE < RPM_VERSION(4,4,9)
-# define RPMFILE_SOURCE RPMBUILD_ISSOURCE
-#endif
-
static struct option const
CMDLINE_OPTIONS[] = {
{ "help", no_argument, 0, 'h' },
@@ -274,11 +262,7 @@
setMacros(args.macros.values, args.macros.cnt);
rpmts ts = rpmtsCreate();
-#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, 1, NULL, NULL, 1, 1) != 0)
{
-#endif
return EXIT_FAILURE;
}
@@ -287,56 +271,38 @@
// here starts the code for builder
const char *name = NULL, *version = NULL, *release = NULL;
-#if RPM_VERSION_CODE >= RPM_VERSION(4,4,9)
initSourceHeader(s, NULL);
-#else
- initSourceHeader(s);
-#endif
Header h = s->sourceHeader;
-#if RPM_VERSION_CODE < RPM_VERSION(5,0,0)
- if (
- headerGetEntryMinMemory(h, RPMTAG_NAME, NULL, (void *)&name,
NULL) == 0 ||
- headerGetEntryMinMemory(h, RPMTAG_VERSION, NULL, (void
*)&version, NULL) == 0 ||
- headerGetEntryMinMemory(h, RPMTAG_RELEASE, NULL, (void
*)&release, NULL) == 0
- ) {
- fprintf(stderr, "NVR query failed\n");
+ HE_t he;
+ int rc;
+
+ he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
+ he->tag = (rpmTag) RPMTAG_NAME;
+ rc = headerGet(h, he, 0);
+ if (!rc) {
+ fprintf(stderr, "Name (NVR) query failed\n");
return EXIT_FAILURE;
}
+ name = (char *)he->p.ptr;
-#else
- {
- HE_t he;
- int rc;
-
- he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
- he->tag = (rpmTag) RPMTAG_NAME;
- rc = headerGet(h, he, 0);
- if (!rc) {
- fprintf(stderr, "Name (NVR) query failed\n");
- return EXIT_FAILURE;
- }
- name = (char *)he->p.ptr;
-
- he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
- he->tag = (rpmTag) RPMTAG_VERSION;
- rc = headerGet(h, he, 0);
- if (!rc) {
- fprintf(stderr, "Version (NVR) query failed\n");
- return EXIT_FAILURE;
- }
- version = (char *)he->p.ptr;
+ he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
+ he->tag = (rpmTag) RPMTAG_VERSION;
+ rc = headerGet(h, he, 0);
+ if (!rc) {
+ fprintf(stderr, "Version (NVR) query failed\n");
+ return EXIT_FAILURE;
+ }
+ version = (char *)he->p.ptr;
- he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
- he->tag = (rpmTag) RPMTAG_RELEASE;
- rc = headerGet(h, he, 0);
- if (!rc) {
- fprintf(stderr, "Release (NVR) query failed\n");
- return EXIT_FAILURE;
- }
- release = (char *)he->p.ptr;
+ he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
+ he->tag = (rpmTag) RPMTAG_RELEASE;
+ rc = headerGet(h, he, 0);
+ if (!rc) {
+ fprintf(stderr, "Release (NVR) query failed\n");
+ return EXIT_FAILURE;
}
-#endif
+ release = (char *)he->p.ptr;
printf("h PACKAGE_NAME %s\n", name);
printf("h PACKAGE_VERSION %s\n", version);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
