From 41897fc01725f211faab747376b581441fe3811fa31d2b68735164122e8b6969 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 6 Sep 2017 13:19:12 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=5 --- HOWTO | 2 +- java-atk-wrapper-0.30.5.tar.xz | 3 --- java-atk-wrapper-0.33.2.tar.xz | 3 +++ java-atk-wrapper-fortify-decl.patch | 29 ---------------------- java-atk-wrapper.changes | 10 ++++++++ java-atk-wrapper.spec | 37 ++++++++--------------------- manifest.txt | 2 ++ 7 files changed, 26 insertions(+), 60 deletions(-) delete mode 100644 java-atk-wrapper-0.30.5.tar.xz create mode 100644 java-atk-wrapper-0.33.2.tar.xz delete mode 100644 java-atk-wrapper-fortify-decl.patch create mode 100644 manifest.txt diff --git a/HOWTO b/HOWTO index 573ec01..7db240e 100644 --- a/HOWTO +++ b/HOWTO @@ -4,7 +4,7 @@ object and the jar into somehwere where the JRE can find it and configure the accessiblity configuration of the JRE to load this. For OpenJDK, the process looks like this: -ln -s %{_libdir}/java-atk-wrapper/libatk-wrapper.so.0 \ +ln -s %{_libdir}/java-atk-wrapper/libatk-wrapper.so.? \ /usr/lib/jvm/jre/lib/%{arch}/libatk-wrapper.so ln -s %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar \ /usr/lib/jvm/jre/lib/ext/ diff --git a/java-atk-wrapper-0.30.5.tar.xz b/java-atk-wrapper-0.30.5.tar.xz deleted file mode 100644 index c86f848..0000000 --- a/java-atk-wrapper-0.30.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0feec305ec253ae3f84b7faa67afe8f6693e9252e417bcb069174d9f1d03afd3 -size 259340 diff --git a/java-atk-wrapper-0.33.2.tar.xz b/java-atk-wrapper-0.33.2.tar.xz new file mode 100644 index 0000000..d059443 --- /dev/null +++ b/java-atk-wrapper-0.33.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8f685caed7c424babac8b158f51355c772d1e2a0b8a1ce8ced4980edae223e2 +size 293364 diff --git a/java-atk-wrapper-fortify-decl.patch b/java-atk-wrapper-fortify-decl.patch deleted file mode 100644 index 39eded2..0000000 --- a/java-atk-wrapper-fortify-decl.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- - jni/src/jawtoplevel.c | 1 + - jni/src/jawutil.c | 1 + - 2 files changed, 2 insertions(+) - -Index: java-atk-wrapper-0.30.4/jni/src/jawtoplevel.c -=================================================================== ---- java-atk-wrapper-0.30.4.orig/jni/src/jawtoplevel.c -+++ java-atk-wrapper-0.30.4/jni/src/jawtoplevel.c -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - #include "jawtoplevel.h" - -Index: java-atk-wrapper-0.30.4/jni/src/jawutil.c -=================================================================== ---- java-atk-wrapper-0.30.4.orig/jni/src/jawutil.c -+++ java-atk-wrapper-0.30.4/jni/src/jawutil.c -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - #include "jawutil.h" - #include "jawtoplevel.h" diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes index 7154729..ba037df 100644 --- a/java-atk-wrapper.changes +++ b/java-atk-wrapper.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Sep 6 13:12:32 UTC 2017 - fstrba@suse.com + +- Upgrade to upsteam 0.33.2 +- Removed patch: + * java-atk-wrapper-fortify-decl.patch + + Integrated upsteam +- Add manifest.txt missing from the tarball +- Force source/bytecode target to 1.7. + ------------------------------------------------------------------- Fri Oct 17 09:12:08 UTC 2014 - fstrba@suse.com diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index 4ac31bf..99911eb 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -1,7 +1,7 @@ # # spec file for package java-atk-wrapper # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -16,9 +16,9 @@ # -%global major_version 0.30 +%global major_version 0.33 Name: java-atk-wrapper -Version: 0.30.5 +Version: 0.33.2 Release: 0 Summary: Java ATK Wrapper License: LGPL-2.0+ @@ -26,23 +26,16 @@ Group: Development/Libraries/Java Url: http://git.gnome.org/browse/java-atk-wrapper/ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{major_version}/%{name}-%{version}.tar.xz Source1: HOWTO -#PATCH-FIX-UPSTREAM: add missing includes, mvyskocil@suse.com -Patch0: java-atk-wrapper-fortify-decl.patch +Source2: manifest.txt BuildRequires: atk-devel BuildRequires: gconf2-devel BuildRequires: glib2-devel BuildRequires: gtk2-devel -BuildRequires: java-devel >= 1.6.0 +BuildRequires: java-devel >= 1.7.0 BuildRequires: xz -Requires: java >= 1.6.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1130 +Requires: java >= 1.7.0 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 @@ -56,28 +49,18 @@ change of underlying communication mechanism. %prep %setup -q -%patch0 -p1 cp %{SOURCE1} . +cp %{SOURCE2} wrapper/ %build -%configure JAVACFLAGS="-source 1.5 -target 1.5" +%configure JAVACFLAGS="-source 1.7 -target 1.7" --libdir=%{_libdir}/%{name} make %{?_smp_mflags} %install -# java-atk-wrapper's make install is broken by design -# it installs to the current JDK_HOME. We want to install it to a central -# location and then allow all/any JRE's/JDK's to use it. -# make install DESTDIR=$RPM_BUILD_ROOT - -mkdir -p %{buildroot}%{_libdir}/%{name} - -mv wrapper/java-atk-wrapper.jar %{buildroot}%{_libdir}/%{name}/ -mv jni/src/.libs/libatk-wrapper.so.0.0.13 %{buildroot}%{_libdir}/%{name}/ -ln -s %{_libdir}/%{name}/libatk-wrapper.so.0.0.13 \ - %{buildroot}%{_libdir}/%{name}/libatk-wrapper.so.0 +make -C jni install DESTDIR=%{buildroot} +install wrapper/java-atk-wrapper.jar %{buildroot}%{_libdir}/%{name}/ %files -%defattr(-,root,root,-) %doc AUTHORS %doc COPYING.LESSER %doc NEWS diff --git a/manifest.txt b/manifest.txt new file mode 100644 index 0000000..6fc2a91 --- /dev/null +++ b/manifest.txt @@ -0,0 +1,2 @@ +Main-Class: org.GNOME.Accessibility.AtkWrapper +