From e93d356a15a23632b7b18bfaae9eb5cff43ae015 Mon Sep 17 00:00:00 2001 From: "tomas.popela" Date: Mon, 2 Nov 2015 17:34:02 -0800 Subject: Fix the RPM SPEC files for beta and unstable packages Before this change the beta and unstable rpm packages were without an icon as both were correctly specifying the correct name in desktop file (Icon=google-chrome-beta resp. Icon=google-chrome-unstable) but icon with that name was never installed. As a consequence installing the Chrome stable and beta rpm packages and later removing the beta package would remove the icon and left the stable installation without any (as both were using the same name without channel: google-chrome). To fix the issue we need to define the PACKAGE variable in rpm/build.sh the same way as in debian/build.sh so when we start to process the postinst.include template (that is included from chrome.spec.template) the PACKAGE variables is replaced with correct value (google-chrome for stable otherwise google-chrome-beta or google-chrome-unstable) on not just google-chrome for all channels as previously. Also replace the PACKAGE_FILENAME usages in rpm/chrome.spec.template with PACKAGE when it finally contains the right value and use the PACKAGE_FILENAME just to specify the package name (where the channel is suffixed in the name even for the stable channel). BUG=529008 Review URL: https://codereview.chromium.org/1416053008 Cr-Commit-Position: refs/heads/master@{#357505} --- AUTHORS | 1 + 1 file changed, 1 insertion(+) (limited to 'AUTHORS') diff --git a/AUTHORS b/AUTHORS index afbb3aa..28d2719 100644 --- a/AUTHORS +++ b/AUTHORS @@ -574,6 +574,7 @@ Tiago Vignatti Tim Ansell Timo Reimann Torsten Kurbad +Tomas Popela Trevor Perrin U. Artie Eoff Umar Hansa -- cgit v1.1