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:   31-Dec-2007 11:04:24
  Branch: HEAD                             Handle: 2007123110042400

  Modified files:
    rpm                     TODO devtool.conf

  Log:
    add m32/m64 too

  Summary:
    Revision    Changes     Path
    1.106       +1  -0      rpm/TODO
    2.161       +3  -2      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/TODO
  ============================================================================
  $ cvs diff -u -r1.105 -r1.106 TODO
  --- rpm/TODO	30 Dec 2007 14:33:06 -0000	1.105
  +++ rpm/TODO	31 Dec 2007 10:04:24 -0000	1.106
  @@ -78,6 +78,7 @@
   
     o to be resolved before RPM 5.0.0:
       - rse: NEWS polishing
  +    - afb: clean up build macros for the %macosx platforms (incl. fat/*64)
   
     RPM 5.1 ROADMAP ISSUES
     ----------------------
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.160 -r2.161 devtool.conf
  --- rpm/devtool.conf	30 Dec 2007 18:31:39 -0000	2.160
  +++ rpm/devtool.conf	31 Dec 2007 10:04:24 -0000	2.161
  @@ -1886,7 +1886,8 @@
   
       if [ ".$UNIVERSAL_SDK" != "." ]; then
       # setup architectures
  -    for ARCH in ppc i386; do
  +    for ARCH in ppc i386 ppc64 x86_64; do
  +    if [ "$ARCH" = "ppc64" -o "$ARCH" = "x86_64" ]; then BITS=-m64; else BITS=-m32; fi
       mkdir -p /tmp/rpm-root/usr/local/lib/rpm/$ARCH-darwin
       sed -e "s/^\\\\%/%/" <<__EOF__ >/tmp/rpm-root/usr/local/lib/rpm/$ARCH-darwin/macros
   # Per-platform rpm configuration file.
  @@ -1900,7 +1901,7 @@
   \%_os			darwin
   \%_gnu			%{nil}
   \%_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}
  -\%optflags		-O2
  +\%optflags		-O2 $BITS
   
   __EOF__
       done
  @@ .