Fix handling of icon resources in official RPM packages

chrome/installer/linux/rpm/build.sh

Index: chrome/installer/linux/rpm/build.sh
diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh
index 6597b9961c7eb23773d099e138203f0f47588619..6dcfa3ed37a2c796b772d48cc97f20484ddc2900 100755
--- a/chrome/installer/linux/rpm/build.sh
+++ b/chrome/installer/linux/rpm/build.sh
@@ -17,12 +17,12 @@ gen_spec() {
   rm -f "${SPEC}"
   # Trunk packages need to install to a custom path so they don't conflict with

[Lei Zhang, 2014/07/30 03:30:25]

This comment needs to be updated.

   # release channel packages.
-  local PACKAGE_FILENAME="${PACKAGE}"
   if [ "$CHANNEL" != "stable" ]; then
     local INSTALLDIR="${INSTALLDIR}-${CHANNEL}"
-    PACKAGE_FILENAME="${PACKAGE}-${CHANNEL}"
+    PACKAGE="${PACKAGE}-${CHANNEL}"
     local MENUNAME="${MENUNAME} (${CHANNEL})"
   fi
+  local PACKAGE_FILENAME="${PACKAGE}"
   process_template "${SCRIPTDIR}/chrome.spec.template" "${SPEC}"
 }
 
@@ -151,7 +151,7 @@ do_package() {
     --define "_binary_payload w9.bzdio" \
     --define "__os_install_post  %{nil}" \
     "${SPEC}"
-  PKGNAME="${PACKAGE}-${CHANNEL}-${VERSION}-${PACKAGE_RELEASE}"
+  PKGNAME="google-chrome-${CHANNEL}-${VERSION}-${PACKAGE_RELEASE}"
   mv "$RPMBUILD_DIR/RPMS/$ARCHITECTURE/${PKGNAME}.${ARCHITECTURE}.rpm" \
      "${OUTPUTDIR}"
   # Make sure the package is world-readable, otherwise it causes problems when