Fridrich Strba 2020-12-11 08:38:11 +00:00 committed by Git OBS Bridge
parent ceccf86840
commit d933cc5116
2 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 11 08:36:20 UTC 2020 - Fridrich Strba <fstrba@suse.com>
- Do not build as modular jar, since it is only used by Java 8
- Force building with Java 8 in order to avoid incompatible classes
merged into our different modular Javas.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 9 08:08:22 UTC 2020 - Fridrich Strba <fstrba@suse.com> Mon Nov 9 08:08:22 UTC 2020 - Fridrich Strba <fstrba@suse.com>

View File

@ -29,7 +29,7 @@ Source1: HOWTO
Source2: https://gitlab.gnome.org/GNOME/%{name}/-/raw/%{version}/autogen.sh Source2: https://gitlab.gnome.org/GNOME/%{name}/-/raw/%{version}/autogen.sh
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: java-devel >= 1.7 BuildRequires: java-devel >= 1.8
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xprop BuildRequires: xprop
@ -43,7 +43,8 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gthread-2.0)
Requires: java >= 1.7 BuildConflicts: java-devel >= 9
Requires: java >= 1.8
Requires: xprop Requires: xprop
%description %description
@ -64,8 +65,8 @@ rm -f wrapper/org/GNOME/Accessibility/AtkWrapper.java
%build %build
chmod +x autogen.sh chmod +x autogen.sh
./autogen.sh ./autogen.sh
%configure --libdir=%{_libdir}/%{name} %configure --libdir=%{_libdir}/%{name} --disable-modular-jar JAVACFLAGS="-source 8 -target 8"
make %{?_smp_mflags} make %{?_smp_mflags} -j1
%install %install
make -C jni install DESTDIR=%{buildroot} make -C jni install DESTDIR=%{buildroot}