[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 deb_md5sum...
From: "Jeff Johnson" <jbj () rpm5 ! org>
Date: 2009-01-26 15:41:57
Message-ID: 20090126154157.EABA221ED06 () 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 16:41:57
Branch: HEAD Handle: 2009012615415700
Added files:
rpm/scripts deb_md5sums deb_postinst deb_postrm deb_preinst
deb_prerm
Modified files:
rpm CHANGES rpmpopt.in
rpm/scripts Makefile.am
Log:
- install/use deb:{md5sums,preinst,postinst,prerm,postrm}
queryformats.
Summary:
Revision Changes Path
1.2763 +1 -0 rpm/CHANGES
2.79 +15 -41 rpm/rpmpopt.in
1.54 +4 -1 rpm/scripts/Makefile.am
1.1 +8 -0 rpm/scripts/deb_md5sums
1.1 +6 -0 rpm/scripts/deb_postinst
1.1 +6 -0 rpm/scripts/deb_postrm
1.1 +6 -0 rpm/scripts/deb_preinst
1.1 +6 -0 rpm/scripts/deb_prerm
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2762 -r1.2763 CHANGES
--- rpm/CHANGES 26 Jan 2009 14:41:45 -0000 1.2762
+++ rpm/CHANGES 26 Jan 2009 15:41:57 -0000 1.2763
@@ -1,5 +1,6 @@
5.2a2 -> 5.2a3:
+ - jbj: install/use deb:{md5sums,preinst,postinst,prerm,postrm} queryformats.
- 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.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
============================================================================
$ cvs diff -u -r2.78 -r2.79 rpmpopt.in
--- rpm/rpmpopt.in 26 Jan 2009 14:41:45 -0000 2.78
+++ rpm/rpmpopt.in 26 Jan 2009 15:41:57 -0000 2.79
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.78 2009/01/26 14:41:45 jbj Exp $
+# $Id: rpmpopt.in,v 2.79 2009/01/26 15:41:57 jbj Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -213,75 +213,49 @@
\n' \
--POPTdesc=$"display binary debian/control file"
-rpm alias --deb:preinst --qf '\
-%|PREIN?{\
-%|PREINPROG?{#!%{PREINPROG})}:{#!/bin/sh}|\
-\n%{PREIN}\
-}|\
-\n' \
+rpm alias --deb:preinst --qf @USRLIBRPM@/qf/deb_preinst \
--POPTdesc=$"display debian/preinst script"
-rpm alias --deb:postinst --qf '\
-%|POSTIN?{\
-%|POSTINPROG?{#!%{POSTINPROG})}:{#!/bin/sh}|\
-\n%{POSTIN}\
-}|\
-\n' \
+rpm alias --deb:postinst --qf @USRLIBRPM@/qf/deb_postinst \
--POPTdesc=$"display debian/postinst script"
-rpm alias --deb:prerm --qf '\
-%|PREUN?{\
-%|PREUNPROG?{#!%{PREUNPROG})}:{#!/bin/sh}|\
-\n%{PREUN}\
-}|\
-\n' \
+rpm alias --deb:prerm --qf @USRLIBRPM@/qf/deb_prerm \
--POPTdesc=$"display debian/prerm script"
-rpm alias --deb:postrm --qf '\
-%|POSTUN?{\
-%|POSTUNPROG?{#!%{POSTUNPROG})}:{#!/bin/sh}|\
-\n%{POSTUN}\
-}|\
-\n' \
+rpm alias --deb:postrm --qf @USRLIBRPM@/qf/deb_postrm \
--POPTdesc=$"display debian/postrm script"
-rpm alias --deb:md5sums --qf '\
-%|FILENAMES?{\
-[\
-%{Debmd5sums}\n\
-]\
-}|\
-' \
+rpm alias --deb:md5sums --qf @USRLIBRPM@/qf/deb_md5sums \
--POPTdesc=$"display debian/md5sums manifest"
#==============================================================================
-rpm alias --yum:primary.xml --qf @USRLIBRPM@/qf/yum_primary_xml
+rpm alias --yum:primary.xml --qf @USRLIBRPM@/qf/yum_primary_xml \
--POPTdesc=$"display yum primary.xml markup"
-rpm alias --yum:filelists.xml --qf @USRLIBRPM@/qf/yum_filelists_xml
+rpm alias --yum:filelists.xml --qf @USRLIBRPM@/qf/yum_filelists_xml \
--POPTdesc=$"display yum filelists.xml markup"
-rpm alias --yum:other.xml --qf @USRLIBRPM@/qf/yum_other_xml
+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
+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
+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
+rpm alias --yum:other.sqlite --qf @USRLIBRPM@/qf/yum_other_sqlite \
--POPTdesc=$"display yum other.sqlite import"
#==============================================================================
-rpm alias --wnh:primary.yaml --qf @USRLIBRPM@/qf/wnh_primary_yaml
+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
+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
+rpm alias --wnh:other.yaml --qf @USRLIBRPM@/qf/wnh_other_yaml \
--POPTdesc=$"display wnh other.yaml markup"
#==============================================================================
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
============================================================================
$ cvs diff -u -r1.53 -r1.54 Makefile.am
--- rpm/scripts/Makefile.am 26 Jan 2009 14:41:46 -0000 1.53
+++ rpm/scripts/Makefile.am 26 Jan 2009 15:41:57 -0000 1.54
@@ -7,7 +7,9 @@
brp-strip brp-strip-comment-note brp-nobuildrootpath \
brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
brp-implant-ident-static brp-java-repack-jars \
- check-files cross-build executabledeps.sh \
+ check-files cross-build \
+ deb_md5sums deb_postinst deb_postrm deb_preinst deb_prerm \
+ executabledeps.sh \
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
find-provides.ksyms find-requires.ksyms kmodtool \
cpanflute cpanflute2 Specfile.pm find-provides.perl \
@@ -54,6 +56,7 @@
pkglibqfdir = @USRLIBRPM@/qf
pkglibqf_DATA = \
+ deb_md5sums deb_postinst deb_postrm deb_preinst deb_prerm \
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/deb_md5sums
============================================================================
$ cvs diff -u -r0 -r1.1 deb_md5sums
--- /dev/null 2009-01-26 16:35:51 +0100
+++ deb_md5sums 2009-01-26 16:41:57 +0100
@@ -0,0 +1,8 @@
+"\
+%|FILENAMES?{\
+[\
+\n%{Debmd5sums}\
+]\
+\n\
+}|\
+"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/deb_postinst
============================================================================
$ cvs diff -u -r0 -r1.1 deb_postinst
--- /dev/null 2009-01-26 16:35:51 +0100
+++ deb_postinst 2009-01-26 16:41:57 +0100
@@ -0,0 +1,6 @@
+"\
+%|POSTIN?{\
+%|POSTINPROG?{#!%{POSTINPROG}}:{#!/bin/sh}|\
+\n%{POSTIN}\
+\n}|\
+"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/deb_postrm
============================================================================
$ cvs diff -u -r0 -r1.1 deb_postrm
--- /dev/null 2009-01-26 16:35:51 +0100
+++ deb_postrm 2009-01-26 16:41:57 +0100
@@ -0,0 +1,6 @@
+"\
+%|POSTUN?{\
+%|POSTUNPROG?{#!%{POSTUNPROG}}:{#!/bin/sh}|\
+\n%{POSTUN}\
+\n}|\
+"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/deb_preinst
============================================================================
$ cvs diff -u -r0 -r1.1 deb_preinst
--- /dev/null 2009-01-26 16:35:51 +0100
+++ deb_preinst 2009-01-26 16:41:57 +0100
@@ -0,0 +1,6 @@
+"\
+%|PREIN?{\
+%|PREINPROG?{#!%{PREINPROG}}:{#!/bin/sh}|\
+\n%{PREIN}\
+\n}|\
+"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/deb_prerm
============================================================================
$ cvs diff -u -r0 -r1.1 deb_prerm
--- /dev/null 2009-01-26 16:35:51 +0100
+++ deb_prerm 2009-01-26 16:41:57 +0100
@@ -0,0 +1,6 @@
+"\
+%|PREUN?{\
+%|PREUNPROG?{#!%{PREUNPROG}}:{#!/bin/sh}|\
+\n%{PREUN}\
+\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