Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(472)

Side by Side Diff: chrome/installer/linux/rpm/build.sh

Issue 1286743002: Revert of Linux: Depend on liberation-fonts package. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/installer/linux/debian/build.sh ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # 2 #
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # TODO(mmoss) This currently only works with official builds, since non-official 7 # TODO(mmoss) This currently only works with official builds, since non-official
8 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging. 8 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging.
9 9
10 set -e 10 set -e
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 # required. 120 # required.
121 # xdg-utils is still optional in LSB 4.0. 121 # xdg-utils is still optional in LSB 4.0.
122 # nss (bundled) is optional in LSB 4.0. 122 # nss (bundled) is optional in LSB 4.0.
123 # 123 #
124 # We want to depend on the system SSL certs so wget can upload crash reports 124 # We want to depend on the system SSL certs so wget can upload crash reports
125 # securely, but there's no common capability between the distros. Bugs filed: 125 # securely, but there's no common capability between the distros. Bugs filed:
126 # https://qa.mandriva.com/show_bug.cgi?id=55714 126 # https://qa.mandriva.com/show_bug.cgi?id=55714
127 # https://bugzilla.redhat.com/show_bug.cgi?id=538158 127 # https://bugzilla.redhat.com/show_bug.cgi?id=538158
128 # https://bugzilla.novell.com/show_bug.cgi?id=556248 128 # https://bugzilla.novell.com/show_bug.cgi?id=556248
129 DEPENDS="lsb >= 4.0, \ 129 DEPENDS="lsb >= 4.0, \
130 liberation-fonts, \
131 libcurl.so.4${EMPTY_VERSION}${PKG_ARCH}, \ 130 libcurl.so.4${EMPTY_VERSION}${PKG_ARCH}, \
132 libnss3.so(NSS_3.14.3)${PKG_ARCH}, \ 131 libnss3.so(NSS_3.14.3)${PKG_ARCH}, \
133 wget, \ 132 wget, \
134 xdg-utils, \ 133 xdg-utils, \
135 zlib, \ 134 zlib, \
136 $(echo "${DETECTED_DEPENDS}" | tr '\n' ',')" 135 $(echo "${DETECTED_DEPENDS}" | tr '\n' ',')"
137 gen_spec 136 gen_spec
138 137
139 # Create temporary rpmbuild dirs. 138 # Create temporary rpmbuild dirs.
140 RPMBUILD_DIR=$(mktemp -d -t rpmbuild.XXXXXX) || exit 1 139 RPMBUILD_DIR=$(mktemp -d -t rpmbuild.XXXXXX) || exit 1
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 ;; 299 ;;
301 * ) 300 * )
302 echo 301 echo
303 echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'." 302 echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'."
304 echo 303 echo
305 exit 1 304 exit 1
306 ;; 305 ;;
307 esac 306 esac
308 307
309 do_package 308 do_package
OLDNEW
« no previous file with comments | « chrome/installer/linux/debian/build.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698