summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-07-09 12:46:37 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-07-09 12:53:42 +0200
commit2b62198dfcfd3fe738382207235a68cdc9b40d30 (patch)
tree3c25fd2f0deef1c16f1c566191e9147023000b89
parent13cddb12ff8c7357a2c8e54d603b840ce7b29737 (diff)
Fix EPMs deb Depends syntax
...that it is broken at least in our bundled EPM 3.7 became evident with d07cbe86f34ca6dfc6580b63879235c339831a5e "fdo#65541: Proper EPM %requires dependencies, at least for Linux" failing for --with-package-format=deb now. I cannot verify whether this is a known/fixed problem in upstream EPM (which is at version 4.2 by now), as the download links at <http://freecode.com/projects/epm> point at a (temporarily, at least) unavailable ftp.easysw.com server. Change-Id: Idad1cdfc55d870200ccb24ea94a2fe7c0ed2c9e8
-rw-r--r--epm/epm-3.7.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/epm/epm-3.7.patch b/epm/epm-3.7.patch
index 02835bc3e5ce..869c141a7155 100644
--- a/epm/epm-3.7.patch
+++ b/epm/epm-3.7.patch
@@ -260,6 +260,15 @@ diff -urN epm-3.7-old//deb.c epm-3.7/deb.c
else
fprintf(fp, "Architecture: %s\n", platform->machine);
+@@ -139,7 +192,7 @@
+ else
+ {
+ if (d->vernumber[1] < INT_MAX)
+- fprintf(fp, " (>= %s, <= %s)", d->version[0], d->version[1]);
++ fprintf(fp, " (>= %s), %s (<= %s)", d->version[0], d->product, d->version[1]);
+ else
+ fprintf(fp, " (>= %s)", d->version[0]);
+ }
@@ -148,9 +193,9 @@
putc('\n', fp);
}