rpms/evolution-data-server/devel evolution-data-server.spec, 1.88, 1.89

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29278

Modified Files:
	evolution-data-server.spec 
Log Message:
fix a multilib conflict



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- evolution-data-server.spec	11 Apr 2006 00:59:34 -0000	1.88
+++ evolution-data-server.spec	11 Apr 2006 02:31:00 -0000	1.89
@@ -11,11 +11,7 @@
 %define eds_base_version 1.6
 %define eds_api_version 1.2
 
-%ifarch s390x ia64
 %define use_gtk_doc 0
-%else
-%define use_gtk_doc 1
-%endif
 
 %define support_imap4_provider 0
 
@@ -25,7 +21,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.6.1
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -321,7 +317,10 @@
 
 
 %changelog
-* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.1-2
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.1-3
+- Avoid a multilib conflict
+
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.1-2
 - Update to 1.6.1
 
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 1.6.0-1