SPECS (AC-branch): evolution-data-server.spec - merged from HEAD

[baggins]

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

---- Files affected:
SPECS:
   evolution-data-server.spec (1.71 -> 1.71.4.1) 

---- Diffs:

================================================================
Index: SPECS/evolution-data-server.spec
diff -u SPECS/evolution-data-server.spec:1.71 SPECS/evolution-data-server.spec:1.71.4.1
--- SPECS/evolution-data-server.spec:1.71	Tue Jan 17 13:29:36 2006
+++ SPECS/evolution-data-server.spec	Mon May 15 17:24:55 2006
@@ -7,35 +7,33 @@
 %bcond_without	kerberos5	# build without kerberos5 support
 %bcond_without	ldap		# build without ldap support
 #
-%define		basever		1.4
+%define		basever		1.6
 %define		apiver		1.2
 Summary:	Evolution data server
 Summary(pl):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	1.4.2.1
-Release:	3
+Version:	1.6.1
+Release:	1
 License:	GPL
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5:	8b058aff089cf3a6c13cc9f51f536ae8
+Source0:	http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5:	d4def6cad1dc3508b8df55e7e794db49
 Patch0:		%{name}-system_db.patch
 Patch1:		%{name}-GG-IM.patch
 Patch2:		%{name}-workaround-cal-backend-leak.patch
 Patch3:		%{name}-gcc4.patch
-Patch4:		%{name}-imap-encoding.patch
 URL:		http://www.ximian.com/products/ximian_evolution/
-BuildRequires:	ORBit2-devel >= 1:2.12.1
+BuildRequires:	ORBit2-devel >= 1:2.14.0
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	db-devel
 BuildRequires:	gnome-common >= 2.8.0
 %{?with_kerberos5:BuildRequires:	heimdal-devel >= 0.7}
-BuildRequires:	howl-devel >= 0.9.10
 BuildRequires:	intltool
 BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.11.2-2
-BuildRequires:	libsoup-devel >= 2.2.5
+BuildRequires:	libgnomeui-devel >= 2.14.0
+BuildRequires:	libsoup-devel >= 2.2.92
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	nspr-devel
@@ -87,14 +85,14 @@
 Requires:	%{name}-libs = %{version}-%{release}
 %{?with_kerberos5:Requires:	heimdal-devel >= 0.7}
 # for all but libegroupwise
-Requires:	GConf2-devel >= 2.10.0
-Requires:	ORBit2-devel >= 1:2.12.1
+Requires:	GConf2-devel >= 2.14.0
+Requires:	ORBit2-devel >= 1:2.14.1
 Requires:	glib2-devel >= 1:2.6.4
-Requires:	libbonobo-devel >= 2.8.1
-Requires:	libgnomeui-devel >= 2.11.2-2
+Requires:	libbonobo-devel >= 2.14.0
+Requires:	libgnomeui-devel >= 2.14.0
 Requires:	libxml2-devel
 # for libegroupwise
-Requires:	libsoup-devel >= 2.2.5
+Requires:	libsoup-devel >= 2.2.92
 
 %description devel
 This package contains the files necessary to develop applications
@@ -122,7 +120,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
 
 rm -rf libdb
 
@@ -266,6 +263,33 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71.4.1  2006/05/15 15:24:55  baggins
+- merged from HEAD
+
+Revision 1.74  2006/04/10 18:35:15  freetz
+- 1.6.1
+
+Revision 1.73  2006/04/04 19:07:36  freetz
+- rel.2 for rebuild (glitz infected)
+
+Revision 1.72  2006/04/02 06:36:29  freetz
+- merged from DEVEL
+
+Revision 1.71.2.5  2006/03/13 17:22:26  freetz
+- 1.6.0
+
+Revision 1.71.2.4  2006/02/27 21:23:52  freetz
+- 1.5.92
+
+Revision 1.71.2.3  2006/02/13 21:14:16  freetz
+- 1.5.91
+
+Revision 1.71.2.2  2006/01/31 18:01:10  freetz
+- 1.5.90
+
+Revision 1.71.2.1  2006/01/22 20:39:08  freetz
+- 1.5.5
+
 Revision 1.71  2006/01/17 12:29:36  baggins
 - release 3
 - BR openldap >= 2.3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/evolution-data-server.spec?r1=1.71&r2=1.71.4.1&f=u