From 863dfd1f8ee3907ec09955d118b43634dca3ceeab781f221c4254e762236f988 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 1 Dec 2011 15:35:25 +0000 Subject: [PATCH] - suse-workaround-pseudo-release.patch: Filter invalid characters in release field (bnc#628258). OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=36 --- quilt.changes | 6 ++++++ quilt.spec | 3 ++- suse-workaround-pseudo-release.patch | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 suse-workaround-pseudo-release.patch diff --git a/quilt.changes b/quilt.changes index 42cf42f..2f85649 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 1 16:23:20 CET 2011 - jdelvare@suse.de + +- suse-workaround-pseudo-release.patch: Filter invalid characters + in release field (bnc#628258). + ------------------------------------------------------------------- Thu Nov 10 21:00:07 CET 2011 - jdelvare@suse.de diff --git a/quilt.spec b/quilt.spec index e179306..ecd4616 100644 --- a/quilt.spec +++ b/quilt.spec @@ -49,6 +49,7 @@ Patch14: completion-revert.patch Patch15: inspect-shell-syntax-errors.patch Patch16: grep-support-spaces.patch Patch17: mail-fix-a-temporary-directory-leak.patch +Patch18: suse-workaround-pseudo-release.patch Url: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,7 +69,7 @@ Authors: %prep %setup -q -%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 +%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 %build autoconf diff --git a/suse-workaround-pseudo-release.patch b/suse-workaround-pseudo-release.patch new file mode 100644 index 0000000..a54f50b --- /dev/null +++ b/suse-workaround-pseudo-release.patch @@ -0,0 +1,23 @@ +Upstream: Never + +Old Suse spec files have a pseudo release string which uses characters +newer versions of rpmbuild don't like. Filter them out to make rpmbuild +happy again. Packages in openSUSE 11.4 and later no longer need this. + +--- quilt-0.48.orig/quilt/scripts/inspect.in ++++ quilt-0.48/quilt/scripts/inspect.in +@@ -67,6 +67,14 @@ trap "rm -rf $tmpdir" EXIT + mkdir -p $tmpdir/build + mkdir -p $tmpdir/bin + ++# Older versions of Suse packages have a symbolic release number, and rpmbuild ++# won't like that, so change it to something compliant. ++if grep -q '^Release:.*[<>]' "$specdir/$specfile" ++then ++ sed -e '/^Release:/s/[<>]//g' < "$specdir/$specfile" > $tmpdir/"$specfile" ++ specdir=$tmpdir ++fi ++ + # Redirect file descriptors + if [ -n "$verbose" ] + then