fix a multilib conflict

This commit is contained in:
Matthias Clasen 2006-04-11 02:31:00 +00:00
parent 0d4057bf10
commit 80c20243b3

View File

@ -11,11 +11,7 @@
%define eds_base_version 1.6 %define eds_base_version 1.6
%define eds_api_version 1.2 %define eds_api_version 1.2
%ifarch s390x ia64
%define use_gtk_doc 0 %define use_gtk_doc 0
%else
%define use_gtk_doc 1
%endif
%define support_imap4_provider 0 %define support_imap4_provider 0
@ -25,7 +21,7 @@
Summary: Backend data server for evolution Summary: Backend data server for evolution
Name: evolution-data-server Name: evolution-data-server
Version: 1.6.1 Version: 1.6.1
Release: 2 Release: 3
License: LGPL License: LGPL
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@ -321,7 +317,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Apr 10 2006 Matthias Clasen <mclasen@redhat.com> - 1.8.1-2 * Mon Apr 10 2006 Matthias Clasen <mclasen@redhat.com> - 1.6.1-3
- Avoid a multilib conflict
* Mon Apr 10 2006 Matthias Clasen <mclasen@redhat.com> - 1.6.1-2
- Update to 1.6.1 - Update to 1.6.1
* Mon Mar 13 2006 Ray Strode <rstrode@redhat.com> - 1.6.0-1 * Mon Mar 13 2006 Ray Strode <rstrode@redhat.com> - 1.6.0-1