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: 22-Jan-2009 06:32:24 Branch: HEAD Handle: 2009012205322301 Modified files: rpm CHANGES rpm/build files.c Log: don't wipe out $DOCDIR when using %doc as it will wipe out any files that would happen to be installed during %install. Summary: Revision Changes Path 1.2752 +2 -0 rpm/CHANGES 1.352 +0 -1 rpm/build/files.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2751 -r1.2752 CHANGES --- rpm/CHANGES 21 Jan 2009 22:24:17 -0000 1.2751 +++ rpm/CHANGES 22 Jan 2009 05:32:23 -0000 1.2752 @@ -1,5 +1,7 @@ 5.2a2 -> 5.2a3: + - proyvind: don't wipe out $DOCDIR when using %doc as it will wipe out any + files that would happen to be installed during %install. - jbj: add POPT_ARGFLAG_TOGGLE sufficient to test (invisible w popt < 1.15). - jbj: enable the PLD dependency filtering. - jbj: PLD: rpm-pld-autodep: add run-time disablers, attempt miRE's instead. @@ . patch -p0 <<'@@ .' Index: rpm/build/files.c ============================================================================ $ cvs diff -u -r1.351 -r1.352 files.c --- rpm/build/files.c 17 Jan 2009 00:33:29 -0000 1.351 +++ rpm/build/files.c 22 Jan 2009 05:32:24 -0000 1.352 @@ -1034,7 +1034,6 @@ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "DOCDIR=\"$RPM_BUILD_ROOT\"", 0); pkg->specialDoc = rpmiobAppend(pkg->specialDoc, buf, 1); pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "export DOCDIR", 1); - pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "rm -rf \"$DOCDIR\"", 1); mkdir_p = rpmExpand("%{?__mkdir_p}%{!?__mkdir_p:mkdir -p}", NULL); if (!mkdir_p) mkdir_p = xstrdup("mkdir -p"); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
