X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=at-spi.spec;h=6fb6c3aa340888996bc0299d972511d5db7896f2;hb=e7ee6641e34a9464603c8b60895577d03c323615;hp=da8ec2b836fa31ace53d4b90492a4f15a1dd74f2;hpb=d0fc1aa99e6a65a7f78a15c8d92064b8d4a9b8b9;p=packages%2Fat-spi.git

diff --git a/at-spi.spec b/at-spi.spec
index da8ec2b..6fb6c3a 100644
--- a/at-spi.spec
+++ b/at-spi.spec
@@ -1,22 +1,37 @@
+#
+# TODO:
+# - package reference html docs or removed it
+# 
+# Conditional build:
+%bcond_without	static_libs	# don't build static library
+#
 Summary:	Assistive Technology Service Provider Interface
 Summary(pl):	Interfejs pozwalaj±cy na korzystanie z urz±dzeñ wspomagaj±cych
 Name:		at-spi
-Version:	1.1.7
+Version:	1.7.10
 Release:	1
-License:	LGPL
+License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/1.1/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/gnome/sources/at-spi/1.7/%{name}-%{version}.tar.bz2
+# Source0-md5:	4d233cbccb69865c07358d04e97d86cf
 URL:		http://developer.gnome.org/projects/gap/
-BuildRequires:	atk-devel >= 1.1.5
-BuildRequires:	gail-devel >= 1.1.5
-BuildRequires:	gtk-doc >= 0.10-1
-BuildRequires:	gtk+2-devel >= 2.1.3
-BuildRequires:	libbonobo-devel >= 2.0.0
-BuildRequires:	popt-devel
-BuildRequires:	rpm-build >= 4.1-8.2
-BuildRequires:	Xft-devel >= 2.1
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires:	ORBit2-devel
+BuildRequires:	atk-devel >= 1:1.12.1
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	gail-devel >= 1.9.1
+BuildRequires:	gnome-common >= 2.12.0
+BuildRequires:	gtk+2-devel >= 2:2.10.1
+BuildRequires:	gtk-doc >= 1.6
+BuildRequires:	intltool
+BuildRequires:	libbonobo-devel >= 2.15.0
+BuildRequires:	libtool
+BuildRequires:	pkgconfig
+BuildRequires:	rpm-build >= 4.1-10
+BuildRequires:	xorg-lib-libXft-devel >= 2.1
+BuildRequires:	xorg-lib-libXtst-devel
 Obsoletes:	libat-spi1
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 at-spi allows assistive technologies to access GTK-based
@@ -35,8 +50,13 @@ wsp
 Summary:	at-spi development files
 Summary(pl):	Pliki programistyczne at-spi
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
+Requires:	ORBit2-devel
+Requires:	atk-devel >= 1:1.12.1
+Requires:	gail-devel >= 1.9.0
+Requires:	gtk+2-devel >= 2:2.10.0
 Requires:	gtk-doc-common
+Requires:	libbonobo-devel >= 2.15.0
 Obsoletes:	libat-spi1-devel
 
 %description devel
@@ -49,7 +69,7 @@ Pliki programistyczne at-spi.
 Summary:	at-spi static library
 Summary(pl):	Statyczna biblioteka at-spi
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 at-spi static library.
@@ -61,44 +81,54 @@ Statyczna biblioteka at-spi.
 %setup -q
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__automake}
+%{__autoconf}
 %configure \
-	--with-html-path=%{_gtkdocdir} \
-	--enable-static
-
+	%{!?with_static_libs:--disable-static} \
+	--enable-gtk-doc \
+	--enable-static \
+	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	HTML_DIR=%{_gtkdocdir} \
-	pkgconfigdir=%{_pkgconfigdir} \
+	HTML_DIR=%{_gtkdocdir}
+
+# no static modules
+rm -f $RPM_BUILD_ROOT%{_libdir}/{gtk-2.0/modules,orbit-2.0}/*.{la,a}
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so.*.*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 %attr(755,root,root) %{_libdir}/at-spi-registryd
-%attr(755,root,root) %{_libdir}/orbit-2.0/*.??
-%attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.??
+%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/*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
 %{_includedir}/*
-%doc %{_gtkdocdir}/*
+%{_gtkdocdir}/*
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_pkgconfigdir}/*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/*.a
-%{_libdir}/gtk-2.0/modules/*.a 
-%{_libdir}/orbit-2.0/*.a
+%endif