RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 06-Jul-2007 20:45:53
Branch: HEAD Handle: 2007070619455201
Modified files:
rpm CHANGES build.h configure.ac rpmqv.c
rpm/build rpmspec.h
rpm/lib librpm.vers rpmcli.h rpmlib.h
Log:
- expunge every occurence of Rcfiles.
Summary:
Revision Changes Path
1.1439 +1 -0 rpm/CHANGES
2.21 +1 -1 rpm/build.h
2.58 +1 -1 rpm/build/rpmspec.h
2.167 +0 -18 rpm/configure.ac
1.3 +0 -1 rpm/lib/librpm.vers
2.68 +2 -5 rpm/lib/rpmcli.h
2.424 +2 -10 rpm/lib/rpmlib.h
1.117 +1 -1 rpm/rpmqv.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1438 -r1.1439 CHANGES
--- rpm/CHANGES 6 Jul 2007 18:22:05 -0000 1.1438
+++ rpm/CHANGES 6 Jul 2007 18:45:52 -0000 1.1439
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: expunge every occurence of Rcfiles.
- jbj: eliminate rcfile reading everywhere.
- jbj: eliminate last known internal usage of rpmrc files.
- jbj: generate per-platform macros for major CPU-linux platforms.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build.h
============================================================================
$ cvs diff -u -r2.20 -r2.21 build.h
--- rpm/build.h 25 May 2007 17:35:52 -0000 2.20
+++ rpm/build.h 6 Jul 2007 18:45:52 -0000 2.21
@@ -7,7 +7,7 @@
int build(rpmts ts, const char * arg, BTA_t ba,
/[EMAIL PROTECTED]@*/ const char * rcfile)
- /[EMAIL PROTECTED] rpmRcfiles, rpmGlobalMacroContext,
rpmCLIMacroContext,
+ /[EMAIL PROTECTED] rpmGlobalMacroContext, rpmCLIMacroContext,
h_errno, fileSystem, internalState @*/
/[EMAIL PROTECTED] ts, ba->buildAmount, rpmGlobalMacroContext,
rpmCLIMacroContext,
fileSystem, internalState @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/rpmspec.h
============================================================================
$ cvs diff -u -r2.57 -r2.58 rpmspec.h
--- rpm/build/rpmspec.h 25 May 2007 17:35:56 -0000 2.57
+++ rpm/build/rpmspec.h 6 Jul 2007 18:45:53 -0000 2.58
@@ -251,7 +251,7 @@
* @return 0 on success, else no. of failures
*/
int rpmspecQuery(rpmts ts, QVA_t qva, const char * arg)
- /[EMAIL PROTECTED] rpmRcfiles, rpmCLIMacroContext,
+ /[EMAIL PROTECTED] rpmCLIMacroContext,
rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/[EMAIL PROTECTED] ts, qva, rpmCLIMacroContext, rpmGlobalMacroContext,
fileSystem, internalState @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.166 -r2.167 configure.ac
--- rpm/configure.ac 6 Jul 2007 18:08:42 -0000 2.166
+++ rpm/configure.ac 6 Jul 2007 18:45:52 -0000 2.167
@@ -1079,24 +1079,6 @@
AC_SUBST(MACROFILES)
AC_MSG_RESULT([$MACROFILES])
-dnl # determine RPM run-command files path
-AC_MSG_CHECKING([for RPM run-command files path])
-RPMRCFILES="${USRLIBRPM}/${RPMCANONVENDOR}/rpmrc"
-RPMRCFILES="${RPMRCFILES}:${USRLIBRPM}/${RPMCANONVENDOR}/rpmrc"
-RPMRCFILES="${RPMRCFILES}:/etc/rpmrc"
-RPMRCFILES="${RPMRCFILES}:~/.rpmrc"
-AC_ARG_WITH(
- [path-rpmrc],
- AS_HELP_STRING([--with-path-rpmrc=ARG], [build with colon-separated RPM
run-command files path]),
- [RPMRCFILES="$withval"]
-)
-AC_DEFINE_UNQUOTED(
- [RPMRCFILES], ["$RPMRCFILES"],
- [Colon separated RPM run-command files path]
-)
-AC_SUBST(RPMRCFILES)
-AC_MSG_RESULT([$RPMRCFILES])
-
dnl # determine POPT configuration file path
AC_MSG_CHECKING([for POPT configuration file path])
RPMPOPTFILE="${USRLIBRPM}/${VERSION}/rpmpopt"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/librpm.vers
============================================================================
$ cvs diff -u -r1.2 -r1.3 librpm.vers
--- rpm/lib/librpm.vers 25 May 2007 18:34:13 -0000 1.2
+++ rpm/lib/librpm.vers 6 Jul 2007 18:45:53 -0000 1.3
@@ -251,7 +251,6 @@
rpmrbCheck;
rpmrbOrder;
rpmrbRun;
- rpmRcfiles;
rpmReadConfigFiles;
rpmReadHeader;
rpmReadPackageFile;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmcli.h
============================================================================
$ cvs diff -u -r2.67 -r2.68 rpmcli.h
--- rpm/lib/rpmcli.h 25 May 2007 17:36:02 -0000 2.67
+++ rpm/lib/rpmcli.h 6 Jul 2007 18:45:53 -0000 2.68
@@ -45,9 +45,6 @@
extern const char * rpmcliPipeOutput;
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
-extern const char * rpmcliRcfile;
-
-/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
extern const char * rpmcliRootDir;
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
@@ -64,7 +61,7 @@
/[EMAIL PROTECTED]@*/
poptContext
rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
- /[EMAIL PROTECTED] rpmRcfiles, rpmCLIMacroContext,
rpmGlobalMacroContext, h_errno, stderr,
+ /[EMAIL PROTECTED] rpmCLIMacroContext, rpmGlobalMacroContext, h_errno,
stderr,
fileSystem, internalState @*/
/[EMAIL PROTECTED] rpmCLIMacroContext, rpmGlobalMacroContext, stderr,
fileSystem, internalState @*/;
@@ -75,7 +72,7 @@
*/
/[EMAIL PROTECTED]@*/
void rpmcliConfigured(void)
- /[EMAIL PROTECTED] rpmRcfiles, rpmCLIMacroContext,
+ /[EMAIL PROTECTED] rpmCLIMacroContext,
rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/[EMAIL PROTECTED] rpmCLIMacroContext, rpmGlobalMacroContext,
fileSystem, internalState @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
============================================================================
$ cvs diff -u -r2.423 -r2.424 rpmlib.h
--- rpm/lib/rpmlib.h 19 Jun 2007 06:49:49 -0000 2.423
+++ rpm/lib/rpmlib.h 6 Jul 2007 18:45:53 -0000 2.424
@@ -528,22 +528,14 @@
#define RPM_MACHTABLE_COUNT 4 /*!< No. of arch/os tables. */
/** \ingroup rpmrc
- * The default rpmrc files to be read.
- * @deprecated The rpmrc files are no longer parsed by default.
- */
-/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
-extern const char *rpmRcfiles;
-
-/** \ingroup rpmrc
* Read macro configuration file(s) for a target.
- * @param file colon separated files to read (NULL uses
default)
+ * @param file NULL always
* @param target target platform (NULL uses default)
* @return 0 on success, -1 on error
*/
int rpmReadConfigFiles(/[EMAIL PROTECTED]@*/ const char * file,
/[EMAIL PROTECTED]@*/ const char * target)
- /[EMAIL PROTECTED] rpmRcfiles,
- rpmGlobalMacroContext, rpmCLIMacroContext, h_errno,
+ /[EMAIL PROTECTED] rpmGlobalMacroContext, rpmCLIMacroContext, h_errno,
fileSystem, internalState @*/
/[EMAIL PROTECTED] rpmGlobalMacroContext, rpmCLIMacroContext,
fileSystem, internalState @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.116 -r1.117 rpmqv.c
--- rpm/rpmqv.c 6 Jul 2007 18:22:05 -0000 1.116
+++ rpm/rpmqv.c 6 Jul 2007 18:45:52 -0000 1.117
@@ -178,7 +178,7 @@
#else
int main(int argc, const char ** argv)
#endif
- /[EMAIL PROTECTED] rpmRcfiles, rpmEVR, RPMVERSION,
+ /[EMAIL PROTECTED] rpmEVR, RPMVERSION,
rpmGlobalMacroContext, rpmCLIMacroContext,
h_errno, fileSystem, [EMAIL PROTECTED]/
/[EMAIL PROTECTED] fileSystem, [EMAIL PROTECTED]/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
