[prev in list] [next in list] [prev in thread] [next in thread]
List: rpm-cvs
Subject: [CVS] RPM: rpm/ CHANGES rpmpopt.in rpm/scripts/ Makefile.am wnh_fileli...
From: "Jeff Johnson" <jbj () rpm5 ! org>
Date: 2009-01-26 14:41:46
Message-ID: 20090126144146.9F4972196DE () 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:41:46
Branch: HEAD Handle: 2009012614414501
Added files:
rpm/scripts wnh_filelists_yaml wnh_other_yaml wnh_primary_yaml
Modified files:
rpm CHANGES rpmpopt.in
rpm/scripts Makefile.am
Log:
- install/use wnh:{primary,filelists,other}.yaml queryformats.
Summary:
Revision Changes Path
1.2762 +1 -0 rpm/CHANGES
2.78 +17 -105 rpm/rpmpopt.in
1.53 +2 -0 rpm/scripts/Makefile.am
1.1 +16 -0 rpm/scripts/wnh_filelists_yaml
1.1 +19 -0 rpm/scripts/wnh_other_yaml
1.1 +58 -0 rpm/scripts/wnh_primary_yaml
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2761 -r1.2762 CHANGES
--- rpm/CHANGES 26 Jan 2009 14:25:19 -0000 1.2761
+++ rpm/CHANGES 26 Jan 2009 14:41:45 -0000 1.2762
@@ -1,5 +1,6 @@
5.2a2 -> 5.2a3:
+ - jbj: install/use wnh:{primary,filelists,other}.yaml queryformats.
- 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.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
============================================================================
$ cvs diff -u -r2.77 -r2.78 rpmpopt.in
--- rpm/rpmpopt.in 26 Jan 2009 14:25:19 -0000 2.77
+++ rpm/rpmpopt.in 26 Jan 2009 14:41:45 -0000 2.78
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.77 2009/01/26 14:25:19 jbj Exp $
+# $Id: rpmpopt.in,v 2.78 2009/01/26 14:41:45 jbj Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -258,119 +258,31 @@
rpm alias --yum:primary.xml --qf @USRLIBRPM@/qf/yum_primary_xml
--POPTdesc=$"display yum primary.xml markup"
-rpm alias --yum:primary.sqlite --qf @USRLIBRPM@/qf/yum_primary_sqlite
- --POPTdesc=$"display yum primary.sqlite import"
-
-rpm alias --yum:primary.yaml --qf '\
-Package:\
-\n Id: %|HDRID?{%{HDRID}}:{-}|\
-\n Idtype: sha\
-\n Name: %{NAME:yaml}\
-\n Arch: %{ARCH:yaml}\
-\n Version: %{VERSION:yaml}\
-\n Epoch: %|EPOCH?{%{EPOCH}}:{0}|\
-\n Release: %{RELEASE:yaml}\
-\n Summary: %{SUMMARY:yaml}\
-\n Description: %{DESCRIPTION:yaml}\
-\n Packager: %|PACKAGER?{%{PACKAGER:yaml}}:{-}|\
-\n Url: %|URL?{%{URL:yaml}}:{-}|\
-\n Filetime: %{PACKAGETIME:date}\
-\n Buildtime: %{BUILDTIME:date}\
-\n Packagesize: %{PACKAGESIZE}\
-\n Size: %{SIZE}\
-\n Archivesize: %{ARCHIVESIZE}\
-\n Location: %{PACKAGEORIGIN:yaml}\
-\n BaseURL: %|PACKAGEBASEURL?{%{PACKAGEBASEURL:yaml}}:{-}|\
-\n License: %|license?{%{LICENSE:yaml}}:{-}|\
-\n Vendor: %|vendor?{%{VENDOR:yaml}}:{-}|\
-\n Group: %|group?{%{GROUP:yaml}}:{-}|\
-\n Buildhost: %|buildhost?{%{BUILDHOST:yaml}}:{-}|\
-\n Sourcerpm: %|sourcerpm?{%{SOURCERPM:yaml}}:{-}|\
-\n Hdrstart: %{HEADERSTARTOFF}\
-\n Hdrend: %{HEADERENDOFF}\
-%|providename?{\
-\n Provides:\
-[\
-\n %{provideyamlentry}\
-]\
-}|\
-%|requirename?{\
-\n Requires:\
-[\
-\n %{requireyamlentry}\
-]\
-}|\
-%|conflictname?{\
-\n Conflicts:\
-[\
-\n %{conflictyamlentry}\
-]\
-}|\
-%|obsoletename?{\
-\n Obsoletes:\
-[\
-\n %{obsoleteyamlentry}\
-]\
-}|\
-%|filesxmlentry1?{\
-\n Files:\
-[\
-\n %{filesyamlentry1}\
-]\
-}|\
-\n'\
- --POPTdesc=$"display yum primary.yaml markup"
-
rpm alias --yum:filelists.xml --qf @USRLIBRPM@/qf/yum_filelists_xml
--POPTdesc=$"display yum filelists.xml markup"
-rpm alias --yum:filelists.sqlite --qf @USRLIBRPM@/qf/yum_filelists_sqlite
- --POPTdesc=$"display yum filelists.sqlite import"
-
-rpm alias --yum:filelists.yaml --qf '\
-Filelists:\
-\n Id: %|HDRID?{%{HDRID}}:{XXX}|\
-\n Idtype: sha\
-\n Name: %{NAME:yaml}\
-\n Arch: %{ARCH:yaml}\
-\n Epoch: %|EPOCH?{%{EPOCH}}:{0}|\
-\n Version: %{VERSION:yaml}\
-\n Release: %{RELEASE:yaml}\
-\n Files:\
-%|filesyamlentry2?{\
-[\
-\n %{filesyamlentry2}\
-]\
-}|\
-\n' \
- --POPTdesc=$"display yum filelists.yaml markup"
-
rpm alias --yum:other.xml --qf @USRLIBRPM@/qf/yum_other_xml
--POPTdesc=$"display yum other.xml markup"
+#==============================================================================
+rpm alias --yum:primary.sqlite --qf @USRLIBRPM@/qf/yum_primary_sqlite
+ --POPTdesc=$"display yum primary.sqlite import"
+
+rpm alias --yum:filelists.sqlite --qf @USRLIBRPM@/qf/yum_filelists_sqlite
+ --POPTdesc=$"display yum filelists.sqlite import"
+
rpm alias --yum:other.sqlite --qf @USRLIBRPM@/qf/yum_other_sqlite
--POPTdesc=$"display yum other.sqlite import"
-rpm alias --yum:other.yaml --qf '\
-Other:\
-\n Id: %|HDRID?{%{HDRID}}:{XXX}|\
-\n Idtype: sha\
-\n Name: %{NAME:yaml}\
-\n Arch: %{ARCH:yaml}\
-\n Epoch: %|EPOCH?{%{EPOCH}}:{0}|\
-\n Version: %{VERSION:yaml}\
-\n Release: %{RELEASE:yaml}\
-\n Changelogs:\
-%|changelogname?{\
-[\
-\n -\
-\n Author: %{CHANGELOGNAME}\
-\n Date: %{CHANGELOGTIME:date}\
-\n%{CHANGELOGTEXT:yaml}\
-]\
-}|\
-\n' \
- --POPTdesc=$"display yum other.yaml markup"
+#==============================================================================
+rpm alias --wnh:primary.yaml --qf @USRLIBRPM@/qf/wnh_primary_yaml
+ --POPTdesc=$"display wnh primary.yaml markup"
+
+rpm alias --wnh:filelists.yaml --qf @USRLIBRPM@/qf/wnh_filelists_yaml
+ --POPTdesc=$"display wnh filelists.yaml markup"
+
+rpm alias --wnh:other.yaml --qf @USRLIBRPM@/qf/wnh_other_yaml
+ --POPTdesc=$"display wnh other.yaml markup"
#==============================================================================
rpm alias --triggerscripts --qf '\
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
============================================================================
$ cvs diff -u -r1.52 -r1.53 Makefile.am
--- rpm/scripts/Makefile.am 25 Jan 2009 17:22:18 -0000 1.52
+++ rpm/scripts/Makefile.am 26 Jan 2009 14:41:46 -0000 1.53
@@ -23,6 +23,7 @@
rpmsort rt-reloc-wrapper.sh symset-table \
sql.prov sql.req symclash.py symclash.sh tcl.req tgpg trpm u_pkg.sh \
vcheck vpkg-provides.sh vpkg-provides2.sh \
+ wnh_filelists_yaml wnh_other_yaml wnh_primary_yaml \
yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \
yum_filelists_xml yum_other_xml yum_primary_xml \
macros.perl* macros.python* \
@@ -53,6 +54,7 @@
pkglibqfdir = @USRLIBRPM@/qf
pkglibqf_DATA = \
+ wnh_filelists_yaml wnh_other_yaml wnh_primary_yaml \
yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \
yum_filelists_xml yum_other_xml yum_primary_xml
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/wnh_filelists_yaml
============================================================================
$ cvs diff -u -r0 -r1.1 wnh_filelists_yaml
--- /dev/null 2009-01-26 15:39:01 +0100
+++ wnh_filelists_yaml 2009-01-26 15:41:46 +0100
@@ -0,0 +1,16 @@
+"\
+Filelists:\
+\n Id: %|HDRID?{%{HDRID}}:{XXX}|\
+\n Idtype: sha\
+\n Name: %{NAME:yaml}\
+\n Arch: %{ARCH:yaml}\
+\n Epoch: %|EPOCH?{%{EPOCH}}:{0}|\
+\n Version: %{VERSION:yaml}\
+\n Release: %{RELEASE:yaml}\
+\n Files:\
+%|filesyamlentry2?{\
+[\
+\n %{filesyamlentry2}\
+]\
+}|\
+\n"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/wnh_other_yaml
============================================================================
$ cvs diff -u -r0 -r1.1 wnh_other_yaml
--- /dev/null 2009-01-26 15:39:01 +0100
+++ wnh_other_yaml 2009-01-26 15:41:46 +0100
@@ -0,0 +1,19 @@
+"\
+Other:\
+\n Id: %|HDRID?{%{HDRID}}:{XXX}|\
+\n Idtype: sha\
+\n Name: %{NAME:yaml}\
+\n Arch: %{ARCH:yaml}\
+\n Epoch: %|EPOCH?{%{EPOCH}}:{0}|\
+\n Version: %{VERSION:yaml}\
+\n Release: %{RELEASE:yaml}\
+\n Changelogs:\
+%|changelogname?{\
+[\
+\n -\
+\n Author: %{CHANGELOGNAME}\
+\n Date: %{CHANGELOGTIME:date}\
+\n%{CHANGELOGTEXT:yaml}\
+]\
+}|\
+\n"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/wnh_primary_yaml
============================================================================
$ cvs diff -u -r0 -r1.1 wnh_primary_yaml
--- /dev/null 2009-01-26 15:39:01 +0100
+++ wnh_primary_yaml 2009-01-26 15:41:46 +0100
@@ -0,0 +1,58 @@
+"\
+Package:\
+\n Id: %|HDRID?{%{HDRID}}:{-}|\
+\n Idtype: sha\
+\n Name: %{NAME:yaml}\
+\n Arch: %{ARCH:yaml}\
+\n Version: %{VERSION:yaml}\
+\n Epoch: %|EPOCH?{%{EPOCH}}:{0}|\
+\n Release: %{RELEASE:yaml}\
+\n Summary: %{SUMMARY:yaml}\
+\n Description: %{DESCRIPTION:yaml}\
+\n Packager: %|PACKAGER?{%{PACKAGER:yaml}}:{-}|\
+\n Url: %|URL?{%{URL:yaml}}:{-}|\
+\n Filetime: %{PACKAGETIME:date}\
+\n Buildtime: %{BUILDTIME:date}\
+\n Packagesize: %{PACKAGESIZE}\
+\n Size: %{SIZE}\
+\n Archivesize: %{ARCHIVESIZE}\
+\n Location: %{PACKAGEORIGIN:yaml}\
+\n BaseURL: %|PACKAGEBASEURL?{%{PACKAGEBASEURL:yaml}}:{-}|\
+\n License: %|license?{%{LICENSE:yaml}}:{-}|\
+\n Vendor: %|vendor?{%{VENDOR:yaml}}:{-}|\
+\n Group: %|group?{%{GROUP:yaml}}:{-}|\
+\n Buildhost: %|buildhost?{%{BUILDHOST:yaml}}:{-}|\
+\n Sourcerpm: %|sourcerpm?{%{SOURCERPM:yaml}}:{-}|\
+\n Hdrstart: %{HEADERSTARTOFF}\
+\n Hdrend: %{HEADERENDOFF}\
+%|providename?{\
+\n Provides:\
+[\
+\n %{provideyamlentry}\
+]\
+}|\
+%|requirename?{\
+\n Requires:\
+[\
+\n %{requireyamlentry}\
+]\
+}|\
+%|conflictname?{\
+\n Conflicts:\
+[\
+\n %{conflictyamlentry}\
+]\
+}|\
+%|obsoletename?{\
+\n Obsoletes:\
+[\
+\n %{obsoleteyamlentry}\
+]\
+}|\
+%|filesxmlentry1?{\
+\n Files:\
+[\
+\n %{filesyamlentry1}\
+]\
+}|\
+\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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic