RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 18-Jun-2012 20:10:39
Branch: rpm-5_4 Handle: 2012061818103801
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmdb rpmns.c rpmns.h
Log:
- rpmns: reserve set(...) and dpkg(...) namespace syntax.
Summary:
Revision Changes Path
1.3501.2.303+1 -0 rpm/CHANGES
1.15.2.5 +2 -0 rpm/rpmdb/rpmns.c
1.4.6.3 +3 -1 rpm/rpmdb/rpmns.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.302 -r1.3501.2.303 CHANGES
--- rpm/CHANGES 7 Jun 2012 14:16:58 -0000 1.3501.2.302
+++ rpm/CHANGES 18 Jun 2012 18:10:38 -0000 1.3501.2.303
@@ -1,4 +1,5 @@
5.4.9 -> 5.4.10:
+ - jbj: rpmns: reserve set(...) and dpkg(...) namespace syntax.
- jbj: git: fix: stub-out git_strerror when --without-git.
- devzero2000: fix common misspelling
Based on a nice idea of Jim Meyering.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmns.c
============================================================================
$ cvs diff -u -r1.15.2.4 -r1.15.2.5 rpmns.c
--- rpm/rpmdb/rpmns.c 16 Apr 2012 23:43:35 -0000 1.15.2.4
+++ rpm/rpmdb/rpmns.c 18 Jun 2012 18:10:39 -0000 1.15.2.5
@@ -133,6 +133,7 @@
_ENTRY(cpuinfo, RPMNS_TYPE_CPUINFO),
_ENTRY(digest, RPMNS_TYPE_DIGEST),
_ENTRY(diskspace, RPMNS_TYPE_DISKSPACE),
+ _ENTRY(dpkg, RPMNS_TYPE_DPKG),
_ENTRY(envvar, RPMNS_TYPE_ENVVAR),
_ENTRY(executable, RPMNS_TYPE_ACCESS),
_ENTRY(exists, RPMNS_TYPE_ACCESS),
@@ -154,6 +155,7 @@
_ENTRY(rw_, RPMNS_TYPE_ACCESS),
_ENTRY(rwx, RPMNS_TYPE_ACCESS),
_ENTRY(sanitycheck, RPMNS_TYPE_SANITY),
+ _ENTRY(set, RPMNS_TYPE_SET),
_ENTRY(signature, RPMNS_TYPE_SIGNATURE),
_ENTRY(soname, RPMNS_TYPE_SONAME),
_ENTRY(uname, RPMNS_TYPE_UNAME),
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmns.h
============================================================================
$ cvs diff -u -r1.4.6.2 -r1.4.6.3 rpmns.h
--- rpm/rpmdb/rpmns.h 3 May 2011 15:58:19 -0000 1.4.6.2
+++ rpm/rpmdb/rpmns.h 18 Jun 2012 18:10:39 -0000 1.4.6.3
@@ -52,7 +52,9 @@
RPMNS_TYPE_VCHECK = (1 << 26), /*!< vcheck(foo) */
RPMNS_TYPE_SIGNATURE= (1 << 27), /*!< signature(/text:/sig) =
/pub:id */
RPMNS_TYPE_VERIFY = (1 << 28), /*!< verify(N) = E:V-R */
- RPMNS_TYPE_CONFIG = (1 << 29) /*!< config(N) = E:V-R */
+ RPMNS_TYPE_CONFIG = (1 << 29), /*!< config(N) = E:V-R */
+ RPMNS_TYPE_SET = (1 << 30), /*!< set(N) = E:V-R */
+ RPMNS_TYPE_DPKG = (1 << 31) /*!< dpkg(N) = E:V-R */
} nsType;
#if defined(_RPMNS_INTERNAL)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
