SHA256
1
0
forked from pool/quilt

Accepting request 231239 from devel:tools:scm

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/231239
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quilt?expand=0&rev=52
This commit is contained in:
Stephan Kulow 2014-04-26 04:06:21 +00:00 committed by Git OBS Bridge
commit fafbef0969
3 changed files with 38 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 17 10:49:29 CEST 2014 - jdelvare@suse.de
- setup-check-for-rpmbuild.patch: setup: Check for rpmbuild
availability (bnc#873817)
- Add recommends: rpmbuild (bnc#873817)
-------------------------------------------------------------------
Fri Mar 21 09:42:03 CET 2014 - ohering@suse.de

View File

@ -42,11 +42,13 @@ Source1: suse-start-quilt-mode.el
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 @@ http://www.zip.com.au/~akpm/linux/patches/.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build

View File

@ -0,0 +1,28 @@
From: Jean Delvare <jdelvare@suse.de>
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