RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm-4_5: rpm/tools/ rpm-specdump.c

From: Elan Ruusamäe <glen@rpm5.org>
Date: Sat 26 Jan 2008 - 23:44:23 CET
Message-Id: <20080126224423.11CE0348464@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Elan Ruusamäe
  Root:   /v/rpm/cvs                       Email:  glen@rpm5.org
  Module: rpm                              Date:   26-Jan-2008 23:44:23
  Branch: rpm-4_5                          Handle: 2008012622442200

  Modified files:           (Branch: rpm-4_5)
    rpm/tools               rpm-specdump.c

  Log:
    - always call initSourceHeader. fixes rpm 4.4.9

  Summary:
    Revision    Changes     Path
    1.1.2.3     +3  -5      rpm/tools/rpm-specdump.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/tools/rpm-specdump.c
  ============================================================================
  $ cvs diff -u -r1.1.2.2 -r1.1.2.3 rpm-specdump.c
  --- rpm/tools/rpm-specdump.c	23 Jan 2008 19:46:15 -0000	1.1.2.2
  +++ rpm/tools/rpm-specdump.c	26 Jan 2008 22:44:22 -0000	1.1.2.3
  @@ -1,5 +1,5 @@
   /*
  - * $Id: rpm-specdump.c,v 1.1.2.2 2008/01/23 19:46:15 glen Exp $
  + * $Id: rpm-specdump.c,v 1.1.2.3 2008/01/26 22:44:22 glen 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}'
  @@ -285,13 +285,11 @@
   	// here starts the code for builder
   	const char *name = NULL, *version = NULL, *release = NULL;
   
  -	if (s->sourceHeader == NULL) {
   #if RPM_VERSION_CODE >= RPM_VERSION(4,4,9)
  -		initSourceHeader(s, NULL);
  +	initSourceHeader(s, NULL);
   #else
  -		initSourceHeader(s);
  +	initSourceHeader(s);
   #endif
  -	}
   	Header h = s->sourceHeader;
   
   	if (
  @@ .
Received on Sat Jan 26 23:44:23 2008
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.