diff --git a/java-atk-wrapper-source-target.patch b/java-atk-wrapper-source-target.patch new file mode 100644 index 0000000..6e26630 --- /dev/null +++ b/java-atk-wrapper-source-target.patch @@ -0,0 +1,11 @@ +--- java-atk-wrapper-0.30.4/wrapper/org/GNOME/Accessibility/Makefile.in 2010-11-10 07:18:19.000000000 +0100 ++++ java-atk-wrapper-0.30.4/wrapper/org/GNOME/Accessibility/Makefile.in 2014-05-03 14:24:13.837943365 +0200 +@@ -346,7 +346,7 @@ + < $< >$@ + + %.class : %.java +- CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) -d $(top_builddir)/wrapper $< ++ CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) -source 1.5 -target 1.5 -d $(top_builddir)/wrapper $< + + clean-local: + $(RM) *.class diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes index f893480..46c5f79 100644 --- a/java-atk-wrapper.changes +++ b/java-atk-wrapper.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat May 3 12:34:51 UTC 2014 - fstrba@suse.com + +- Added patch: + * java-atk-wrapper-source-target-patch: pass options to javac to + produce bytecode compatible with java 1.5 and higher. +- Allow to build on SLE11 + * xprop is in xorg-x11 package + ------------------------------------------------------------------- Thu Dec 12 15:26:28 UTC 2013 - mvyskocil@suse.com diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index 585c8b8..89881d9 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -1,7 +1,7 @@ # # spec file for package java-atk-wrapper # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,14 +29,24 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{major_version}/ Source1: HOWTO #PATCH-FIX-UPSTREAM: add missing includes, mvyskocil@suse.com Patch0: java-atk-wrapper-fortify-decl.patch +#PATCH: force production of bytecode version compatible with java 1.5 +Patch1: java-atk-wrapper-source-target.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: atk-devel BuildRequires: gconf2-devel BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: java-devel >= 1.6.0 -BuildRequires: xprop Requires: java >= 1.6.0 +%if 0%{?suse_version} >= 1130 +BuildRequires: xprop Requires: xprop +%else +BuildRequires: xorg-x11 +Requires: xorg-x11 +%endif %description Java ATK Wrapper is a implementation of ATK by using JNI technic. It @@ -51,6 +61,7 @@ change of underlying communication mechanism. %prep %setup -q %patch0 -p1 +%patch1 -p1 cp %{SOURCE1} . %build