Release candidate.

CVS patchset: 3327
CVS date: 1999/09/24 23:36:52

diff --git a/lib/depends.c b/lib/depends.c
index ebb12d0..919e6aa 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -336,7 +336,7 @@ static int rangesOverlap(const char *AName, const char *AEVR, int AFlags,
        sense = rpmvercmp(aE, bE);
     else if (aE && *aE && atol(aE) > 0) {
        /* XXX legacy epoch-less requires/conflicts compatibility */
-       rpmMessage(RPMMESS_WARNING, _("the \"B\" dependency needs an epoch (assuming same as \"A\")\n\tA %s\tB %s\n"),
+       rpmMessage(RPMMESS_DEBUG, _("the \"B\" dependency needs an epoch (assuming same as \"A\")\n\tA %s\tB %s\n"),
                aDepend, bDepend);
        sense = 0;
     } else if (bE && *bE && atol(bE) > 0)

diff --git a/po/rpm.pot b/po/rpm.pot
index f6e12ca..34f2c43 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-24 17:54-0400\n"
+"POT-Creation-Date: 1999-09-24 19:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index b45ac3a..d2e3631 100644 (file)
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -236,6 +236,8 @@ void initrpm(void) {
                         PyInt_FromLong(RPMFILE_STATE_NOTINSTALLED));
     PyDict_SetItemString(d, "RPMFILE_CONFIG", 
                         PyInt_FromLong(RPMFILE_CONFIG));
+    PyDict_SetItemString(d, "RPMFILE_MISSINGOK",
+                        PyInt_FromLong(RPMFILE_MISSINGOK));
     PyDict_SetItemString(d, "RPMFILE_DOC", 
                         PyInt_FromLong(RPMFILE_DOC));
 
@@ -1318,8 +1320,10 @@ static PyObject * rpmtransDepCheck(rpmtransObject * s, PyObject * args) {
        for (i = 0; i < numConflicts; i++) {
            cf = Py_BuildValue("((sss)(ss)iOi)", conflicts[i].byName, 
                               conflicts[i].byVersion, conflicts[i].byRelease,
+
                               conflicts[i].needsName, 
                               conflicts[i].needsVersion,
+
                               conflicts[i].needsFlags,
                               conflicts[i].suggestedPackage ?
                                   conflicts[i].suggestedPackage : Py_None,

diff --git a/rpm.spec b/rpm.spec
index 4d70afa..45ac579 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.0.3
 Version: %{version}
-Release: 0.33
+Release: 1
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -91,6 +91,9 @@ fi
 /usr/lib/librpm.so.*
 /usr/lib/librpmbuild.so.*
 /usr/lib/rpm
+%ifos linux
+/usr/lib/python1.5/site-packages/rpmmodule.so
+%endif
 %dir /usr/src/redhat
 %dir /usr/src/redhat/BUILD
 %dir /usr/src/redhat/SPECS
@@ -112,6 +115,3 @@ fi
 /usr/lib/librpmbuild.a
 /usr/lib/librpmbuild.la
 /usr/lib/librpmbuild.so
-%ifos linux
-/usr/lib/python1.5/site-packages/rpmmodule.so
-%endif