From dfd6cb4982e46b1357b859eb89800331c9cef191 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 25 Oct 2012 17:21:55 +0200 Subject: [PATCH] - add two more patches from mandriva - rel 30 --- rpm-5.4.9-fix-mdvbz62979.patch | 18 ++++++++++++++++++ rpm-5.4.9-fix-rpm_qa-pattern.patch | 11 +++++++++++ rpm.spec | 9 ++++++++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 rpm-5.4.9-fix-mdvbz62979.patch create mode 100644 rpm-5.4.9-fix-rpm_qa-pattern.patch diff --git a/rpm-5.4.9-fix-mdvbz62979.patch b/rpm-5.4.9-fix-mdvbz62979.patch new file mode 100644 index 0000000..2b8fa6f --- /dev/null +++ b/rpm-5.4.9-fix-mdvbz62979.patch @@ -0,0 +1,18 @@ +--- 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); + diff --git a/rpm-5.4.9-fix-rpm_qa-pattern.patch b/rpm-5.4.9-fix-rpm_qa-pattern.patch new file mode 100644 index 0000000..76ce249 --- /dev/null +++ b/rpm-5.4.9-fix-rpm_qa-pattern.patch @@ -0,0 +1,11 @@ +--- 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); diff --git a/rpm.spec b/rpm.spec index 3befce9..4ab77f5 100644 --- a/rpm.spec +++ b/rpm.spec @@ -52,7 +52,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM 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 @@ -254,6 +254,11 @@ Patch1040: rpm-5.4.9-support-signatures-and-digest-disablers.patch # 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 @@ -881,6 +886,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch1039 -p1 %patch1040 -p1 %patch1041 -p1 +%patch1042 -p1 +%patch1043 -p1 install %{SOURCE2} macros/pld.in install %{SOURCE8} scripts/php.prov.in -- 2.44.0