diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes index 1894f7a..8e5578a 100644 --- a/java-atk-wrapper.changes +++ b/java-atk-wrapper.changes @@ -1,10 +1,9 @@ ------------------------------------------------------------------- Tue Oct 24 13:28:45 UTC 2017 - fstrba@suse.com -- Added patch: - * jaw-generate-atkwrapper_java.patch - - Generate AtkWrapper.java from AtkWrapper.java.in in order to - have the right path to xprops +- Remove the distributed AtkWrapper.java file before building, + so that a correct version with the correct path to xprops can be + generated during the build from AtkWrapper.java.in ------------------------------------------------------------------- Tue Oct 10 16:35:27 UTC 2017 - fstrba@suse.com diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index 64f3e43..b6672e2 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -30,7 +30,6 @@ Source2: https://git.gnome.org/browse/java-atk-wrapper/plain/wrapper/mani Source3: https://git.gnome.org/browse/java-atk-wrapper/plain/autogen.sh # Avoid libtool versioning; this library is dynamically loaded from Java code Patch0: jaw-avoid-version.patch -Patch1: jaw-generate-atkwrapper_java.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: java-devel >= 1.7 @@ -64,10 +63,10 @@ change of underlying communication mechanism. %prep %setup -q %patch0 -p1 -%patch1 -p1 cp %{SOURCE1} . cp %{SOURCE2} wrapper/ cp %{SOURCE3} . +rm -f wrapper/org/GNOME/Accessibility/AtkWrapper.java %build chmod +x autogen.sh diff --git a/jaw-generate-atkwrapper_java.patch b/jaw-generate-atkwrapper_java.patch deleted file mode 100644 index 3eed49c..0000000 --- a/jaw-generate-atkwrapper_java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- java-atk-wrapper-0.33.2/configure.ac 2015-07-07 13:52:28.000000000 +0200 -+++ java-atk-wrapper-0.33.2/configure.ac 2017-10-24 15:22:21.894790530 +0200 -@@ -169,6 +169,7 @@ - wrapper/org/Makefile - wrapper/org/GNOME/Makefile - wrapper/org/GNOME/Accessibility/Makefile -+ wrapper/org/GNOME/Accessibility/AtkWrapper.java - ]) - AC_OUTPUT -