- Removed patch for GCC 4 fix as this is now in upstream tarball
- Updated requirements:
gtkhtml3 from 3.5.7 to 3.6.0
libgal2 from 2.3.5 to 2.4.0
eds from 1.1.6 to 1.2.0
This commit is contained in:
dmalcolm 2005-03-09 00:47:06 +00:00
parent f401774e42
commit 2da3bf4480

View File

@ -1,10 +1,10 @@
# no ppc64 mozilla # no ppc64 mozilla
ExcludeArch: ppc64 ExcludeArch: ppc64
%define gal_version 2:2.3.5 %define gal_version 2:2.4.0
%define gtkhtml_version 3.5.7 %define gtkhtml_version 3.6.0
%define soup_version 2.2.2 %define soup_version 2.2.2
%define eds_version 1.1.6 %define eds_version 1.2.0
%define use_mozilla_nss 1 %define use_mozilla_nss 1
%define evo_major 2.2 %define evo_major 2.2
%define libbonoboui_version 2.4.2 %define libbonoboui_version 2.4.2
@ -28,8 +28,8 @@ ExcludeArch: ppc64
%define nntp_support 1 %define nntp_support 1
Name: evolution Name: evolution
Version: 2.1.6 Version: 2.2.0
Release: 3 Release: 1
License: GPL License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.ximian.com/ URL: http://www.ximian.com/
@ -48,7 +48,6 @@ Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
# patches sent upstream # patches sent upstream
Patch100: evo-addressbook-print-with-pango-2.patch Patch100: evo-addressbook-print-with-pango-2.patch
Patch101: evo-calendar-print-with-pango-4.patch Patch101: evo-calendar-print-with-pango-4.patch
Patch102: evolution-2.1.6-gcc4-fixes.patch
# not accepted, but proposed on a few occasions. fixes problems with # not accepted, but proposed on a few occasions. fixes problems with
# some cyrus servers # some cyrus servers
@ -169,7 +168,6 @@ Development files needed for building things which link against evolution.
# patches sent upstream # patches sent upstream
%patch100 -p0 -b .addressbook-print-with-pango %patch100 -p0 -b .addressbook-print-with-pango
%patch101 -p0 -b .calendar-print-with-pango %patch101 -p0 -b .calendar-print-with-pango
%patch102 -p1 -b .gcc4-fixes
#patch200 -p1 -b .commandlength #patch200 -p1 -b .commandlength
@ -329,6 +327,14 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/*/*.a %{_libdir}/evolution/%{evo_major}/*/*.a
%changelog %changelog
* Tue Mar 8 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-1
- 2.2.0
- Removed patch for GCC 4 fix as this is now in upstream tarball
- Updated requirements:
* gtkhtml3 from 3.5.7 to 3.6.0
* libgal2 from 2.3.5 to 2.4.0
* eds from 1.1.6 to 1.2.0
* Tue Mar 8 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.6-3 * Tue Mar 8 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.6-3
- rebuild (to use latest DBus library) - rebuild (to use latest DBus library)