diff --git a/.gear-rules b/.gear-rules new file mode 100644 index 0000000..5d82433 --- /dev/null +++ b/.gear-rules @@ -0,0 +1 @@ +tar: . name=rpm-4_0-4.0.4 diff --git a/python/header-py.c b/python/header-py.c index 9d72b94..27958b7 100644 --- a/python/header-py.c +++ b/python/header-py.c @@ -522,7 +522,7 @@ static PyObject * hdrSubscript(hdrObject * s, PyObject * item) { while (extensions->name) { if (extensions->type == HEADER_EXT_TAG && !xstrcasecmp(extensions->name + 7, str)) { - (const struct headerSprintfExtension *) ext = extensions; + ext = extensions; } extensions++; } diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 0f7eac8..906324c 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -1043,7 +1043,7 @@ void initrpm(void) { while (extensions->name) { if (extensions->type == HEADER_EXT_TAG) { - (const struct headerSprintfExtension *) ext = extensions; + ext = extensions; PyDict_SetItemString(d, extensions->name, o=PyCObject_FromVoidPtr(ext, NULL)); Py_DECREF(o); PyDict_SetItem(dict, tag, o=PyString_FromString(ext->name + 7)); diff --git a/rpm-4_0.spec b/rpm-4_0.spec index b91884b..d671dec 100644 --- a/rpm-4_0.spec +++ b/rpm-4_0.spec @@ -4,7 +4,7 @@ Name: %rpm_name Version: %rpm_version -Release: alt65 +Release: alt66 %define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}} %define get_dep() %(rpm -q --qf '%%{NAME} >= %%|SERIAL?{%%{SERIAL}:}|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null || echo '%1 >= unknown') @@ -29,11 +29,12 @@ Summary(ru_RU.KOI8-R): License: GPL Group: System/Configuration/Packaging Url: http://www.rpm.org/ +Packager: Dmitry V. Levin # 1. ftp://ftp.rpm.org/pub/rpm/dist/ # 2. cvs -d :pserver:anonymous@cvs.rpm.org:/cvs/devel export -r rpm-4_0 rpm # 3. ALT Linux CVS -Source: %srcname.tar.bz2 +Source: %srcname.tar Provides: %_sysconfdir/%name/macros.d @@ -521,6 +522,9 @@ fi %endif #with contrib %changelog +* Sun May 14 2006 Dmitry V. Levin 4.0.4-alt66 +- Fixed build with gcc-4.1.0. + * Tue Apr 04 2006 Dmitry V. Levin 4.0.4-alt65 - build/parsePreamble.c: + Ignore RPMTAG_BUILDROOT value completely.