The right fix here -- almost 4+ years after being phased out -- is to remove the cpu-os-macros.tar.gz tar ball in cvs.
There's no way that rpm itself could or should enumerate the CPU enumeration faced with the proliferation of architectures. Nor has there ever been anything useful information in the CPU-OS/macros file except %optflags, which is invariably both compiler and vendor specific. Yes there is %_arch which Mandriva "needs" in CPU-OS/macros too. 73 de Jeff On Jun 16, 2011, at 4:31 AM, Per Øyvind Karlsen wrote: > RPM Package Manager, CVS Repository > http://rpm5.org/cvs/ > ____________________________________________________________________________ > > Server: rpm5.org Name: Per Øyvind Karlsen > Root: /v/rpm/cvs Email: pkarl...@rpm5.org > Module: rpm Date: 16-Jun-2011 10:31:32 > Branch: rpm-5_3 Handle: 2011061608313001 > > Modified files: (Branch: rpm-5_3) > rpm CHANGES cpu-os-macros.tar.gz > > Log: > fix broken %optflags for i686-linux macros > > Summary: > Revision Changes Path > 1.3296.2.239+1 -0 rpm/CHANGES > 1.2.4.3 BLOB rpm/cpu-os-macros.tar.gz > ____________________________________________________________________________ > > patch -p0 <<'@@ .' > Index: rpm/CHANGES > ============================================================================ > $ cvs diff -u -r1.3296.2.238 -r1.3296.2.239 CHANGES > --- rpm/CHANGES 7 Jun 2011 16:34:09 -0000 1.3296.2.238 > +++ rpm/CHANGES 16 Jun 2011 08:31:30 -0000 1.3296.2.239 > @@ -1,4 +1,5 @@ > 5.3.12 -> 5.3.13 > + - proyvind: fix broken %optflags for i686-linux macros. > - proyvind: mandriva: fix implicit %clean not being run when %changelog > is > present. > - devzero2000: In fpLookupSubdir, data returned by hash should be of > type > @@ . > (cd rpm && \ > uudecode <<'@@ .' && \ > mv cpu-os-macros.tar.gz cpu-os-macros.tar.gz.orig && \ > xdelta patch cpu-os-macros.tar.gz.xdelta cpu-os-macros.tar.gz.orig > cpu-os-macros.tar.gz && \ > rm -f cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz.xdelta) > Index: rpm/cpu-os-macros.tar.gz > ============================================================================ > @@ . > ______________________________________________________________________ > RPM Package Manager http://rpm5.org > CVS Sources Repository rpm-...@rpm5.org
smime.p7s
Description: S/MIME cryptographic signature
