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 13:16:12
  Branch: HEAD                             Handle: 2007122812161200

  Modified files:
    rpm                     devtool.conf

  Log:
    more fat arch tweaks, that were lost with the rpmrc

  Summary:
    Revision    Changes     Path
    2.156       +3  -0      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.155 -r2.156 devtool.conf
  --- rpm/devtool.conf	28 Dec 2007 10:09:36 -0000	2.155
  +++ rpm/devtool.conf	28 Dec 2007 12:16:12 -0000	2.156
  @@ -1881,6 +1881,7 @@
       mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/x86_64
       mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/ppc
       mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/ppc64
  +    mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/fat
   
       if [ ".$UNIVERSAL_SDK" != "." ]; then
       # setup architectures
  @@ -1904,6 +1905,8 @@
       done
       perl -pi -e "s/^\%_arch.*/\%_arch\t\t\tfat/g;s/^\%_build_arch.*/\%_build_arch\t\tfat/g" \
           /tmp/rpm-root/usr/local/lib/rpm/macros
  +    perl -pi -e "s/^(\%optflags)(\s+)(.*)/\$1\$2\$3 -arch i386 -arch ppc/g" \
  +        /tmp/rpm-root/usr/local/lib/rpm/macros
       fi
   
       # copy required popt.h library header to internal headers
  @@ .