Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2014-04-26 06:06:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quilt" Changes: -------- --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2014-03-25 13:27:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2014-04-26 06:06:22.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 17 10:49:29 CEST 2014 - [email protected] + +- setup-check-for-rpmbuild.patch: setup: Check for rpmbuild + availability (bnc#873817) +- Add recommends: rpmbuild (bnc#873817) + +------------------------------------------------------------------- New: ---- setup-check-for-rpmbuild.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.NKjGEb/_old 2014-04-26 06:06:22.000000000 +0200 +++ /var/tmp/diff_new_pack.NKjGEb/_new 2014-04-26 06:06:22.000000000 +0200 @@ -42,11 +42,13 @@ Patch1: expand.diff Patch2: quilt-support-vimdiff.patch Patch3: patch-wrapper-rpm.diff +Patch4: setup-check-for-rpmbuild.patch Patch5: suse-workaround-pseudo-release.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Recommends: procmail Recommends: bzip2 +Recommends: /usr/bin/rpmbuild %if 0%{?suse_version} > 1120 Recommends: xz %endif @@ -64,6 +66,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch5 -p1 %build ++++++ setup-check-for-rpmbuild.patch ++++++ From: Jean Delvare <[email protected]> Subject: setup: Check for rpmbuild availability References: bnc#873817 Upstream: Not yet submitted Before running inspect on a spec file, verify that rpmbuild is available. Print a user-friendly error message if not. --- quilt/setup.in | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/quilt/setup.in +++ b/quilt/setup.in @@ -167,6 +167,14 @@ case "$1" in *.spec) spec_file=$1 + # check if rpmbuild is installed before running inspect + if ! type rpmbuild &> /dev/null + then + echo $"You have to install '%s' (from package %s) to use 'quilt %s'\n" \ + rpmbuild rpm-build setup >&2 + exit 1 + fi + if ! $QUILT_DIR/scripts/inspect $verbose $opt_sourcedir $opt_fuzz \ "$spec_file" 2>&1 > $tmpfile then -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
