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

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

Issue 1380473002: Revert of Linux: Depend on liberation-fonts package for RPMs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | « no previous file | 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 # libcairo, libpangocairo, libasound are in LSB 4. and no longer explicitly 119 # libcairo, libpangocairo, libasound are in LSB 4. and no longer explicitly
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 #
130 # We want to depend on liberation-fonts as well, but there is no such package
131 # for Fedora. https://bugzilla.redhat.com/show_bug.cgi?id=1252564
129 DEPENDS="lsb >= 4.0, \ 132 DEPENDS="lsb >= 4.0, \
130 libcurl.so.4${EMPTY_VERSION}${PKG_ARCH}, \ 133 libcurl.so.4${EMPTY_VERSION}${PKG_ARCH}, \
131 liberation-fonts, \
132 libnss3.so(NSS_3.14.3)${PKG_ARCH}, \ 134 libnss3.so(NSS_3.14.3)${PKG_ARCH}, \
133 wget, \ 135 wget, \
134 xdg-utils, \ 136 xdg-utils, \
135 zlib, \ 137 zlib, \
136 $(echo "${DETECTED_DEPENDS}" | tr '\n' ',')" 138 $(echo "${DETECTED_DEPENDS}" | tr '\n' ',')"
137 gen_spec 139 gen_spec
138 140
139 # Create temporary rpmbuild dirs. 141 # Create temporary rpmbuild dirs.
140 RPMBUILD_DIR=$(mktemp -d -t rpmbuild.XXXXXX) || exit 1 142 RPMBUILD_DIR=$(mktemp -d -t rpmbuild.XXXXXX) || exit 1
141 mkdir -p "$RPMBUILD_DIR/BUILD" 143 mkdir -p "$RPMBUILD_DIR/BUILD"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 ;; 306 ;;
305 * ) 307 * )
306 echo 308 echo
307 echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'." 309 echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'."
308 echo 310 echo
309 exit 1 311 exit 1
310 ;; 312 ;;
311 esac 313 esac
312 314
313 do_package 315 do_package
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698