1
0

Accepting request 198616 from Java:packages

- depgen.patch: drain stdin in dependency generator (forwarded request 198563 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/198616
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javapackages-tools?expand=0&rev=4
This commit is contained in:
Tomáš Chvátal 2013-09-12 16:08:41 +00:00 committed by Git OBS Bridge
commit d99546c87d
3 changed files with 17 additions and 0 deletions

9
depgen.patch Normal file
View File

@ -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

View File

@ -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

View File

@ -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}