- moved from /usr/X11R6 to /usr, release 4

Changed files:
    at-spi.spec -> 1.14

diff --git a/at-spi.spec b/at-spi.spec
index b869e207be5a1dc5fb0e070d344b7c33de7790a4..46b86fb227dd8c2bf9f8c4123f4b211ad8350ee4 100644 (file)
--- a/at-spi.spec
+++ b/at-spi.spec
@@ -2,7 +2,7 @@ Summary:        Assistive Technology Service Provider Interface
 Summary(pl):   Interfejs pozwalaj±cy na korzystanie z urz±dzeñ wspomagaj±cych
 Name:          at-spi
 Version:       1.1.5
-Release:       3
+Release:       4
 License:       LGPL
 Group:         X11/Libraries
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/1.1/%{name}-%{version}.tar.bz2
@@ -13,13 +13,10 @@ BuildRequires:      gtk-doc >= 0.10-1
 BuildRequires: gtk+2-devel >= 2.0.6
 BuildRequires: libbonobo-devel >= 2.0.0
 BuildRequires: popt-devel
+BuildRequires: rpm-build >= 4.1-8.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libat-spi1
 
-%define                _prefix                 /usr/X11R6
-%define                _gtkdocdir              %{_defaultdocdir}/gtk-doc/html
-%define                orbit_libdir            /usr/lib/orbit-2.0
-
 %description
 at-spi allows assistive technologies to access GTK-based
 applications. Essentially it exposes the internals of applications for
@@ -75,7 +72,6 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        HTML_DIR=%{_gtkdocdir} \
        pkgconfigdir=%{_pkgconfigdir} \
-       orbittypelibdir=%{orbit_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so.*.*
 %attr(755,root,root) %{_libdir}/at-spi-registryd
-%attr(755,root,root) %{orbit_libdir}/*.??
+%attr(755,root,root) %{_libdir}/orbit-2.0/*.??
 %attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.??
 %{_libdir}/bonobo/servers/*
 %{_datadir}/idl/*
@@ -104,4 +100,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/*.a
 %{_libdir}/gtk-2.0/modules/*.a 
-%{orbit_libdir}/*.a
+%{_libdir}/orbit-2.0/*.a