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

[baggins]

Author: baggins                      Date: Sun May 14 22:10:14 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   libbonobo.spec (1.93 -> 1.93.2.1) 

---- Diffs:

================================================================
Index: SPECS/libbonobo.spec
diff -u SPECS/libbonobo.spec:1.93 SPECS/libbonobo.spec:1.93.2.1
--- SPECS/libbonobo.spec:1.93	Sun Aug 21 13:14:16 2005
+++ SPECS/libbonobo.spec	Mon May 15 00:10:09 2006
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+#
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
 #
@@ -6,12 +7,12 @@
 Summary(pl):	Biblioteka do łączenia dokumentów w GNOME
 Summary(pt_BR):	Biblioteca para documentos compostos no GNOME
 Name:		libbonobo
-Version:	2.10.1
+Version:	2.14.0
 Release:	1
 License:	GPL
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5:	927d572970d87121c8375aab1b4b1d37
+Source0:	http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	f1f0255f94e3354250d142b688013fad
 URL:		http://www.gnome.org/
 BuildRequires:	ORBit2-devel >= 1:2.12.0
 BuildRequires:	autoconf
@@ -19,7 +20,7 @@
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.4.1
+BuildRequires:	glib2-devel >= 1:2.8.0
 BuildRequires:	gnome-common >= 2.8.0
 BuildRequires:	gtk-doc >= 1.1
 BuildRequires:	intltool >= 0.29
@@ -29,7 +30,6 @@
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel >= 1.5
 BuildRequires:	rpmbuild(macros) >= 1.197
-Requires(post):	/sbin/ldconfig
 Requires:	ORBit2 >= 1:2.12.0
 Provides:	bonobo-activation = %{version}
 Obsoletes:	bonobo-activation
@@ -90,6 +90,7 @@
 sed -i -e 's|/lib|/%{_lib}|g' utils/bonobo-slay.in
 
 %build
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -121,9 +122,7 @@
 
 %post
 /sbin/ldconfig
-for item in /usr/lib/bonobo/servers /usr/X11R6/lib/bonobo/servers; do
-	/usr/sbin/bonobo-activation-sysconf --add-directory=$item
-done
+/usr/sbin/bonobo-activation-sysconf --add-directory=/usr/lib/bonobo/servers
 
 %postun -p /sbin/ldconfig
 
@@ -170,6 +169,27 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93.2.1  2006/05/14 22:10:09  baggins
+- merged from HEAD
+
+Revision 1.96  2006/04/01 17:55:30  qboosh
+- killed Ra-specific bonobo/servers path
+
+Revision 1.95  2006/04/01 13:46:16  freetz
+- merged from DEVEL
+
+Revision 1.94.2.3  2006/03/14 15:33:06  freetz
+- 2.14.0
+
+Revision 1.94.2.2  2006/03/07 21:32:10  freetz
+- 2.13.93
+
+Revision 1.94.2.1  2006/01/18 18:04:04  freetz
+- 2.13.1
+
+Revision 1.94  2005/12/04 22:58:06  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.93  2005/08/21 11:14:16  aflinta
 - version 2.10.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libbonobo.spec?r1=1.93&r2=1.93.2.1&f=u