RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 05-Mar-2010 09:58:24 Branch: rpm-5_2 Handle: 2010030508582301 Modified files: (Branch: rpm-5_2) rpm CHANGES rpm/build parseDescription.c Log: fix: remove the inheirited %description before adding explicitly. Summary: Revision Changes Path 1.2970.2.49 +1 -0 rpm/CHANGES 2.43.2.1 +9 -10 rpm/build/parseDescription.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2970.2.48 -r1.2970.2.49 CHANGES --- rpm/CHANGES 28 Feb 2010 13:38:04 -0000 1.2970.2.48 +++ rpm/CHANGES 5 Mar 2010 08:58:23 -0000 1.2970.2.49 @@ -1,4 +1,5 @@ 5.2.0 -> 5.2.1: + - jbj: fix: remove the inheirited %description before adding explicitly. - proyvind: python: make sure that we always use our own rpm build and macros. - proyvind: filetriggers: don't pass filename as argument to scripts, @@ . patch -p0 <<'@@ .' Index: rpm/build/parseDescription.c ============================================================================ $ cvs diff -u -r2.43 -r2.43.2.1 parseDescription.c --- rpm/build/parseDescription.c 4 Apr 2009 03:37:51 -0000 2.43 +++ rpm/build/parseDescription.c 5 Mar 2010 08:58:24 -0000 2.43.2.1 @@ -89,17 +89,16 @@ goto exit; } - - /******************/ - -#if 0 - if (headerIsEntry(pkg->header, RPMTAG_DESCRIPTION)) { - rpmlog(RPMLOG_ERR, _("line %d: Second description\n"), - spec->lineNum); - goto exit; + /* Lose the inheirited %description (if present). */ + { HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he)); + int xx; + he->tag = RPMTAG_DESCRIPTION; + xx = headerGet(pkg->header, he, 0); + he->p.ptr = _free(he->p.ptr); + if (xx && he->t == RPM_STRING_TYPE) + xx = headerDel(pkg->header, he, 0); } -#endif - + t = stashSt(spec, pkg->header, RPMTAG_DESCRIPTION, lang); iob = rpmiobNew(0); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
