diff --git a/.at-spi2-atk.metadata b/.at-spi2-atk.metadata index d0b3e27..5f00485 100644 --- a/.at-spi2-atk.metadata +++ b/.at-spi2-atk.metadata @@ -1 +1 @@ -73707c46ebb72867e51f9b33abb2d09bfdc4d082 SOURCES/at-spi2-atk-2.8.1.tar.xz +39fd009dae262747ba5d448a0e08dfc8fac01f80 SOURCES/at-spi2-atk-2.14.1.tar.xz diff --git a/.gitignore b/.gitignore index 6b3bce1..6543e60 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/at-spi2-atk-2.8.1.tar.xz +SOURCES/at-spi2-atk-2.14.1.tar.xz diff --git a/SOURCES/0001-Fix-atk_component_contains-wrapper.patch b/SOURCES/0001-Fix-atk_component_contains-wrapper.patch deleted file mode 100644 index 18ae9b4..0000000 --- a/SOURCES/0001-Fix-atk_component_contains-wrapper.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 00b020fe64d65e563baeb66a38411645a5955971 Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Wed, 23 Oct 2013 15:43:58 -0500 -Subject: [PATCH] Fix atk_component_contains wrapper - -The method call should be called Contains, not contains, per the D-Bus and -AT-SPI specs. - -https://bugzilla.gnome.org/show_bug.cgi?id=710730 ---- - atk-adaptor/adaptors/component-adaptor.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/atk-adaptor/adaptors/component-adaptor.c b/atk-adaptor/adaptors/component-adaptor.c -index 8187cdf..76b0f7c 100644 ---- a/atk-adaptor/adaptors/component-adaptor.c -+++ b/atk-adaptor/adaptors/component-adaptor.c -@@ -31,7 +31,7 @@ - #include "introspection.h" - - static DBusMessage * --impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data) -+impl_Contains (DBusConnection * bus, DBusMessage * message, void *user_data) - { - AtkComponent *component = (AtkComponent *) user_data; - dbus_int32_t x, y; -@@ -390,7 +390,7 @@ impl_SetSize (DBusConnection * bus, DBusMessage * message, void *user_data) - } - - static DRouteMethod methods[] = { -- {impl_contains, "contains"}, -+ {impl_Contains, "Contains"}, - {impl_GetAccessibleAtPoint, "GetAccessibleAtPoint"}, - {impl_GetExtents, "GetExtents"}, - {impl_GetPosition, "GetPosition"}, --- -1.8.3.1 - diff --git a/SPECS/at-spi2-atk.spec b/SPECS/at-spi2-atk.spec index 41f2734..89471d8 100644 --- a/SPECS/at-spi2-atk.spec +++ b/SPECS/at-spi2-atk.spec @@ -1,27 +1,28 @@ -%global at_spi2_core_version 2.7.5 +%global atk_version 2.11.90 +%global at_spi2_core_version 2.11.2 Name: at-spi2-atk -Version: 2.8.1 -Release: 4%{?dist} +Version: 2.14.1 +Release: 1%{?dist} Summary: A GTK+ module that bridges ATK to D-Bus at-spi Group: System Environment/Libraries License: LGPLv2+ URL: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus #VCS: git:git://git.gnome.org/at-spi-atk -Source0: http://download.gnome.org/sources/at-spi2-atk/2.8/%{name}-%{version}.tar.xz -Patch0: 0001-Fix-atk_component_contains-wrapper.patch +Source0: http://download.gnome.org/sources/at-spi2-atk/2.14/%{name}-%{version}.tar.xz +BuildRequires: atk-devel >= %{atk_version} BuildRequires: at-spi2-core-devel >= %{at_spi2_core_version} BuildRequires: dbus-devel BuildRequires: dbus-glib-devel BuildRequires: glib2-devel BuildRequires: libxml2-devel -BuildRequires: atk-devel BuildRequires: gtk2-devel BuildRequires: intltool -Requires: at-spi2-core >= %{at_spi2_core_version} +Requires: atk%{?_isa} >= %{atk_version} +Requires: at-spi2-core%{?_isa} >= %{at_spi2_core_version} %description at-spi allows assistive technologies to access GTK-based @@ -45,10 +46,9 @@ The %{name}-devel package includes the header files for the %{name} library. %prep %setup -q -%patch0 -p1 %build -%configure --disable-relocate +%configure sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -61,6 +61,9 @@ make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libatk-bridge.la rm $RPM_BUILD_ROOT%{_libdir}/libatk-bridge-2.0.la +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + %files %doc COPYING AUTHORS README %dir %{_libdir}/gtk-2.0 @@ -76,14 +79,79 @@ rm $RPM_BUILD_ROOT%{_libdir}/libatk-bridge-2.0.la %changelog -* Fri Jan 24 2014 Daniel Mach - 2.8.1-4 -- Mass rebuild 2014-01-24 +* Mon Oct 13 2014 Kalev Lember - 2.14.1-1 +- Update to 2.14.1 + +* Mon Sep 22 2014 Kalev Lember - 2.14.0-1 +- Update to 2.14.0 + +* Fri Aug 15 2014 Fedora Release Engineering - 2.13.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jul 20 2014 Kalev Lember - 2.13.4-1 +- Update to 2.13.4 + +* Sat Jun 07 2014 Fedora Release Engineering - 2.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Apr 29 2014 Richard Hughes - 2.13.1-1 +- Update to 2.13.1 + +* Tue Apr 15 2014 Kalev Lember - 2.12.1-1 +- Update to 2.12.1 + +* Sat Apr 05 2014 Kalev Lember - 2.12.0-2 +- Update dep versions + +* Mon Mar 24 2014 Richard Hughes - 2.12.0-1 +- Update to 2.12.0 + +* Tue Mar 18 2014 Richard Hughes - 2.11.92-1 +- Update to 2.11.92 + +* Tue Mar 04 2014 Richard Hughes - 2.11.91-1 +- Update to 2.11.91 + +* Wed Feb 19 2014 Richard Hughes - 2.11.90-1 +- Update to 2.11.90 + +* Tue Feb 04 2014 Richard Hughes - 2.11.5-1 +- Update to 2.11.5 + +* Sat Dec 21 2013 Ville Skyttä - 2.11.3-2 +- Add ldconfig %%post* scriptlets. +- Fix bogus dates in %%changelog. + +* Tue Dec 17 2013 Richard Hughes - 2.11.3-1 +- Update to 2.11.3 + +* Tue Nov 19 2013 Richard Hughes - 2.11.2-1 +- Update to 2.11.2 + +* Mon Nov 04 2013 Kalev Lember - 2.11.1-1 +- Update to 2.11.1 + +* Tue Sep 24 2013 Kalev Lember - 2.10.0-1 +- Update to 2.10.0 + +* Tue Sep 17 2013 Kalev Lember - 2.9.92-1 +- Update to 2.9.92 + +* Thu Aug 22 2013 Kalev Lember - 2.9.90-1 +- Update to 2.9.90 + +* Fri Aug 09 2013 Kalev Lember - 2.9.5-1 +- Update to 2.9.5 + +* Sat Aug 03 2013 Fedora Release Engineering - 2.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Fri Dec 27 2013 Daniel Mach - 2.8.1-3 -- Mass rebuild 2013-12-27 +* Thu Jun 20 2013 Kalev Lember - 2.9.3-1 +- Update to 2.9.3 +- Use arch-specific dep on at-spi2-core -* Wed Oct 30 2013 Rui Matos - 2.8.1-2 -- Resolves: rhbz#1024857 atspi_component_contains uses incorrect method signature +* Sun Jun 02 2013 Kalev Lember - 2.9.2-1 +- Update to 2.9.2 * Wed Apr 17 2013 Kalev Lember - 2.8.1-1 - Update to 2.8.1 @@ -213,7 +281,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/libatk-bridge-2.0.la * Mon Mar 7 2011 Matthias Clasen 1.91.91-1 - Update to 1.91.91 -* Tue Feb 21 2011 Matthias Clasen 1.91.90-1 +* Tue Feb 22 2011 Matthias Clasen 1.91.90-1 - Update to 1.91.90 * Mon Feb 07 2011 Fedora Release Engineering - 1.91.6-4 @@ -282,7 +350,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/libatk-bridge-2.0.la * Wed Feb 10 2010 Tomas Bzatek - 0.1.6-1 - Update to 0.1.6 -* Sun Jan 16 2010 Matthias Clasen - 0.1.5-1 +* Sun Jan 17 2010 Matthias Clasen - 0.1.5-1 - Update to 0.1.5 * Tue Dec 22 2009 Matthias Clasen - 0.1.4-1