SPECS (AC-branch): atk.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Fri May 12 17:55:49 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   atk.spec (1.89 -> 1.89.2.1) 

---- Diffs:

================================================================
Index: SPECS/atk.spec
diff -u SPECS/atk.spec:1.89 SPECS/atk.spec:1.89.2.1
--- SPECS/atk.spec:1.89	Tue Sep  6 13:10:18 2005
+++ SPECS/atk.spec	Fri May 12 19:55:44 2006
@@ -1,22 +1,28 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	apidocs		# disable gtk-doc
+%bcond_without	static_libs	# don't build static library
+#
 Summary:	ATK - Accessibility Toolkit
 Summary(pl):	ATK - biblioteka ułatwiająca niepełnosprawnym korzystanie z komputerów
 Summary(pt_BR):	Interfaces para suporte a acessibilidade
 Name:		atk
-Version:	1.10.3
+Version:	1.11.4
 Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/atk/1.10/%{name}-%{version}.tar.bz2
-# Source0-md5:	c84a01fea567b365c0d44b227fead948
+Source0:	http://ftp.gnome.org/pub/gnome/sources/atk/1.11/%{name}-%{version}.tar.bz2
+# Source0-md5:	2f7132e46a62a2586545bca40eeeef39
 URL:		http://developer.gnome.org/projects/gap/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
 BuildRequires:	diffutils
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.8.1
-BuildRequires:	gtk-doc >= 1.4
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.4}
+BuildRequires:	gtk-doc-automake >= 1.4
 BuildRequires:	libtool >= 2:1.5.16
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
@@ -82,21 +88,34 @@
 %description static -l pt_BR
 Interfaces para suporte a acessibilidade.
 
+%package apidocs
+Summary:	ATK API documentation
+Summary(pl):	Dokumentacja API ATK
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+ATK API documentation.
+
+%description apidocs -l pl
+Dokumentacja API ATK.
+
 %prep
 %setup -q
 
 %build
-%{__gtkdocize}
+%{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--enable-gtk-doc \
-	--enable-shared \
-	--enable-static \
-	--with-html-dir=%{_gtkdocdir}
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
+	%{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
+	--%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
+	--enable-shared
+
 %{__make}
 
 %install
@@ -123,15 +142,25 @@
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog
-%{_gtkdocdir}/atk
-%{_includedir}/atk*
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
+%{_includedir}/atk*
 %{_pkgconfigdir}/atk*
+%if %{with apidocs}
+%{_gtkdocdir}/atk
+%endif
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
+%endif
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/atk
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -139,6 +168,33 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.89.2.1  2006/05/12 17:55:44  baggins
+- merged from HEAD
+
+Revision 1.94  2006/04/02 11:06:49  freetz
+- merged from DEVEL
+
+Revision 1.93.2.3  2006/04/02 10:16:56  freetz
+- 1.11.4
+
+Revision 1.93.2.2  2006/03/13 17:54:11  freetz
+- 1.11.3
+
+Revision 1.93.2.1  2006/01/18 15:38:27  freetz
+- 1.11.2, apidocs subpkg
+
+Revision 1.93  2005/09/23 12:08:50  djurban
+- no more gtk-doc BUAHAHAHAHA
+
+Revision 1.92  2005/09/23 11:53:26  qboosh
+- bcond header
+
+Revision 1.91  2005/09/23 11:34:09  djurban
+- gtkdocsize bconded, without it gtk-doc is required even when building without apidocs
+
+Revision 1.90  2005/09/19 18:27:40  djurban
+- standardise static_libs and s/doc/apidocs/ to properly get rid of gtk-doc if compiled without it
+
 Revision 1.89  2005/09/06 11:10:18  paladine
 - updated to 1.10.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/atk.spec?r1=1.89&r2=1.89.2.1&f=u