From 83aa0f44b0ffd853a65e43fbf6856a7b4467f987fcfab94e183daf062b313579 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 Jan 2018 17:36:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=26 --- java-atk-wrapper.changes | 8 ++++++++ java-atk-wrapper.spec | 4 +++- jaw-javah.patch | 15 +++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 jaw-javah.patch diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes index ef37e7d..24881b3 100644 --- a/java-atk-wrapper.changes +++ b/java-atk-wrapper.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 2 17:35:32 UTC 2018 - fstrba@suse.com + +- Added patch: + * jaw-javah.patch + + Do not search for javah, since it is not needed during the + build + ------------------------------------------------------------------- Wed Nov 8 08:54:50 UTC 2017 - fstrba@suse.com diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index ce91b45..c541aa9 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -1,7 +1,7 @@ # # spec file for package java-atk-wrapper # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,7 @@ Patch0: jaw-avoid-version.patch Patch1: jaw-java_required.patch Patch2: jaw-quotes.patch Patch3: jaw-gdk.patch +Patch4: jaw-javah.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: java-devel >= 1.7 @@ -68,6 +69,7 @@ change of underlying communication mechanism. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE1} . cp %{SOURCE2} wrapper/ cp %{SOURCE3} . diff --git a/jaw-javah.patch b/jaw-javah.patch new file mode 100644 index 0000000..8a593f2 --- /dev/null +++ b/jaw-javah.patch @@ -0,0 +1,15 @@ +--- java-atk-wrapper-0.33.2/configure.ac 2018-01-02 18:30:15.178317330 +0100 ++++ java-atk-wrapper-0.33.2/configure.ac 2018-01-02 18:31:01.643499937 +0100 +@@ -90,12 +90,6 @@ + fi + AC_SUBST(JAVAC) + +-AC_PATH_PROG(JAVAH,javah,,${JAVA_PATH}) +-if test -z "$JAVAH"; then +- AC_MSG_ERROR([$JAVA_ERROR_MESSAGE]) +-fi +-AC_SUBST(JAVAH) +- + AC_SUBST(JAVACFLAGS) + + AC_PATH_PROG(JAR,jar,,${JAVA_PATH})