diff --git a/.gitignore b/.gitignore index e231ad2..a75c6c9 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ at-spi2-atk-0.3.6.tar.bz2 /at-spi2-atk-2.5.91.tar.xz /at-spi2-atk-2.5.92.tar.xz /at-spi2-atk-2.6.0.tar.xz +/at-spi2-atk-2.6.1.tar.xz diff --git a/at-spi2-atk-noarch-schemas.patch b/at-spi2-atk-noarch-schemas.patch deleted file mode 100644 index c59027a..0000000 --- a/at-spi2-atk-noarch-schemas.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up at-spi2-atk-2.5.91/schemas/org.a11y.atspi.gschema.xml.in.noarch-schemas at-spi2-atk-2.5.91/schemas/org.a11y.atspi.gschema.xml.in ---- at-spi2-atk-2.5.91/schemas/org.a11y.atspi.gschema.xml.in.noarch-schemas 2012-09-11 12:04:31.761639484 -0400 -+++ at-spi2-atk-2.5.91/schemas/org.a11y.atspi.gschema.xml.in 2012-09-11 12:04:48.631648169 -0400 -@@ -2,7 +2,7 @@ - - - -- b'@libdir@/gtk-3.0/modules/libatk-bridge.so' -+ b'' - Atk-bridge location - The path to the atk-bridge module; useful for non-GTK applications/toolkits that want to load it. - diff --git a/at-spi2-atk.spec b/at-spi2-atk.spec index 3c27da8..cfbc27b 100644 --- a/at-spi2-atk.spec +++ b/at-spi2-atk.spec @@ -1,5 +1,5 @@ Name: at-spi2-atk -Version: 2.6.0 +Version: 2.6.1 Release: 1%{?dist} Summary: A GTK+ module that bridges ATK to D-Bus at-spi @@ -7,10 +7,7 @@ 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.5/%{name}-%{version}.tar.xz - -# temporary fix for multilib conflict, this key is going to be removed upstream -Patch0: at-spi2-atk-noarch-schemas.patch +Source0: http://download.gnome.org/sources/at-spi2-atk/2.6/%{name}-%{version}.tar.xz BuildRequires: at-spi2-core-devel BuildRequires: dbus-devel @@ -45,7 +42,6 @@ The %{name}-devel package includes the header files for the %{name} library. %prep %setup -q -%patch0 -p1 %build %configure --disable-relocate @@ -85,6 +81,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed Oct 17 2012 Kalev Lember - 2.6.1-1 +- Update to 2.6.1 +- Drop upstreamed multilib patch + * Tue Sep 25 2012 Richard Hughes - 2.6.0-1 - Update to 2.6.0 diff --git a/sources b/sources index 6fce02a..e0dacb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1597e1f88778611be18d8710ac95787d at-spi2-atk-2.6.0.tar.xz +a2abc801c92187ffe9d8f0b45fdc5ff5 at-spi2-atk-2.6.1.tar.xz