diff --git a/depgen.patch b/depgen.patch new file mode 100644 index 0000000..9f6ec1d --- /dev/null +++ b/depgen.patch @@ -0,0 +1,9 @@ +Index: javapackages-2.0.1/depgenerators/javadoc.req +=================================================================== +--- javapackages-2.0.1.orig/depgenerators/javadoc.req ++++ javapackages-2.0.1/depgenerators/javadoc.req +@@ -1,3 +1,4 @@ + #!/bin/sh ++cat >/dev/null + # always required for javadocs + echo jpackage-utils diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 0d3b7d7..7dede6a 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 11 15:50:05 UTC 2013 - schwab@suse.de + +- depgen.patch: drain stdin in dependency generator + ------------------------------------------------------------------- Wed Aug 21 07:56:17 UTC 2013 - mvyskocil@suse.com diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 6881d52..83ff083 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -32,6 +32,8 @@ Source0: https://fedorahosted.org/released/javapackages/javapackages-%{ve #PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64 on 64bits # where Fedora use jpackage convention - usr/lib everywhere Patch0: suse-use-libdir.patch +# PATCH-FIX-UPSTREAM Drain stdin in dependency generator +Patch1: depgen.patch #BuildArch: noarch BuildRequires: asciidoc @@ -94,6 +96,7 @@ This package provides macros and scripts to support packaging Maven artifacts. %prep %setup -q -n javapackages-%{version} %patch0 -p1 +%patch1 -p1 %build %{configure}