--- cmake-2.6.0-Linux-i386/share/cmake-2.6/Modules/CPackRPM.cmake.old	2008-05-07 15:23:08.000000000 +0200
+++ cmake-2.6.0-Linux-i386/share/cmake-2.6/Modules/CPackRPM.cmake	2008-05-07 15:34:50.000000000 +0200
@@ -68,11 +68,13 @@
 ENDIF(NOT CPACK_RPM_PACKAGE_VERSION)
 
 # CPACK_RPM_PACKAGE_ARCHITECTURE (optional)
-IF(NOT CPACK_RPM_PACKAGE_ARCHITECTURE)
-  # FIXME This should be obtained through 'arch' command
-  # but is it --really necessary-- ?
-  SET(CPACK_RPM_PACKAGE_ARCHITECTURE i386)
-ENDIF(NOT CPACK_RPM_PACKAGE_ARCHITECTURE)
+IF(CPACK_RPM_PACKAGE_ARCHITECTURE)
+  SET(CPACK_RPM_PACKAGE_BUILDARCH "Buildarch: ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+ELSE(CPACK_RPM_PACKAGE_ARCHITECTURE)
+  SET(CPACK_RPM_PACKAGE_BUILDARCH "")
+ENDIF(CPACK_RPM_PACKAGE_ARCHITECTURE)
+
+
 
 # CPACK_RPM_PACKAGE_RELEASE
 # The RPM release is the numbering of the RPM package ITSELF
@@ -177,6 +179,7 @@
 License:        ${CPACK_RPM_PACKAGE_LICENSE}
 Group:          ${CPACK_RPM_PACKAGE_GROUP}
 Vendor:         ${CPACK_RPM_PACKAGE_VENDOR}
+${CPACK_RPM_PACKAGE_BUILDARCH}
 
 #%define prefix ${CMAKE_INSTALL_PREFIX}
 %define _rpmdir ${CPACK_RPM_DIRECTORY}