From 4f1bba10aa4a9463b068aff002e7c8ffd36f21c1 Mon Sep 17 00:00:00 2001 From: jbj Date: Thu, 23 May 2002 21:06:42 +0000 Subject: [PATCH] - add rpmds/rpmfi/rpmts methods to bindings. CVS patchset: 5447 CVS date: 2002/05/23 21:06:42 --- CHANGES | 1 + po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/is.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/no.po | 2 +- po/pl.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/rpm.pot | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 4 ++-- po/sr.po | 2 +- po/sv.po | 2 +- po/tr.po | 2 +- python/rpmds-py.c | 8 ++++---- python/rpmds-py.h | 2 +- python/rpmfi-py.c | 4 ++-- python/rpmfi-py.h | 2 +- python/rpmts-py.h | 4 ---- rpm.spec.in | 7 +++++-- 27 files changed, 35 insertions(+), 35 deletions(-) diff --git a/CHANGES b/CHANGES index 39a8a34..b4c5592 100644 --- a/CHANGES +++ b/CHANGES @@ -115,6 +115,7 @@ - opaque (well mostly) rpmTransactionSet using methods. - Grand Renaming of rpm data types. - fix: synthesize unpacking progress callbacks for packages w/o files. + - add rpmds/rpmfi/rpmts methods to bindings. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/po/cs.po b/po/cs.po index 48f44ff..bc0d510 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index 8b54862..c075a6d 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 201866d..ad15d9c 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" diff --git a/po/fi.po b/po/fi.po index f427c23..f6fca0f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" diff --git a/po/fr.po b/po/fr.po index de05acc..e168dfb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/gl.po b/po/gl.po index 53c1ffb..95464b7 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" diff --git a/po/is.po b/po/is.po index f75b256..8fcdf85 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" diff --git a/po/ja.po b/po/ja.po index 4040ba9..7b23672 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" diff --git a/po/ko.po b/po/ko.po index 5ff32e7..6ab7920 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" diff --git a/po/no.po b/po/no.po index 866df67..bba7975 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" diff --git a/po/pl.po b/po/pl.po index e03be88..7152b6e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4e3c28a..7093d7d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" #: build.c:40 #, fuzzy diff --git a/po/ro.po b/po/ro.po index 2a06262..d49118e 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" diff --git a/po/rpm.pot b/po/rpm.pot index 7578e07..6cef668 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ru.po b/po/ru.po index 5fa349a..d54e9e7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" diff --git a/po/sk.po b/po/sk.po index 1df3c89..a55902f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" diff --git a/po/sl.po b/po/sl.po index 8739768..00f6375 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.247 2002/05/23 19:42:42 jbj Exp $ +# $Id: sl.po,v 1.248 2002/05/23 21:07:10 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" diff --git a/po/sr.po b/po/sr.po index 7778383..314132a 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" diff --git a/po/sv.po b/po/sv.po index 4dca857..480a107 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" diff --git a/po/tr.po b/po/tr.po index 0933f72..34e9a95 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-05-23 08:29-0400\n" +"POT-Creation-Date: 2002-05-23 17:06-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" diff --git a/python/rpmds-py.c b/python/rpmds-py.c index c695b1d..58978bb 100644 --- a/python/rpmds-py.c +++ b/python/rpmds-py.c @@ -265,7 +265,7 @@ rpmds dsFromDs(rpmdsObject * s) } rpmdsObject * -rpmds_New(rpmds ds) +rpmds_Wrap(rpmds ds) { rpmdsObject *s = PyObject_NEW(rpmdsObject, &rpmds_Type); if (s == NULL) @@ -284,7 +284,7 @@ rpmds_Single(PyObject * s, PyObject * args) if (!PyArg_ParseTuple(args, "is|si", &tagN, &N, &EVR, &Flags)) return NULL; - return rpmds_New( rpmdsSingle(tagN, N, EVR, Flags) ); + return rpmds_Wrap( rpmdsSingle(tagN, N, EVR, Flags) ); } rpmdsObject * @@ -296,7 +296,7 @@ hdr_dsFromHeader(PyObject * s, PyObject * args) if (!PyArg_ParseTuple(args, "O!|i", &hdr_Type, &ho, &tagN)) return NULL; - return rpmds_New( rpmdsNew(hdrGetHeader(ho), tagN, scareMem) ); + return rpmds_Wrap( rpmdsNew(hdrGetHeader(ho), tagN, scareMem) ); } rpmdsObject * @@ -308,5 +308,5 @@ hdr_dsOfHeader(PyObject * s, PyObject * args) if (!PyArg_ParseTuple(args, "O!", &hdr_Type, &ho)) return NULL; - return rpmds_New( rpmdsThis(hdrGetHeader(ho), tagN, Flags) ); + return rpmds_Wrap( rpmdsThis(hdrGetHeader(ho), tagN, Flags) ); } diff --git a/python/rpmds-py.h b/python/rpmds-py.h index e730090..88a2b34 100644 --- a/python/rpmds-py.h +++ b/python/rpmds-py.h @@ -14,7 +14,7 @@ extern PyTypeObject rpmds_Type; rpmds dsFromDs(rpmdsObject * ds); -rpmdsObject * rpmds_New(rpmds ds); +rpmdsObject * rpmds_Wrap(rpmds ds); rpmdsObject * rpmds_Single(PyObject * s, PyObject * args); diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c index d80a495..810fd17 100644 --- a/python/rpmfi-py.c +++ b/python/rpmfi-py.c @@ -354,7 +354,7 @@ rpmfi fiFromFi(rpmfiObject * s) } rpmfiObject * -rpmfi_New(rpmfi fi) +rpmfi_Wrap(rpmfi fi) { rpmfiObject *s = PyObject_NEW(rpmfiObject, &rpmfi_Type); if (s == NULL) @@ -370,5 +370,5 @@ hdr_fiFromHeader(PyObject * s, PyObject * args) if (!PyArg_ParseTuple(args, "O!", &hdr_Type, &ho)) return NULL; - return rpmfi_New( rpmfiNew(NULL, NULL, hdrGetHeader(ho), RPMTAG_BASENAMES, 0) ); + return rpmfi_Wrap( rpmfiNew(NULL, NULL, hdrGetHeader(ho), RPMTAG_BASENAMES, 0) ); } diff --git a/python/rpmfi-py.h b/python/rpmfi-py.h index 5171e69..60dca83 100644 --- a/python/rpmfi-py.h +++ b/python/rpmfi-py.h @@ -14,7 +14,7 @@ extern PyTypeObject rpmfi_Type; rpmfi fiFromFi(rpmfiObject * fi); -rpmfiObject * rpmfi_New(rpmfi fi); +rpmfiObject * rpmfi_Wrap(rpmfi fi); rpmfiObject * hdr_fiFromHeader(PyObject * s, PyObject * args); diff --git a/python/rpmts-py.h b/python/rpmts-py.h index f564010..59f1c66 100644 --- a/python/rpmts-py.h +++ b/python/rpmts-py.h @@ -21,10 +21,6 @@ enum { RPMDEP_SENSE_CONFLICTS /*!< conflict was found. */ }; -rpmts tsFromTs(rpmtsObject * ts); - -rpmtsObject * rpmts_New(rpmts ts); - rpmtsObject * rpmts_Create(PyObject * s, PyObject * args); #endif diff --git a/rpm.spec.in b/rpm.spec.in index 5f7a5e2..bd8ad31 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -1,4 +1,4 @@ -%define with_python_subpackage 0%{nil} +%define with_python_subpackage @WITH_PYTHON_SUBPACKAGE@%{nil} %define with_python_version @WITH_PYTHON_VERSION@%{nil} %define with_perl_subpackage 0 %define with_bzip2 @WITH_BZIP2@%{nil} @@ -17,7 +17,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.15 +Release: 0.16 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -515,6 +515,9 @@ fi %{__prefix}/include/popt.h %changelog +* Thu May 23 2002 Jeff Johnson 4.1-0.16 +- add rpmds/rpmfi/rpmts methods to bindings. + * Sun May 19 2002 Jeff Johnson 4.1-0.15 - Grand Renaming of rpm data types. - fix: synthesize unpacking progress callbacks for packages w/o files. -- 2.7.4