--- /dev/null
+--- rpm-5.4.9/build/parseDescription.c.mdvbz62979~ 2012-05-03 20:39:51.000000000 +0200
++++ rpm-5.4.9/build/parseDescription.c 2012-05-15 01:55:31.332318888 +0200
+@@ -92,6 +92,7 @@ int parseDescription(Spec spec)
+ }
+
+ /* Lose the inheirited %description (if present). */
++#if !defined(RPM_VENDOR_MANDRIVA) && !defined(RPM_VENDOR_PLD) /* mdvbz#62979 */
+ if (spec->packages->header != pkg->header) {
+ he->tag = RPMTAG_DESCRIPTION;
+ xx = headerGet(pkg->header, he, 0);
+@@ -99,6 +100,7 @@ int parseDescription(Spec spec)
+ if (xx && he->t == RPM_STRING_TYPE)
+ xx = headerDel(pkg->header, he, 0);
+ }
++#endif
+
+ t = stashSt(spec, pkg->header, RPMTAG_DESCRIPTION, lang);
+
--- /dev/null
+--- rpm-5.4.9/lib/rpmgi.c.pattern~ 2012-04-15 23:20:58.000000000 +0200
++++ rpm-5.4.9/lib/rpmgi.c 2012-05-17 01:56:21.018481577 +0200
+@@ -473,7 +473,7 @@ fprintf(stderr, "*** gi %p key %p[%d]\tm
+ pat = ae;
+ got++;
+ }
+- if (got) {
++ if (got >= 0) {
+ if (_rpmgi_debug < 0)
+ fprintf(stderr, "\tav %p[%d]: \"%s\" -> %s ~= \"%s\"\n", gi->argv, (int)(av - gi->argv), *av, tagName((rpmTag)tag), pat);
+ got = rpmmiAddPattern(gi->mi, (rpmTag)tag, RPMMIRE_DEFAULT, pat);
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 5.4.10
-Release: 29
+Release: 30
License: LGPL
Group: Base
# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
# disable it to avoid errors from berkeley db..
# status: keep locally
Patch1041: rpm-5.4.9-disable-l10ndir.patch
+# status: ready for merge
+Patch1042: rpm-5.4.9-fix-rpm_qa-pattern.patch
+# status: i18n strings is getting dropped, so this one might be of less relevance,
+# but feel free to discuss it on rpm-devel
+Patch1043: rpm-5.4.9-fix-mdvbz62979.patch
URL: http://rpm5.org/
BuildRequires: autoconf >= 2.60
%patch1039 -p1
%patch1040 -p1
%patch1041 -p1
+%patch1042 -p1
+%patch1043 -p1
install %{SOURCE2} macros/pld.in
install %{SOURCE8} scripts/php.prov.in