From 65408574275c54d52ddeaaca970800170f618bf4256652ee3f4b0d89ceb47ca2 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 27 Oct 2008 23:35:34 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quilt?expand=0&rev=19 --- quilt-improve-formail-error.diff | 31 +++++++++++++++++++++++++++++++ quilt.changes | 6 ++++++ quilt.spec | 17 +++++++++++------ 3 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 quilt-improve-formail-error.diff diff --git a/quilt-improve-formail-error.diff b/quilt-improve-formail-error.diff new file mode 100644 index 0000000..8fef38c --- /dev/null +++ b/quilt-improve-formail-error.diff @@ -0,0 +1,31 @@ +From: Bernhard Walle +Subject: [PATCH] Check for 'formail' in 'quilt mail' + +To allow using 'procmail' (which contains 'formail') as weak dependency in +package managers, explicitely check for the 'formail' binary when invoking +'quilt mail' so that the user gets a clear error message when 'formail' +is missing and knows what to do. + + +Signed-off-by: Bernhard Walle + +--- + quilt/mail.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/quilt/mail.in ++++ b/quilt/mail.in +@@ -232,6 +232,13 @@ then + usage + fi + ++# check if formail is installed before doing anything ++if ! which formail &> /dev/null ++then ++ echo "You have to install 'formail' to use 'quilt mail'" >&2 ++ exit 1 ++fi ++ + if [ $# -ge 1 ] + then + if [ "$1" = - ] diff --git a/quilt.changes b/quilt.changes index 658fa41..f2a3619 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 27 22:36:14 CET 2008 - bwalle@suse.de + +- Only recommend 'procmail' (contains the 'formail' binary) instead + of requiring it. It's only needed for the 'mail' command. + ------------------------------------------------------------------- Thu Aug 21 15:18:12 CEST 2008 - bwalle@suse.de diff --git a/quilt.spec b/quilt.spec index 76b058a..3bfb37a 100644 --- a/quilt.spec +++ b/quilt.spec @@ -24,8 +24,9 @@ Summary: A Tool for Working with Many Patches License: GPL v2 or later Group: Productivity/Text/Utilities Version: 0.47 -Release: 1 -Requires: coreutils diffutils patch gzip bzip2 perl mktemp diffstat procmail +Release: 12 +Requires: coreutils diffutils patch gzip bzip2 perl mktemp diffstat +Recommends: procmail AutoReqProv: off Source: %{name}-%{version}.tar.bz2 Source1: suse-start-quilt-mode.el @@ -33,7 +34,8 @@ Recommends: bash-completion Patch1: expand.diff Patch2: docdir.diff Patch3: patch-wrapper-rpm.diff -Patch4: quilt-fix-completion.diff +Patch4: %{name}-fix-completion.diff +Patch5: %{name}-improve-formail-error.diff Url: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,7 +55,7 @@ Authors: %prep %setup -q -%patch -p1 -P 1 -P 2 -P 3 -P 4 +%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 %build autoconf @@ -117,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/quilt.pdf %changelog +* Mon Oct 27 2008 bwalle@suse.de +- Only recommend 'procmail' (contains the 'formail' binary) instead + of requiring it. It's only needed for the 'mail' command. * Thu Aug 21 2008 bwalle@suse.de - update to 0.47 o quilt/scripts/patchfns.in (cat_series): Handle lines properly @@ -373,7 +378,7 @@ rm -rf $RPM_BUILD_ROOT - Re-add diffstat support to refresh command. - Documentation update. - Bump version to 0.35. -* Fri Jun 11 2004 agruen@suse.de +* Thu Jun 10 2004 agruen@suse.de - Add meta-data version check/upgrade code from Martin Quinson and me; new `quilt upgrade' command. - Handle new/removed files correctly in generated patches: If the @@ -416,7 +421,7 @@ rm -rf $RPM_BUILD_ROOT of Holger Schurig's patcher tool, http://www.holgerschurig.de/patcher.html. - Update German translation. -* Wed Jun 02 2004 agruen@suse.de +* Tue Jun 01 2004 agruen@suse.de - Fix from Dean Roehrich : Preserve file mode of original file when creating backup files. * Tue Jun 01 2004 mquinson@tuxfamily.org