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

[baggins]

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

---- Files affected:
SPECS:
   libbonoboui.spec (1.80 -> 1.80.4.1) 

---- Diffs:

================================================================
Index: SPECS/libbonoboui.spec
diff -u SPECS/libbonoboui.spec:1.80 SPECS/libbonoboui.spec:1.80.4.1
--- SPECS/libbonoboui.spec:1.80	Sun Aug 21 13:14:16 2005
+++ SPECS/libbonoboui.spec	Mon May 15 14:58:00 2006
@@ -1,39 +1,35 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	xlibs	# with xlibs
 %bcond_without	static_libs	# don't build static library
 #
 Summary:	Bonobo user interface components
 Summary(pl):	Komponenty interfejsu użytkownika do Bonobo
 Name:		libbonoboui
-Version:	2.10.1
+Version:	2.14.0
 Release:	1
 License:	LGPL
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5:	74c4b633ae33524e2f6d3e6573b75f3c
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	dc26dc17cddc625cac37ecfab263a51a
 Patch0:		%{name}-desktop.patch
 URL:		http://www.gnome.org/
-%{?with_xlibs:BuildRequires:	libX11-devel}
 BuildRequires:	GConf2-devel >= 2.8.0.1
 BuildRequires:	ORBit2-devel >= 2.12.0
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	howl-devel >= 0.9.10
 BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	gtk+2-devel >= 2:2.4.1
+BuildRequires:	gtk+2-devel >= 2:2.6.0
 BuildRequires:	gtk-doc >= 1.0
 BuildRequires:	intltool >= 0.29
-BuildRequires:	libbonobo-devel >= 2.10.1
+BuildRequires:	libbonobo-devel >= 2.13.0
 BuildRequires:	libglade2-devel >= 1:2.4.0
-BuildRequires:	libgnome-devel >= 2.8.0
-BuildRequires:	libgnomecanvas-devel >= 2.8.0
+BuildRequires:	libgnome-devel >= 2.13.7
+BuildRequires:	libgnomecanvas-devel >= 2.13.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2.6.13
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
-%{?with_xlibs:BuildRequires:	sed >= 4.0}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -97,12 +93,6 @@
 %setup -q
 %patch0 -p1
 
-%if %{with xlibs}
-sed -ie \
-	's/AC_PATH_XTRA/PKG_CHECK_MODULES(X, [x11], [$x_no = no])/' \
-	configure.in
-%endif
-
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -170,6 +160,24 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80.4.1  2006/05/15 12:58:00  baggins
+- merged from HEAD
+
+Revision 1.81  2006/04/01 20:54:40  freetz
+- merged from DEVEL
+
+Revision 1.80.2.4  2006/03/14 22:21:08  freetz
+- 2.14.0
+
+Revision 1.80.2.3  2006/02/21 12:04:18  wiget
+- force newer libgnomecanvas (2.13.0)
+
+Revision 1.80.2.2  2006/02/19 20:25:31  freetz
+- updated BR, dropped xlibs support
+
+Revision 1.80.2.1  2006/01/18 22:50:52  freetz
+- 2.13.1, disable howl for now
+
 Revision 1.80  2005/08/21 11:14:16  aflinta
 - version 2.10.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libbonoboui.spec?r1=1.80&r2=1.80.4.1&f=u