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

List:       rpm-cvs
Subject:    [CVS] RPM: rpm/ rpmpopt.in
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2008-05-29 13:45:21
Message-ID: 20080529134521.07FF034845A () 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:   29-May-2008 15:45:21
  Branch: HEAD                             Handle: 2008052913452000

  Modified files:
    rpm                     rpmpopt.in

  Log:
    - jbj: rpmrepo: add baseurl to the repo markup.

  Summary:
    Revision    Changes     Path
    2.65        +7  -7      rpm/rpmpopt.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmpopt.in
  ============================================================================
  $ cvs diff -u -r2.64 -r2.65 rpmpopt.in
  --- rpm/rpmpopt.in	12 May 2008 18:30:24 -0000	2.64
  +++ rpm/rpmpopt.in	29 May 2008 13:45:20 -0000	2.65
  @@ -2,7 +2,7 @@
   # \verbatim
   #
   # @USRLIBRPM@/@configure_input@
  -# $Id: rpmpopt.in,v 2.64 2008/05/12 18:30:24 jbj Exp $
  +# $Id: rpmpopt.in,v 2.65 2008/05/29 13:45:20 jbj Exp $
   #
   # This file *should not be modified*. Local customizations
   # belong in /etc/popt, not here. This file will be replaced
  @@ -115,7 +115,7 @@
   \n  <url>%|URL?{%{URL:cdata}}:{}|</url>\
   \n  <time file="%{PACKAGETIME}" build="%{BUILDTIME}"/>\
   \n  <size package="%{PACKAGESIZE}" installed="%{SIZE}" archive="%{ARCHIVESIZE}"/>\
  -\n  <location href="%{PACKAGEORIGIN:bncdata}"/>\
  +\n  <location %|PACKAGEBASEURL?{xml:base=\"%{PACKAGEBASEURL:cdata}\" \
}|href="%{PACKAGEORIGIN:bncdata}"/>\  \n  <format>\
   %|license?{\
   \n    <rpm:license>%{LICENSE:cdata}</rpm:license>\
  @@ -209,11 +209,11 @@
   ,\n '%{HEADERSTARTOFF}'\
   , '%{HEADERENDOFF}'\
   , '%|PACKAGER?{%{PACKAGER:sqlescape}}|'\
  -, '%{SIZE}'\
  +, '%{PACKAGESIZE}'\
   , '%{SIZE}'\
   , '%{ARCHIVESIZE}'\
  -,\n '%{PACKAGEORIGIN:sqlescape}'\
  -,\n '%{PACKAGEORIGIN:sqlescape}'\
  +,\n '%{PACKAGEORIGIN:bncdata}'\
  +,\n '%{PACKAGEBASEURL:sqlescape}'\
   , 'sha'\
   );\
   %|providename?{[\
  @@ -265,11 +265,11 @@
   \n  Hdrstart:    %{HEADERSTARTOFF}\
   \n  Hdrend:      %{HEADERENDOFF}\
   \n  Packager:    %|PACKAGER?{%{PACKAGER:yaml}}:{-}|\
  -\n  Packagesize: %{SIZE}\
  +\n  Packagesize: %{PACKAGESIZE}\
   \n  Size:        %{SIZE}\
   \n  Archivesize: %{ARCHIVESIZE}\
   \n  Location:    %{PACKAGEORIGIN:yaml}\
  -\n  BaseURL:     %{PACKAGEORIGIN:yaml}\
  +\n  BaseURL:     %|PACKAGEBASEURL?{%{PACKAGEBASEURL:yaml}}:{-}|\
   \n  Idtype:      sha\
   \n  Rpm:\
   %|license?{\
  @@ .
______________________________________________________________________
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]