RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 07-Jul-2009 23:10:28
Branch: rpm-5_2 Handle: 2009070721102700
Modified files: (Branch: rpm-5_2)
rpm/lib psm.c
Log:
Merge from HEAD: fix building under
RPM_VENDOR_OPENPKG/switch-from-susr-to-musr-on-srpm-install
Summary:
Revision Changes Path
2.366.2.3 +13 -0 rpm/lib/psm.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.366.2.2 -r2.366.2.3 psm.c
--- rpm/lib/psm.c 22 May 2009 15:09:18 -0000 2.366.2.2
+++ rpm/lib/psm.c 7 Jul 2009 21:10:27 -0000 2.366.2.3
@@ -152,7 +152,11 @@
return RPMRC_OK;
}
+#if defined(RPM_VENDOR_OPENPKG) /* switch-from-susr-to-musr-on-srpm-install
*/
+static rpmRC createDir(rpmfi fi, rpmts ts, const char ** fn, const char *
name)
+#else
static rpmRC createDir(rpmts ts, const char ** fn, const char * name)
+#endif
/*...@globals rpmGlobalMacroContext @*/
/*...@modifies *fn, rpmGlobalMacroContext @*/
{
@@ -323,12 +327,21 @@
}
}
+#if defined(RPM_VENDOR_OPENPKG) /* switch-from-susr-to-musr-on-srpm-install
*/
+ if(createDir(fi, ts, NULL, "%{_topdir}") ||
+ createDir(fi, ts, NULL, "%{_builddir}") ||
+ createDir(fi, ts, NULL, "%{_rpmdir}") ||
+ createDir(fi, ts, NULL, "%{_srcrpmdir}") ||
+ createDir(fi, ts, &_sourcedir, "%{_sourcedir}") ||
+ createDir(fi, ts, &_specdir, "%{_specdir}"))
+#else
if(createDir(ts, NULL, "%{_topdir}") ||
createDir(ts, NULL, "%{_builddir}") ||
createDir(ts, NULL, "%{_rpmdir}") ||
createDir(ts, NULL, "%{_srcrpmdir}") ||
createDir(ts, &_sourcedir, "%{_sourcedir}") ||
createDir(ts, &_specdir, "%{_specdir}"))
+#endif
goto exit;
/* Build dnl/dil with {_sourcedir, _specdir} as values. */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
