RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: afb@rpm5.org
Module: rpm Date: 28-Dec-2007 00:21:15
Branch: HEAD Handle: 2007122723211500
Modified files:
rpm/lib rpmrc.c
Log:
restore the PowerPC machine sanitation for Darwin (from RPM 4.0.2),
since we're no longer overriding un.machine (earlier OpenDarwin-based
versions of RPM 4.x hardcoded the value to either of ppc or i386)
Summary:
Revision Changes Path
2.221 +4 -0 rpm/lib/rpmrc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.220 -r2.221 rpmrc.c
--- rpm/lib/rpmrc.c 8 Dec 2007 21:34:53 -0000 2.220
+++ rpm/lib/rpmrc.c 27 Dec 2007 23:21:15 -0000 2.221
@@ -603,6 +603,10 @@
}
#endif
+ if (!strncmp(un.machine, "Power Macintosh", 15)) {
+ sprintf(un.machine, "ppc");
+ }
+
#if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
/* allow the path to the "platforms" file be overridden under run-time */
cp = rpmExpand("%{?__platform}", NULL);
@@ .
Received on Fri Dec 28 00:21:15 2007