4.0.4-alt66

This commit is contained in:
Дмитрий Левин 2006-05-14 17:06:45 +04:00
parent 5416277102
commit f431605c03
4 changed files with 9 additions and 4 deletions

1
.gear-rules Normal file
View File

@ -0,0 +1 @@
tar: . name=rpm-4_0-4.0.4

View File

@ -522,7 +522,7 @@ static PyObject * hdrSubscript(hdrObject * s, PyObject * item) {
while (extensions->name) { while (extensions->name) {
if (extensions->type == HEADER_EXT_TAG if (extensions->type == HEADER_EXT_TAG
&& !xstrcasecmp(extensions->name + 7, str)) { && !xstrcasecmp(extensions->name + 7, str)) {
(const struct headerSprintfExtension *) ext = extensions; ext = extensions;
} }
extensions++; extensions++;
} }

View File

@ -1043,7 +1043,7 @@ void initrpm(void) {
while (extensions->name) { while (extensions->name) {
if (extensions->type == HEADER_EXT_TAG) { if (extensions->type == HEADER_EXT_TAG) {
(const struct headerSprintfExtension *) ext = extensions; ext = extensions;
PyDict_SetItemString(d, extensions->name, o=PyCObject_FromVoidPtr(ext, NULL)); PyDict_SetItemString(d, extensions->name, o=PyCObject_FromVoidPtr(ext, NULL));
Py_DECREF(o); Py_DECREF(o);
PyDict_SetItem(dict, tag, o=PyString_FromString(ext->name + 7)); PyDict_SetItem(dict, tag, o=PyString_FromString(ext->name + 7));

View File

@ -4,7 +4,7 @@
Name: %rpm_name Name: %rpm_name
Version: %rpm_version Version: %rpm_version
Release: alt65 Release: alt66
%define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}} %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') %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 License: GPL
Group: System/Configuration/Packaging Group: System/Configuration/Packaging
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Packager: Dmitry V. Levin <ldv@altlinux.org>
# 1. ftp://ftp.rpm.org/pub/rpm/dist/ # 1. ftp://ftp.rpm.org/pub/rpm/dist/
# 2. cvs -d :pserver:anonymous@cvs.rpm.org:/cvs/devel export -r rpm-4_0 rpm # 2. cvs -d :pserver:anonymous@cvs.rpm.org:/cvs/devel export -r rpm-4_0 rpm
# 3. ALT Linux CVS # 3. ALT Linux CVS
Source: %srcname.tar.bz2 Source: %srcname.tar
Provides: %_sysconfdir/%name/macros.d Provides: %_sysconfdir/%name/macros.d
@ -521,6 +522,9 @@ fi
%endif #with contrib %endif #with contrib
%changelog %changelog
* Sun May 14 2006 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt66
- Fixed build with gcc-4.1.0.
* Tue Apr 04 2006 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt65 * Tue Apr 04 2006 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt65
- build/parsePreamble.c: - build/parsePreamble.c:
+ Ignore RPMTAG_BUILDROOT value completely. + Ignore RPMTAG_BUILDROOT value completely.