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

[baggins]

Author: baggins                      Date: Mon May 15 12:56:13 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   libgnomecanvas.spec (1.67 -> 1.67.4.1) 

---- Diffs:

================================================================
Index: SPECS/libgnomecanvas.spec
diff -u SPECS/libgnomecanvas.spec:1.67 SPECS/libgnomecanvas.spec:1.67.4.1
--- SPECS/libgnomecanvas.spec:1.67	Tue Sep  6 12:19:43 2005
+++ SPECS/libgnomecanvas.spec	Mon May 15 14:56:08 2006
@@ -1,20 +1,26 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	apidocs		# disable gtk-doc
+#
+# $Revision$, $Date$
 Summary:	GnomeCanvas widget
 Summary(pl):	Widget GnomeCanvas
 Name:		libgnomecanvas
-Version:	2.12.0
+Version:	2.14.0
 Release:	1
 License:	LGPL
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	62c0edd3d27803d341662fd9088b2d9b
+Source0:	http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	516c46fb4a1401b05cfef58c350fbd3d
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.8.0
 BuildRequires:	gtk+2-devel >= 2:2.8.3
-BuildRequires:	gtk-doc >= 1.3
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.3}
+BuildRequires:	gtk-doc-automake >= 1.3
 BuildRequires:	libart_lgpl-devel >= 2.3.14
 BuildRequires:	libglade2-devel >= 1:2.5.0
 BuildRequires:	libtool
@@ -70,7 +76,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--enable-gtk-doc \
+	%{?with_apidocs:--enable-gtk-doc} \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -101,11 +107,11 @@
 
 %files devel
 %defattr(644,root,root,755)
-%{_gtkdocdir}/*
-%{_includedir}/libgnomecanvas-2.0
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
+%{_includedir}/libgnomecanvas-2.0
 %{_pkgconfigdir}/*.pc
+%{_gtkdocdir}/*
 
 %files static
 %defattr(644,root,root,755)
@@ -117,6 +123,24 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67.4.1  2006/05/15 12:56:08  baggins
+- merged from HEAD
+
+Revision 1.70  2006/04/01 20:54:40  freetz
+- merged from DEVEL
+
+Revision 1.67.2.2  2006/03/13 13:51:15  freetz
+- 2.14.0
+
+Revision 1.67.2.1  2006/01/18 22:42:19  freetz
+- 2.13.0
+
+Revision 1.69  2006/02/25 17:16:45  qboosh
+- unified
+
+Revision 1.68  2006/02/23 21:53:00  adgor
+- apidocs bcond
+
 Revision 1.67  2005/09/06 10:19:43  aflinta
 - merged from DEVEL, 2.12.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libgnomecanvas.spec?r1=1.67&r2=1.67.4.1&f=u