summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2007-09-21 15:23:02 +0300
committerPanu Matilainen <pmatilai@redhat.com>2007-09-21 15:23:02 +0300
commit2c2538d7260baf0eae36d5ee07ddbfffc20044d9 (patch)
treed69b77c30349d2424e5cc09d310c67a6b57845b5 /python
parent0a16dadffc398617de3f4d0b6d45e4f017e19b9f (diff)
downloadrpm-2c2538d7260baf0eae36d5ee07ddbfffc20044d9.tar.gz
rpm-2c2538d7260baf0eae36d5ee07ddbfffc20044d9.tar.bz2
rpm-2c2538d7260baf0eae36d5ee07ddbfffc20044d9.zip
Rename Spec -> rpmSpec for namespacing
Diffstat (limited to 'python')
-rw-r--r--python/rpmts-py.c2
-rw-r--r--python/spec-py.c16
-rw-r--r--python/spec-py.h6
3 files changed, 12 insertions, 12 deletions
diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 946d84a3f..5161c5a00 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -1205,7 +1205,7 @@ static specObject *
spec_Parse(rpmtsObject * s, PyObject * args, PyObject * kwds)
{
const char * specfile;
- Spec spec;
+ rpmSpec spec;
char * buildRoot = NULL;
int recursing = 0;
char * passPhrase = "";
diff --git a/python/spec-py.c b/python/spec-py.c
index aab5bd026..727c91050 100644
--- a/python/spec-py.c
+++ b/python/spec-py.c
@@ -54,7 +54,7 @@ spec_print(specObject * s)
static PyObject *
spec_get_buildroot(specObject * s)
{
- Spec spec = specFromSpec(s);
+ rpmSpec spec = specFromSpec(s);
if (spec != NULL && spec->buildRootURL) {
return Py_BuildValue("s", spec->buildRootURL);
}
@@ -66,7 +66,7 @@ spec_get_buildroot(specObject * s)
static PyObject *
spec_get_prep(specObject * s)
{
- Spec spec = specFromSpec(s);
+ rpmSpec spec = specFromSpec(s);
if (spec != NULL && spec->prep) {
StringBuf sb = newStringBuf();
sb=spec->prep;
@@ -80,7 +80,7 @@ spec_get_prep(specObject * s)
static PyObject *
spec_get_build(specObject * s)
{
- Spec spec = specFromSpec(s);
+ rpmSpec spec = specFromSpec(s);
if (spec != NULL && spec->build) {
StringBuf sb = newStringBuf();
sb=spec->build;
@@ -94,7 +94,7 @@ spec_get_build(specObject * s)
static PyObject *
spec_get_install(specObject * s)
{
- Spec spec = specFromSpec(s);
+ rpmSpec spec = specFromSpec(s);
if (spec != NULL && spec->install) {
StringBuf sb = newStringBuf();
sb=spec->install;
@@ -108,7 +108,7 @@ spec_get_install(specObject * s)
static PyObject *
spec_get_clean(specObject * s)
{
- Spec spec = specFromSpec(s);
+ rpmSpec spec = specFromSpec(s);
if (spec != NULL && spec->clean) {
StringBuf sb = newStringBuf();
sb=spec->clean;
@@ -124,7 +124,7 @@ spec_get_sources(specObject *s)
{
struct Source * source;
PyObject *sourceList, *srcUrl;
- Spec spec;
+ rpmSpec spec;
char * fullSource;
sourceList = PyList_New(0);
@@ -206,13 +206,13 @@ PyTypeObject spec_Type = {
0, /* tp_is_gc */
};
-Spec specFromSpec(specObject *s)
+rpmSpec specFromSpec(specObject *s)
{
return s->spec;
}
specObject *
-spec_Wrap(Spec spec)
+spec_Wrap(rpmSpec spec)
{
specObject * s = PyObject_New(specObject, &spec_Type);
if (s == NULL)
diff --git a/python/spec-py.h b/python/spec-py.h
index afd9f0674..d69098399 100644
--- a/python/spec-py.h
+++ b/python/spec-py.h
@@ -10,17 +10,17 @@
typedef struct specObject_s {
PyObject_HEAD
/*type specific fields */
- Spec spec;
+ rpmSpec spec;
} specObject;
extern PyTypeObject spec_Type;
/**
*/
-Spec specFromSpec(specObject * spec);
+rpmSpec specFromSpec(specObject * spec);
/**
*/
-specObject * spec_Wrap(Spec spec);
+specObject * spec_Wrap(rpmSpec spec);
#endif /* RPMPYTHON_SPEC */