- updated to 1.22.0; merged changes from DEVEL

Changed files:
    at-spi.spec -> 1.77

diff --git a/at-spi.spec b/at-spi.spec
index 6772fbe76483f1a35474042154da2d96ef1958b9..a45b9526df208a2b8b9bd7a8fe563202d2bf24b3 100644 (file)
--- a/at-spi.spec
+++ b/at-spi.spec
@@ -5,20 +5,21 @@
 Summary:       Assistive Technology Service Provider Interface
 Summary(pl.UTF-8):     Interfejs pozwalający na korzystanie z urządzeń wspomagających
 Name:          at-spi
-Version:       1.20.1
-Release:       2
+Version:       1.22.0
+Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/at-spi/1.20/%{name}-%{version}.tar.bz2
-# Source0-md5: 9dc4ce96c17452cd285d006d03574e93
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/at-spi/1.22/%{name}-%{version}.tar.bz2
+# Source0-md5: 85dc343588016ecf854830fab0cd6fdc
 URL:           http://developer.gnome.org/projects/gap/
-BuildRequires: ORBit2-devel >= 2.14.9
-BuildRequires: atk-devel >= 1:1.20.0
+BuildRequires: ORBit2-devel >= 2.14.10
+BuildRequires: atk-devel >= 1:1.22.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gail-devel >= 1.20.0
+BuildRequires: gail-devel >= 1.22.0
+BuildRequires: gettext-devel
 BuildRequires: gnome-common >= 2.20.0
-BuildRequires: gtk+2-devel >= 2:2.12.0
+BuildRequires: gtk+2-devel >= 2:2.12.8
 BuildRequires: gtk-doc >= 1.8
 BuildRequires: intltool >= 0.36.2
 BuildRequires: libbonobo-devel >= 2.20.0
@@ -35,6 +36,8 @@ Obsoletes:    libat-spi1
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _libexecdir     %{_libdir}/%{name}
+
 %description
 AT-SPI allows assistive technologies to access GTK-based applications.
 Essentially it exposes the internals of applications for automation,
@@ -53,10 +56,9 @@ Summary:     AT-SPI development files
 Summary(pl.UTF-8):     Pliki programistyczne AT-SPI
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      ORBit2-devel >= 2.14.9
-Requires:      atk-devel >= 1:1.20.0
-Requires:      gail-devel >= 1.20.0
-Requires:      gtk+2-devel >= 2:2.12.0
+Requires:      ORBit2-devel >= 2.14.10
+Requires:      atk-devel >= 1:1.22.0
+Requires:      gtk+2-devel >= 2:2.12.8
 Requires:      libbonobo-devel >= 2.20.0
 Obsoletes:     libat-spi1-devel
 
@@ -143,29 +145,44 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %{_libdir}/at-spi-registryd
-%attr(755,root,root) %{_libdir}/orbit-2.0/*.so
-%attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.so
-%{_libdir}/bonobo/servers/*
-%{_datadir}/idl/*
+%attr(755,root,root) %{_libdir}/libcspi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcspi.so.0
+%attr(755,root,root) %{_libdir}/libloginhelper.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libloginhelper.so.0
+%attr(755,root,root) %{_libdir}/libspi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libspi.so.0
+%dir %{_libexecdir}
+%attr(755,root,root) %{_libexecdir}/at-spi-registryd
+%attr(755,root,root) %{_libdir}/orbit-2.0/Accessibility_LoginHelper_module.so
+%attr(755,root,root) %{_libdir}/orbit-2.0/Accessibility_module.so
+%attr(755,root,root) %{_libdir}/gtk-2.0/modules/libatk-bridge.so
+%{_libdir}/bonobo/servers/Accessibility_Registry.server
+%{_datadir}/idl/at-spi-1.0
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_pkgconfigdir}/*
+%attr(755,root,root) %{_libdir}/libcspi.so
+%attr(755,root,root) %{_libdir}/libloginhelper.so
+%attr(755,root,root) %{_libdir}/libspi.so
+%{_includedir}/at-spi-1.0
+%{_libdir}/libcspi.la
+%{_libdir}/libloginhelper.la
+%{_libdir}/libspi.la
+%{_pkgconfigdir}/cspi-1.0.pc
+%{_pkgconfigdir}/libloginhelper-1.0.pc
+%{_pkgconfigdir}/libspi-1.0.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libcspi.a
+%{_libdir}/libloginhelper.a
+%{_libdir}/libspi.a
 %endif
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/*
+%{_gtkdocdir}/at-spi-cspi
 %{_docdir}/%{name}-%{version}
 
 %files -n python-pyatspi