Accepting request 257558 from Java:Factory

Upgrade to 0.30.5

OBS-URL: https://build.opensuse.org/request/show/257558
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-atk-wrapper?expand=0&rev=4
This commit is contained in:
Stephan Kulow 2014-10-19 17:28:08 +00:00 committed by Git OBS Bridge
parent 72391f4560
commit decf2c81fd
5 changed files with 19 additions and 26 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:24518862452a09448a6db22a40a2a533596e88fc66fcadc25d581c716b40a2d8
size 272549

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0feec305ec253ae3f84b7faa67afe8f6693e9252e417bcb069174d9f1d03afd3
size 259340

View File

@ -1,11 +0,0 @@
--- 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

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Oct 17 09:12:08 UTC 2014 - fstrba@suse.com
- Upgrade to upstream 0.30.5
- Removed patch java-atk-wrapper-source-target.patch
* No need to apply it since we can chose options for javac from
configure line
- Force source/bytecode target to 1.5 at configure time
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 3 12:34:51 UTC 2014 - fstrba@suse.com Sat May 3 12:34:51 UTC 2014 - fstrba@suse.com

View File

@ -17,29 +17,25 @@
%global major_version 0.30 %global major_version 0.30
Name: java-atk-wrapper Name: java-atk-wrapper
Version: 0.30.4 Version: 0.30.5
Release: 0 Release: 0
Summary: Java ATK Wrapper Summary: Java ATK Wrapper
License: LGPL-2.0+ License: LGPL-2.0+
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://git.gnome.org/browse/java-atk-wrapper/ Url: http://git.gnome.org/browse/java-atk-wrapper/
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{major_version}/%{name}-%{version}.tar.bz2 Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{major_version}/%{name}-%{version}.tar.xz
Source1: HOWTO Source1: HOWTO
#PATCH-FIX-UPSTREAM: add missing includes, mvyskocil@suse.com #PATCH-FIX-UPSTREAM: add missing includes, mvyskocil@suse.com
Patch0: java-atk-wrapper-fortify-decl.patch 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: atk-devel
BuildRequires: gconf2-devel BuildRequires: gconf2-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: java-devel >= 1.6.0 BuildRequires: java-devel >= 1.6.0
BuildRequires: xz
Requires: java >= 1.6.0 Requires: java >= 1.6.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1130 %if 0%{?suse_version} >= 1130
BuildRequires: xprop BuildRequires: xprop
Requires: xprop Requires: xprop
@ -61,11 +57,10 @@ change of underlying communication mechanism.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
cp %{SOURCE1} . cp %{SOURCE1} .
%build %build
%configure %configure JAVACFLAGS="-source 1.5 -target 1.5"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -77,8 +72,8 @@ make %{?_smp_mflags}
mkdir -p %{buildroot}%{_libdir}/%{name} mkdir -p %{buildroot}%{_libdir}/%{name}
mv wrapper/java-atk-wrapper.jar %{buildroot}%{_libdir}/%{name}/ mv wrapper/java-atk-wrapper.jar %{buildroot}%{_libdir}/%{name}/
mv jni/src/.libs/libatk-wrapper.so.0.0.18 %{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.18 \ ln -s %{_libdir}/%{name}/libatk-wrapper.so.0.0.13 \
%{buildroot}%{_libdir}/%{name}/libatk-wrapper.so.0 %{buildroot}%{_libdir}/%{name}/libatk-wrapper.so.0
%files %files