rpms/evolution/F-9 .cvsignore, 1.89, 1.90 evolution.spec, 1.333, 1.334 sources, 1.89, 1.90 evolution-2.21.92-CVE-2008-0072.patch, 1.1, NONE evolution-2.22.0-line-status.patch, 1.1, NONE evolution-2.22.1-double-free.patch, 1.1, NONE

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12622

Modified Files:
	.cvsignore evolution.spec sources 
Removed Files:
	evolution-2.21.92-CVE-2008-0072.patch 
	evolution-2.22.0-line-status.patch 
	evolution-2.22.1-double-free.patch 
Log Message:

* Fri May 02 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.1.1-1.fc9
- Update to 2.22.1.1
- Remove patch for RH bug #437208 (fixed upstream).
- Remove patch for GNOME bug #524121 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-9/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- .cvsignore	7 Apr 2008 18:51:10 -0000	1.89
+++ .cvsignore	2 May 2008 11:53:22 -0000	1.90
@@ -1 +1 @@
-evolution-2.22.1.tar.bz2
+evolution-2.22.1.1.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-9/evolution.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- evolution.spec	29 Apr 2008 12:48:38 -0000	1.333
+++ evolution.spec	2 May 2008 11:53:22 -0000	1.334
@@ -45,8 +45,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.22.1
-Release: 2%{?dist}
+Version: 2.22.1.1
+Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -81,12 +81,6 @@
 # RH bug #176400
 Patch15: evolution-2.9.1-im-context-reset.patch
 
-# RH bug #437208 / GNOME bug #518103
-Patch16: evolution-2.22.0-line-status.patch
-
-# GNOME bug #524121
-Patch17: evolution-2.22.1-double-free.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -232,8 +226,6 @@
 %patch13 -p1 -b .fix-conduit-dir
 %patch14 -p1 -b .no-gnome-common
 %patch15 -p1 -b .im-context-reset
-%patch16 -p1 -b .line-status
-%patch17 -p1 -b .double-free
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -661,6 +653,11 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Fri May 02 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.1.1-1.fc9
+- Update to 2.22.1.1
+- Remove patch for RH bug #437208 (fixed upstream).
+- Remove patch for GNOME bug #524121 (fixed upstream).
+
 * Tue Apr 29 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.1-2.fc9
 - Add patch for GNOME bug #524121 (double free).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-9/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- sources	7 Apr 2008 18:51:10 -0000	1.89
+++ sources	2 May 2008 11:53:22 -0000	1.90
@@ -1 +1 @@
-b8eddd6e26b59b1fe6ad0ae849916836  evolution-2.22.1.tar.bz2
+fa188ebbe6d5a5c8af0673101f464003  evolution-2.22.1.1.tar.bz2


--- evolution-2.21.92-CVE-2008-0072.patch DELETED ---


--- evolution-2.22.0-line-status.patch DELETED ---


--- evolution-2.22.1-double-free.patch DELETED ---