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..f3f27003b5b0f13cfad11fcdac818e54256f5e7d 100755
--- a/chrome/installer/linux/rpm/build.sh
+++ b/chrome/installer/linux/rpm/build.sh
@@ -21,6 +21,7 @@ gen_spec() {
   if [ "$CHANNEL" != "stable" ]; then
     local INSTALLDIR="${INSTALLDIR}-${CHANNEL}"
     PACKAGE_FILENAME="${PACKAGE}-${CHANNEL}"
+    PACKAGE="${PACKAGE}-${CHANNEL}"
     local MENUNAME="${MENUNAME} (${CHANNEL})"
   fi
   process_template "${SCRIPTDIR}/chrome.spec.template" "${SPEC}"
@@ -151,7 +152,7 @@ do_package() {
     --define "_binary_payload w9.bzdio" \
     --define "__os_install_post  %{nil}" \
     "${SPEC}"
-  PKGNAME="${PACKAGE}-${CHANNEL}-${VERSION}-${PACKAGE_RELEASE}"
+  PKGNAME="${PACKAGE}-${VERSION}-${PACKAGE_RELEASE}"

[Lei Zhang, 2014/07/24 19:25:58]

Based on the gen_spec() changes above, and gen_spec() being called on line 139,
$PACKAGE should be "google-chrome" here, right? Wouldn't the change on this line
cause stable/beta/dev channel builds to all be named google-chrome-1.2.3.4-1.rpm
?

[Paweł Hajdan Jr., 2014/07/25 10:51:29]

There was no collision, but stable was named google-chrome instead of
google-chrome-stable.

I fixed that. This hardcodes google-chrome, but we don't really use anything
different anyway.

Eventually I'd like to rewrite this in python instead of bash for better
maintainability.

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

(General observation) I think a lot of the confusion comes from statements like:

PACKAGE="${PACKAGE}-${CHANNEL}"

So at any point in the program, it is not obvious what $PACKAGE is really
referring to.

I think what we should do is to not change $PACKAGE, but instead, create a
$PACKAGE_CHANNEL variable and use that where appropriate.

You probably have to fix the debian side as while you are at it, but that should
also fix bug 354571.

   mv "$RPMBUILD_DIR/RPMS/$ARCHITECTURE/${PKGNAME}.${ARCHITECTURE}.rpm" \
      "${OUTPUTDIR}"
   # Make sure the package is world-readable, otherwise it causes problems when