From 7a8f9d02447274138d7df9fdae84db79399c5dfcca8e92efc968edb697e09e2c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 13 Oct 2017 06:07:03 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=12 --- autogen.sh | 38 ++++++++++++++++++++++++++++++++++++++ java-atk-wrapper.spec | 13 ++++++++----- 2 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 autogen.sh diff --git a/autogen.sh b/autogen.sh new file mode 100644 index 0000000..3faf898 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. + +olddir=`pwd` +cd "$srcdir" + +mkdir -p m4 + +AUTORECONF=`which autoreconf` +if test -z ${AUTORECONF}; then + echo "*** No autoreconf found, please intall it ***" + exit 1 +else + autoreconf -vif || exit $? +fi + +PKGCONFIG=`which pkg-config` +if test -z "$PKGCONFIG"; then + echo "*** pkg-config not found, please install it ***" + exit 1 +fi + +pkg-config --print-errors gobject-introspection-1.0 +if [ "$?" != 0 ]; then + echo "You probably need to install 'libgirepository1.0-dev'" + exit 1 +fi + +# README and INSTALL are required by automake, but may be deleted by clean +# up rules. to get automake to work, simply touch these here, they will be +# regenerated from their corresponding *.in files by ./configure anyway. +touch README INSTALL + +cd "$olddir" +test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index cb36824..d03a7dd 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -26,12 +26,13 @@ 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 -Source2: manifest.txt +Source2: https://git.gnome.org/browse/java-atk-wrapper/plain/wrapper/manifest.txt +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 BuildRequires: autoconf BuildRequires: automake -BuildRequires: java-devel >= 1.7.0 +BuildRequires: java-devel >= 1.7 BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: xprop @@ -44,8 +45,9 @@ BuildRequires: pkgconfig(gdk-2.0) BuildRequires: pkgconfig(gdk-3.0) BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gthread-2.0) -Requires: java >= 1.7.0 +Requires: java >= 1.7 Requires: xprop %description @@ -63,10 +65,11 @@ change of underlying communication mechanism. %patch0 -p1 cp %{SOURCE1} . cp %{SOURCE2} wrapper/ +cp %{SOURCE3} . %build -libtoolize --force --copy --install -autoreconf -fi +chmod +x autogen.sh +./autogen.sh %configure JAVACFLAGS="-source 1.7 -target 1.7" --libdir=%{_libdir}/%{name} make %{?_smp_mflags} From 059b820a6297fa4976ad2c4d7f7c123f409b6c5436878e23b5daf7d528ed68ff Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 13 Oct 2017 06:22:42 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=13 --- java-atk-wrapper.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index d03a7dd..4a811a4 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -70,7 +70,13 @@ cp %{SOURCE3} . %build chmod +x autogen.sh ./autogen.sh -%configure JAVACFLAGS="-source 1.7 -target 1.7" --libdir=%{_libdir}/%{name} +%configure \ + JAVACFLAGS="-source 1.7 -target 1.7" \ + JDK_SRC=/etc/alternatives/java_sdk \ + JAVA_HOME=/etc/alternatives/jre \ + --libdir=%{_libdir}/%{name} \ + --without-jdk-auto-detect \ + make %{?_smp_mflags} %install From f7592a42785974121781153922124100133747d5aca317fef0ea37770de20e29 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 13 Oct 2017 06:26:38 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=14 --- java-atk-wrapper.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index 4a811a4..d03a7dd 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -70,13 +70,7 @@ cp %{SOURCE3} . %build chmod +x autogen.sh ./autogen.sh -%configure \ - JAVACFLAGS="-source 1.7 -target 1.7" \ - JDK_SRC=/etc/alternatives/java_sdk \ - JAVA_HOME=/etc/alternatives/jre \ - --libdir=%{_libdir}/%{name} \ - --without-jdk-auto-detect \ - +%configure JAVACFLAGS="-source 1.7 -target 1.7" --libdir=%{_libdir}/%{name} make %{?_smp_mflags} %install From 6125483fdbc1c27519fb5dd53ad817939e6a9cabae800014748007eef05c6fa7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 24 Oct 2017 13:29:50 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=15 --- java-atk-wrapper.changes | 8 ++++++++ java-atk-wrapper.spec | 2 ++ jaw-generate-atkwrapper_java.patch | 10 ++++++++++ 3 files changed, 20 insertions(+) create mode 100644 jaw-generate-atkwrapper_java.patch diff --git a/java-atk-wrapper.changes b/java-atk-wrapper.changes index 43f534b..1894f7a 100644 --- a/java-atk-wrapper.changes +++ b/java-atk-wrapper.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Tue Oct 10 16:35:27 UTC 2017 - fstrba@suse.com diff --git a/java-atk-wrapper.spec b/java-atk-wrapper.spec index d03a7dd..64f3e43 100644 --- a/java-atk-wrapper.spec +++ b/java-atk-wrapper.spec @@ -30,6 +30,7 @@ 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 @@ -63,6 +64,7 @@ change of underlying communication mechanism. %prep %setup -q %patch0 -p1 +%patch1 -p1 cp %{SOURCE1} . cp %{SOURCE2} wrapper/ cp %{SOURCE3} . diff --git a/jaw-generate-atkwrapper_java.patch b/jaw-generate-atkwrapper_java.patch new file mode 100644 index 0000000..3eed49c --- /dev/null +++ b/jaw-generate-atkwrapper_java.patch @@ -0,0 +1,10 @@ +--- 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 + From 06ab7d516987f0257fd3a2f334e48990a1e3565f332331fe1581927a8a75e0db Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 26 Oct 2017 07:31:11 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-atk-wrapper?expand=0&rev=16 --- java-atk-wrapper.changes | 7 +++---- java-atk-wrapper.spec | 3 +-- jaw-generate-atkwrapper_java.patch | 10 ---------- 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 jaw-generate-atkwrapper_java.patch 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 -