[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm/ CHANGES rpmpopt.in
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2009-01-26 14:25:20
Message-ID: 20090126142520.401CC21BCB4 () rpm5 ! org
[Download RAW message or body]

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   26-Jan-2009 15:25:20
  Branch: HEAD                             Handle: 2009012614251900

  Modified files:
    rpm                     CHANGES rpmpopt.in

  Log:
    - jbj: attempt --yum:other.yaml markup definition (gud enuf for now).

  Summary:
    Revision    Changes     Path
    1.2761      +1  -0      rpm/CHANGES
    2.77        +7  -4      rpm/rpmpopt.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2760 -r1.2761 CHANGES
  --- rpm/CHANGES	25 Jan 2009 21:21:14 -0000	1.2760
  +++ rpm/CHANGES	26 Jan 2009 14:25:19 -0000	1.2761
  @@ -1,5 +1,6 @@
   
   5.2a2 -> 5.2a3:
  +    - jbj: attempt --yum:other.yaml markup definition (gud enuf for now).
       - jbj: finish up yum:{primary,filelists}.yaml header extension tags.
       - jbj: rpmrepo: compile in queryformat strings.
       - jbj: add doublequotes around queryformats for #include use in rpmrepo.c.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmpopt.in
  ============================================================================
  $ cvs diff -u -r2.76 -r2.77 rpmpopt.in
  --- rpm/rpmpopt.in	25 Jan 2009 21:21:14 -0000	2.76
  +++ rpm/rpmpopt.in	26 Jan 2009 14:25:19 -0000	2.77
  @@ -2,7 +2,7 @@
   # \verbatim
   #
   # @USRLIBRPM@/@configure_input@
  -# $Id: rpmpopt.in,v 2.76 2009/01/25 21:21:14 jbj Exp $
  +# $Id: rpmpopt.in,v 2.77 2009/01/26 14:25:19 jbj Exp $
   #
   # This file *should not be modified*. Local customizations
   # belong in /etc/popt, not here. This file will be replaced
  @@ -274,8 +274,8 @@
   \n  Description: %{DESCRIPTION:yaml}\
   \n  Packager:    %|PACKAGER?{%{PACKAGER:yaml}}:{-}|\
   \n  Url:         %|URL?{%{URL:yaml}}:{-}|\
  -\n  Filetime:    %{PACKAGETIME}\
  -\n  Buildtime:   %{BUILDTIME}\
  +\n  Filetime:    %{PACKAGETIME:date}\
  +\n  Buildtime:   %{BUILDTIME:date}\
   \n  Packagesize: %{PACKAGESIZE}\
   \n  Size:        %{SIZE}\
   \n  Archivesize: %{ARCHIVESIZE}\
  @@ -363,7 +363,10 @@
   \n  Changelogs:\
   %|changelogname?{\
   [\
  -\n    - <changelog author="%{CHANGELOGNAME:cdata}" \
date="%{CHANGELOGTIME}">%{CHANGELOGTEXT:cdata}</changelog>\  +\n   -\
  +\n    Author: %{CHANGELOGNAME}\
  +\n    Date:   %{CHANGELOGTIME:date}\
  +\n%{CHANGELOGTEXT:yaml}\
   ]\
   }|\
   \n' \
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org


[prev in list] [next in list] [prev in thread] [next in thread]