Fix handling of icon resources in official RPM packages

chrome/installer/linux/rpm/build.sh

 #!/bin/bash
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # TODO(mmoss) This currently only works with official builds, since non-official
 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging.
 
 set -e
 if [ "$VERBOSE" ]; then
   set -x
 fi
 set -u
 
 gen_spec() {
   rm -f "${SPEC}"
   # Trunk packages need to install to a custom path so they don't conflict with
   # release channel packages.
   local PACKAGE_FILENAME="${PACKAGE}"

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

If you move this down to after the if block, then you can omit line 23.

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

Done.

   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}"
 }
 
 # Setup the installation directory hierachy in the package staging area.
 prep_staging_rpm() {
   prep_staging_common
   install -m 755 -d "${STAGEDIR}/etc/cron.daily"
 }
@@ skipping 110 matching lines @@
 
   # '__os_install_post ${nil}' disables a bunch of automatic post-processing
   # (brp-compress, etc.), which by default appears to only be enabled on 32-bit,
   # and which doesn't gain us anything since we already explicitly do all the
   # compression, symbol stripping, etc. that we want.
   fakeroot rpmbuild -bb --target="$ARCHITECTURE" --rmspec \
     --define "_topdir $RPMBUILD_DIR" \
     --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
   # copied to share drive.
   chmod a+r "${OUTPUTDIR}/${PKGNAME}.$ARCHITECTURE.rpm"
   rm -rf "$RPMBUILD_DIR"
 }
 
 # Remove temporary files and unwanted packaging output.
 cleanup() {
@@ skipping 137 matching lines @@
     ;;
   * )
     echo
     echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'."
     echo
     exit 1
     ;;
 esac
 
 do_package