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_spe
Paweł Hajdan Jr.
2014/07/25 10:51:29
There was no collision, but stable was named googl
Lei Zhang
2014/07/30 03:30:25
(General observation) I think a lot of the confusi
|
mv "$RPMBUILD_DIR/RPMS/$ARCHITECTURE/${PKGNAME}.${ARCHITECTURE}.rpm" \ |
"${OUTPUTDIR}" |
# Make sure the package is world-readable, otherwise it causes problems when |