X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=at-spi.spec;h=e857ed7a6f85383214068d31db41c7e77a2387b4;hb=ff52ff972667c70b57f30d2ea683b1def50c23ce;hp=2d0ae27dbcaf575a05b603785ed1565959fcfa30;hpb=5a8f035e22cc6a61d62da83b31638c953fde13c8;p=packages%2Fat-spi.git

diff --git a/at-spi.spec b/at-spi.spec
index 2d0ae27..e857ed7 100644
--- a/at-spi.spec
+++ b/at-spi.spec
@@ -1,24 +1,32 @@
+# 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.3.5
-Release:	1
-License:	LGPL
+Version:	1.6.4
+Release:	2
+License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/1.3/%{name}-%{version}.tar.bz2
-# Source0-md5:	1dbb8b6b0a5c3c9c644e3a2bf6e9f25b
-Patch0:		%{name}-am.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/at-spi/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5:	be8b3077e2fab51a427303f228dffc2e
 URL:		http://developer.gnome.org/projects/gap/
-BuildRequires:	atk-devel >= 1.3.4
-BuildRequires:	gail-devel >= 1.3.1
-BuildRequires:	gtk-doc >= 0.10-1
-BuildRequires:	gtk+2-devel >= 2.2.0
-BuildRequires:	libbonobo-devel >= 2.0.0
-BuildRequires:	popt-devel
+BuildRequires:	ORBit2-devel
+BuildRequires:	atk-devel >= 1:1.9.0
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	gail-devel >= 1.8.1
+BuildRequires:	gnome-common >= 2.8.0
+BuildRequires:	gtk-doc >= 1.1
+BuildRequires:	gtk+2-devel >= 2:2.6.3
+BuildRequires:	intltool
+BuildRequires:	libbonobo-devel >= 2.8.0
+BuildRequires:	libtool
+BuildRequires:	pkgconfig
 BuildRequires:	rpm-build >= 4.1-10
 BuildRequires:	xft-devel >= 2.1
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	libat-spi1
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 at-spi allows assistive technologies to access GTK-based
@@ -37,8 +45,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.9.0
+Requires:	gail-devel >= 1.8.1
+Requires:	gtk+2-devel >= 2:2.6.3
 Requires:	gtk-doc-common
+Requires:	libbonobo-devel >= 2.8.0
 Obsoletes:	libat-spi1-devel
 
 %description devel
@@ -51,7 +64,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,23 +74,25 @@ Statyczna biblioteka at-spi.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__aclocal}
 %{__automake}
 %{__autoconf}
 %configure \
-	--enable-static
-
+	--enable-static \
+	--enable-gtk-doc \
+	--with-html-dir=%{_gtkdocdir} \
+	%{!?with_static_libs:--disable-static}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	HTML_DIR=%{_gtkdocdir} 
+	HTML_DIR=%{_gtkdocdir}
 
 # no static modules
 rm -f $RPM_BUILD_ROOT%{_libdir}/{gtk-2.0/modules,orbit-2.0}/*.{la,a}
@@ -85,8 +100,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/{gtk-2.0/modules,orbit-2.0}/*.{la,a}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -102,9 +117,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_includedir}/*
-%doc %{_gtkdocdir}/*
+%{_gtkdocdir}/*
 %{_pkgconfigdir}/*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/*.a
+%endif