[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 yum_fileli...
From: "Jeff Johnson" <jbj () rpm5 ! org>
Date: 2009-01-25 17:22:18
Message-ID: 20090125172218.BE449215018 () 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: 25-Jan-2009 18:22:18
Branch: HEAD Handle: 2009012517221701
Added files:
rpm/scripts yum_filelists_sqlite yum_other_sqlite
yum_primary_sqlite
Modified files:
rpm CHANGES rpmpopt.in
rpm/scripts Makefile.am
Log:
- jbj: blueprint/use yum:{primary,filelists,other}.sqlite
queryformats.
Summary:
Revision Changes Path
1.2758 +1 -0 rpm/CHANGES
2.75 +4 -83 rpm/rpmpopt.in
1.52 +4 -2 rpm/scripts/Makefile.am
1.1 +9 -0 rpm/scripts/yum_filelists_sqlite
1.1 +14 -0 rpm/scripts/yum_other_sqlite
1.1 +53 -0 rpm/scripts/yum_primary_sqlite
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2757 -r1.2758 CHANGES
--- rpm/CHANGES 25 Jan 2009 17:01:58 -0000 1.2757
+++ rpm/CHANGES 25 Jan 2009 17:22:17 -0000 1.2758
@@ -1,5 +1,6 @@
5.2a2 -> 5.2a3:
+ - jbj: blueprint/use yum:{primary,filelists,other}.sqlite queryformats.
- jbj: blueprint/use yum:{primary,filelists,other}.xml queryformats.
- jbj: install yum:{primary,filelists,other}.xml queryformats.
- jbj: use poptReadFile with retrofit for popt < 1.15.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
============================================================================
$ cvs diff -u -r2.74 -r2.75 rpmpopt.in
--- rpm/rpmpopt.in 25 Jan 2009 17:01:58 -0000 2.74
+++ rpm/rpmpopt.in 25 Jan 2009 17:22:17 -0000 2.75
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.74 2009/01/25 17:01:58 jbj Exp $
+# $Id: rpmpopt.in,v 2.75 2009/01/25 17:22:17 jbj Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -258,61 +258,7 @@
rpm alias --yum:primary.xml --qf @USRLIBRPM@/qf/yum_primary_xml
--POPTdesc=$"display yum primary.xml markup"
-rpm alias --yum:primary.sqlite --qf "\
-INSERT into packages values (\
-'%{DBINSTANCE}'\
-, '%|HDRID?{%{HDRID}}:{XXX}|'\
-,\n '%{NAME:sqlescape}'\
-, '%{ARCH:sqlescape}'\
-, '%{VERSION:sqlescape}'\
-, '%|EPOCH?{%{EPOCH}}:{0}|'\
-, '%{RELEASE:sqlescape}'\
-,\n '%{SUMMARY:sqlescape}'\
-,\n '%{DESCRIPTION:sqlescape}'\
-,\n '%|URL?{%{URL:sqlescape}}|'\
-, '%{PACKAGETIME}'\
-, '%{BUILDTIME}'\
-, '%|license?{%{LICENSE:sqlescape}}|'\
-,\n '%|vendor?{%{VENDOR:sqlescape}}|'\
-, '%|group?{%{GROUP:sqlescape}}|'\
-,\n '%|buildhost?{%{BUILDHOST:sqlescape}}|'\
-, '%|sourcerpm?{%{SOURCERPM:sqlescape}}|'\
-,\n '%{HEADERSTARTOFF}'\
-, '%{HEADERENDOFF}'\
-, '%|PACKAGER?{%{PACKAGER:sqlescape}}|'\
-, '%{PACKAGESIZE}'\
-, '%{SIZE}'\
-, '%{ARCHIVESIZE}'\
-,\n '%{PACKAGEORIGIN:bncdata}'\
-,\n '%{PACKAGEBASEURL:sqlescape}'\
-, 'sha'\
-);\
-%|providename?{[\
-\nINSERT into provides values (\
-%{providesqlentry}\
-);\
-]}|\
-%|conflictname?{[\
-\nINSERT into conflicts values (\
-%{conflictsqlentry}\
-);\
-]}|\
-%|obsoletename?{[\
-\nINSERT into obsoletes values (\
-%{conflictsqlentry}\
-);\
-]}|\
-%|requirename?{[\
-\nINSERT into requires values (\
-%{requiresqlentry}\
-);\
-]}|\
-%|basenames?{[\
-\nINSERT into files values (\
-%{filessqlentry1}\
-);\
-]}|\
-\n"\
+rpm alias --yum:primary.sqlite --qf @USRLIBRPM@/qf/yum_primary_sqlite
--POPTdesc=$"display yum primary.sqlite import"
rpm alias --yum:primary.yaml --qf '\
@@ -396,17 +342,7 @@
rpm alias --yum:filelists.xml --qf @USRLIBRPM@/qf/yum_filelists_xml
--POPTdesc=$"display yum filelists.xml markup"
-rpm alias --yum:filelists.sqlite --qf "\
-INSERT into packages values (\
-'%{DBINSTANCE}'\
-, '%|HDRID?{%{HDRID}}:{XXX}|'\
-);\
-%|basenames?{[\
-\nINSERT into filelist values (\
-%{filessqlentry2}\
-);\
-]}|\
-\n" \
+rpm alias --yum:filelists.sqlite --qf @USRLIBRPM@/qf/yum_filelists_sqlite
--POPTdesc=$"display yum filelists.sqlite import"
rpm alias --yum:filelists.yaml --qf '\
@@ -429,22 +365,7 @@
rpm alias --yum:other.xml --qf @USRLIBRPM@/qf/yum_other_xml
--POPTdesc=$"display yum other.xml markup"
-rpm alias --yum:other.sqlite --qf "\
-INSERT into packages values (\
-'%{DBINSTANCE}'\
-, '%|HDRID?{%{HDRID}}:{XXX}|'\
-);\
-%|changelogname?{[\
-\nINSERT into changelog values (\
-'XXX'\
-, '%{CHANGELOGNAME:sqlescape}'\
-, '%{CHANGELOGTIME}'\
-, '%{CHANGELOGTEXT:sqlescape}'\
-);\
-]}:{\
-\nINSERT into changelog values ('%{DBINSTANCE}', '', '', '');\
-}|\
-\n" \
+rpm alias --yum:other.sqlite --qf @USRLIBRPM@/qf/yum_other_sqlite
--POPTdesc=$"display yum other.sqlite import"
rpm alias --yum:other.yaml --qf '\
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
============================================================================
$ cvs diff -u -r1.51 -r1.52 Makefile.am
--- rpm/scripts/Makefile.am 25 Jan 2009 16:31:17 -0000 1.51
+++ rpm/scripts/Makefile.am 25 Jan 2009 17:22:18 -0000 1.52
@@ -23,7 +23,8 @@
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 \
- yum:filelists.xml yum:other.xml yum:primary.xml \
+ yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \
+ yum_filelists_xml yum_other_xml yum_primary_xml \
macros.perl* macros.python* \
macros.php* find-*.php find-php-*
@@ -52,7 +53,8 @@
pkglibqfdir = @USRLIBRPM@/qf
pkglibqf_DATA = \
- yum:filelists.xml yum:other.xml yum:primary.xml
+ yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \
+ yum_filelists_xml yum_other_xml yum_primary_xml
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rpm.pc
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/yum_filelists_sqlite
============================================================================
$ cvs diff -u -r0 -r1.1 yum_filelists_sqlite
--- /dev/null 2009-01-25 18:22:00 +0100
+++ yum_filelists_sqlite 2009-01-25 18:22:18 +0100
@@ -0,0 +1,9 @@
+INSERT into packages values (\
+'%{DBINSTANCE}'\
+, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
+);\
+%|basenames?{[\
+\nINSERT into filelist values (\
+%{filessqlentry2}\
+);\
+]}|
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/yum_other_sqlite
============================================================================
$ cvs diff -u -r0 -r1.1 yum_other_sqlite
--- /dev/null 2009-01-25 18:22:00 +0100
+++ yum_other_sqlite 2009-01-25 18:22:18 +0100
@@ -0,0 +1,14 @@
+INSERT into packages values (\
+'%{DBINSTANCE}'\
+, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
+);\
+%|changelogname?{[\
+\nINSERT into changelog values (\
+'XXX'\
+, '%{CHANGELOGNAME:sqlescape}'\
+, '%{CHANGELOGTIME}'\
+, '%{CHANGELOGTEXT:sqlescape}'\
+);\
+]}:{\
+\nINSERT into changelog ('%{DBINSTANCE}', '', '', '');\
+}|
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/yum_primary_sqlite
============================================================================
$ cvs diff -u -r0 -r1.1 yum_primary_sqlite
--- /dev/null 2009-01-25 18:22:00 +0100
+++ yum_primary_sqlite 2009-01-25 18:22:18 +0100
@@ -0,0 +1,53 @@
+INSERT into packages values (\
+'%{DBINSTANCE}'\
+, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
+,\n '%{NAME:sqlescape}'\
+, '%{ARCH:sqlescape}'\
+, '%{VERSION:sqlescape}'\
+, '%|EPOCH?{%{EPOCH}}:{0}|'\
+, '%{RELEASE:sqlescape}'\
+,\n '%{SUMMARY:sqlescape}'\
+,\n '%{DESCRIPTION:sqlescape}'\
+,\n '%|URL?{%{URL:sqlescape}}|'\
+, '%{PACKAGETIME}'\
+, '%{BUILDTIME}'\
+, '%|license?{%{LICENSE:sqlescape}}|'\
+,\n '%|vendor?{%{VENDOR:sqlescape}}|'\
+, '%|group?{%{GROUP:sqlescape}}|'\
+,\n '%|buildhost?{%{BUILDHOST:sqlescape}}|'\
+, '%|sourcerpm?{%{SOURCERPM:sqlescape}}|'\
+,\n '%{HEADERSTARTOFF}'\
+, '%{HEADERENDOFF}'\
+, '%|PACKAGER?{%{PACKAGER:sqlescape}}|'\
+, '%{PACKAGESIZE}'\
+, '%{SIZE}'\
+, '%{ARCHIVESIZE}'\
+,\n '%{PACKAGEORIGIN:bncdata}'\
+,\n '%{PACKAGEBASEURL:sqlescape}'\
+, 'sha'\
+);\
+%|obsoletename?{[\
+\nINSERT into obsoletes values (\
+%{obsoletesqlentry}\
+);\
+]}|\
+%|providename?{[\
+\nINSERT into provides values (\
+%{providesqlentry}\
+);\
+]}|\
+%|conflictname?{[\
+\nINSERT into conflicts values (\
+%{conflictsqlentry}\
+);\
+]}|\
+%|requirename?{[\
+\nINSERT into requires values (\
+%{requiresqlentry}\
+);\
+]}|\
+%|basenames?{[\
+\nINSERT into files values (\
+%{filessqlentry1}\
+);\
+]}|
@@ .
______________________________________________________________________
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