RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 16-Jul-2007 15:40:47
Branch: HEAD Handle: 2007071614404700
Modified files:
rpm CHANGES macros.in
rpm/python rpmts-py.c
Log:
Follow rpm.org and remove vendor-specific "_vsflags_up2date" macro (Red
Hat), use "_vsflags" in Python bindings instead.
Submitted by: Panu Matilainen via rpm.org
Obtained from: http://hg.rpm.org/rpm?cs=872a6b9f54ec
Summary:
Revision Changes Path
1.1478 +1 -0 rpm/CHANGES
1.180 +1 -2 rpm/macros.in
1.67 +2 -2 rpm/python/rpmts-py.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1477 -r1.1478 CHANGES
--- rpm/CHANGES 16 Jul 2007 10:06:36 -0000 1.1477
+++ rpm/CHANGES 16 Jul 2007 13:40:47 -0000 1.1478
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - rse: remove RH-specific "_vsflags_up2date" macro, use "_vsflags" in
Python bindings instead
- rse: make --with-path-rpmpopt a colon-separated path to allow
"rpmpopt" files be similar to "macros" files
- rse: allow the path to the RPM package sources be overridden via
Autoconf option --with-path-sources
- rse: allow the path to the RPM database directory be overridden via
Autoconf option --with-path-database
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.179 -r1.180 macros.in
--- rpm/macros.in 16 Jul 2007 08:49:00 -0000 1.179
+++ rpm/macros.in 16 Jul 2007 13:40:47 -0000 1.180
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.179 2007/07/16 08:49:00 rse Exp $
+# $Id: macros.in,v 1.180 2007/07/16 13:40:47 rse Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -892,7 +892,6 @@
%_vsflags_install %{__vsflags}
%_vsflags_query %{__vsflags}
%_vsflags_rebuilddb %{__vsflags}
-%_vsflags_up2date %{__vsflags}
%_vsflags_verify %{__vsflags}
# Relations between package names that cause dependency loops
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmts-py.c
============================================================================
$ cvs diff -u -r1.66 -r1.67 rpmts-py.c
--- rpm/python/rpmts-py.c 12 Jul 2007 10:57:50 -0000 1.66
+++ rpm/python/rpmts-py.c 16 Jul 2007 13:40:47 -0000 1.67
@@ -1570,7 +1570,7 @@
/[EMAIL PROTECTED] s, rpmGlobalMacroContext @*/
{
char * rootDir = "/";
- int vsflags = rpmExpandNumeric("%{?_vsflags_up2date}");
+ int vsflags = rpmExpandNumeric("%{?_vsflags}");
char * kwlist[] = {"rootdir", "vsflags", 0};
if (_rpmts_debug < 0)
@@ -1709,7 +1709,7 @@
{
rpmtsObject * o;
char * rootDir = "/";
- int vsflags = rpmExpandNumeric("%{?_vsflags_up2date}");
+ int vsflags = rpmExpandNumeric("%{?_vsflags}");
char * kwlist[] = {"rootdir", "vsflags", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|si:Create", kwlist,
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
