From 34cccef8f6c60f22ba46e3c548d6ffb156b70863 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 29 Sep 2009 04:49:09 +0000
Subject: [PATCH 01/12] Initialize branch F-12 for evolution

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..06de2d2
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-12

From 54f98631470cbbcd6779d79376353e427996aa93 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Wed, 7 Oct 2009 01:46:56 +0000
Subject: [PATCH 02/12] - Tweak desktop file for GNOME Shell.

---
 evolution-2.28.0-tweak-desktop-file.patch | 12 ++++++++++++
 evolution.spec                            |  7 +++++++
 2 files changed, 19 insertions(+)
 create mode 100644 evolution-2.28.0-tweak-desktop-file.patch

diff --git a/evolution-2.28.0-tweak-desktop-file.patch b/evolution-2.28.0-tweak-desktop-file.patch
new file mode 100644
index 0000000..adff66e
--- /dev/null
+++ b/evolution-2.28.0-tweak-desktop-file.patch
@@ -0,0 +1,12 @@
+diff -up evolution-2.28.0/data/evolution.desktop.in.in.tweak-desktop-file evolution-2.28.0/data/evolution.desktop.in.in
+--- evolution-2.28.0/data/evolution.desktop.in.in.tweak-desktop-file	2009-08-28 02:48:33.000000000 -0500
++++ evolution-2.28.0/data/evolution.desktop.in.in	2009-10-06 20:44:30.809703987 -0500
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+-_Name=Evolution Mail and Calendar
++_Name=Evolution
+ _GenericName=Groupware Suite
++_X-GNOME-FullName=Evolution Mail and Calendar
+ _Comment=Manage your email, contacts and schedule
+ Exec=evolution
+ Icon=evolution
diff --git a/evolution.spec b/evolution.spec
index 7ceb46b..577814a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -66,6 +66,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
+# Tweak the desktop file for GNOME Shell.
+Patch13: evolution-2.28.0-tweak-desktop-file.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -240,6 +243,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
+%patch13 -p1 -b .tweak-desktop-file
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -696,6 +700,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Oct 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.28.0-2.fc12
+- Tweak desktop file for GNOME Shell.
+
 * Mon Sep 21 2009 Milan Crha <mcrha@redhat.com> - 2.28.0-1.fc12
 - Update to 2.28.0
 

From a15b57f2ffae2f51e88cdb23d07c4f532f0cfe0c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Wed, 7 Oct 2009 01:48:22 +0000
Subject: [PATCH 03/12] Fix release.

---
 evolution.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 577814a..25e18b5 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL

From b77640b9b544b406400bb6d559c210eed6afb2ab Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@fedoraproject.org>
Date: Mon, 19 Oct 2009 09:52:52 +0000
Subject: [PATCH 04/12] - Update to 2.28.1 - Remove patch 'Tweak desktop file
 for GNOME Shell' (fixed upstream).

---
 .cvsignore                                |  2 +-
 evolution-2.28.0-tweak-desktop-file.patch | 12 ------------
 evolution.spec                            | 12 ++++++------
 sources                                   |  2 +-
 4 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 evolution-2.28.0-tweak-desktop-file.patch

diff --git a/.cvsignore b/.cvsignore
index 57956be..e9f6b00 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.28.0.tar.bz2
+evolution-2.28.1.tar.bz2
diff --git a/evolution-2.28.0-tweak-desktop-file.patch b/evolution-2.28.0-tweak-desktop-file.patch
deleted file mode 100644
index adff66e..0000000
--- a/evolution-2.28.0-tweak-desktop-file.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up evolution-2.28.0/data/evolution.desktop.in.in.tweak-desktop-file evolution-2.28.0/data/evolution.desktop.in.in
---- evolution-2.28.0/data/evolution.desktop.in.in.tweak-desktop-file	2009-08-28 02:48:33.000000000 -0500
-+++ evolution-2.28.0/data/evolution.desktop.in.in	2009-10-06 20:44:30.809703987 -0500
-@@ -1,6 +1,7 @@
- [Desktop Entry]
--_Name=Evolution Mail and Calendar
-+_Name=Evolution
- _GenericName=Groupware Suite
-+_X-GNOME-FullName=Evolution Mail and Calendar
- _Comment=Manage your email, contacts and schedule
- Exec=evolution
- Icon=evolution
diff --git a/evolution.spec b/evolution.spec
index 25e18b5..8593130 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.28.0
-Release: 2%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -66,9 +66,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
-# Tweak the desktop file for GNOME Shell.
-Patch13: evolution-2.28.0-tweak-desktop-file.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -243,7 +240,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
-%patch13 -p1 -b .tweak-desktop-file
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -700,6 +696,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 19 2009 Milan Crha <mcrha@redhat.com> - 2.28.1-1.fc12
+- Update to 2.28.1
+- Remove patch 'Tweak desktop file for GNOME Shell' (fixed upstream).
+
 * Tue Oct 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.28.0-2.fc12
 - Tweak desktop file for GNOME Shell.
 
diff --git a/sources b/sources
index 5f3122d..def1746 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a8ce4d794b3dea0d086d9809b6ddf0c  evolution-2.28.0.tar.bz2
+15043e64f22000f6f0bf57e0373c7169  evolution-2.28.1.tar.bz2

From 3a3e2603ca9c2173185f27d1cd4b795f019ec852 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:25:59 +0000
Subject: [PATCH 05/12] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index dd23cb0..c22b7db 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: evolution
-# $Id: Makefile,v 1.1 2004/09/09 04:34:33 cvsdist Exp $
+# $Id: Makefile,v 1.2 2007/10/15 18:44:15 notting Exp $
 NAME := evolution
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From a489b364377ba385841d544b21c483fe01e466a1 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Wed, 2 Dec 2009 18:24:54 +0000
Subject: [PATCH 06/12] Disable bogofilter subpackage if EL6+

---
 evolution.spec | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 8593130..45a554f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,3 +1,6 @@
+# Variable must exist even if unused
+%{?!rhel:%define rhel 0}
+
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
 %define glib2_version 2.16.0
@@ -43,7 +46,7 @@
 
 Name: evolution
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -196,6 +199,8 @@ This package contains conduits for synchronizing PalmPilot<tm> or other
 PalmOS<tm> devices with %{name}.
 %endif
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
 %package bogofilter
 Group: Applications/Productivity
 Summary: Bogofilter plugin for Evolution
@@ -204,6 +209,7 @@ Requires: bogofilter
 
 %description bogofilter
 This package contains the plugin to filter junk mail using Bogofilter.
+%endif
 
 %package spamassassin
 Group: Applications/Productivity
@@ -385,6 +391,13 @@ done
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6
+rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
+rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
+rm -f $RPM_BUILD_ROOT{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
+%endif
+
 %post
 /sbin/ldconfig
 scrollkeeper-update -q
@@ -401,9 +414,12 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6
 %post bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null
+%endif
 
 %postun
 /sbin/ldconfig
@@ -672,11 +688,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6
 %files bogofilter
 %defattr(-, root, root)
 %{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
 %{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
 %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
+%endif
 
 %files spamassassin
 %defattr(-, root, root)
@@ -696,6 +715,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 02 2009 Warren Togami <wtogami@redhat.com> - 2.28.1-2
+- Disable bogofilter subpackage if EL6+
+
 * Mon Oct 19 2009 Milan Crha <mcrha@redhat.com> - 2.28.1-1.fc12
 - Update to 2.28.1
 - Remove patch 'Tweak desktop file for GNOME Shell' (fixed upstream).

From 3775b1a4fdfca36a003fd2b7c19e85ff0229bd5f Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Wed, 2 Dec 2009 18:50:52 +0000
Subject: [PATCH 07/12] Fix the logic

---
 evolution.spec | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 45a554f..63e9226 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,5 +1,11 @@
 # Variable must exist even if unused
 %{?!rhel:%define rhel 0}
+%define disable_bogofilter 0
+
+%if 0%{?rhel} >= 6
+# Disable bogofilter subpackage if EL6+
+%define disable_bogofilter 1
+%endif
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -46,7 +52,7 @@
 
 Name: evolution
 Version: 2.28.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -199,7 +205,7 @@ This package contains conduits for synchronizing PalmPilot<tm> or other
 PalmOS<tm> devices with %{name}.
 %endif
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6+
 %package bogofilter
 Group: Applications/Productivity
@@ -391,7 +397,7 @@ done
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6
 rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
 rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
@@ -414,7 +420,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6
 %post bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -688,7 +694,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
-%if 0%{?rhel} >= 6
+%if ! %{disable_bogofilter}
 # Disable bogofilter subpackage if EL6
 %files bogofilter
 %defattr(-, root, root)
@@ -715,7 +721,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Dec 02 2009 Warren Togami <wtogami@redhat.com> - 2.28.1-2
+* Wed Dec 02 2009 Warren Togami <wtogami@redhat.com> - 2.28.1-3
 - Disable bogofilter subpackage if EL6+
 
 * Mon Oct 19 2009 Milan Crha <mcrha@redhat.com> - 2.28.1-1.fc12

From 17b57778d4b39b230110223ac60f8eb68768d339 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Wed, 2 Dec 2009 19:53:27 +0000
Subject: [PATCH 08/12] remove

---
 evolution.spec | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 63e9226..e37d22b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,12 +1,3 @@
-# Variable must exist even if unused
-%{?!rhel:%define rhel 0}
-%define disable_bogofilter 0
-
-%if 0%{?rhel} >= 6
-# Disable bogofilter subpackage if EL6+
-%define disable_bogofilter 1
-%endif
-
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
 %define glib2_version 2.16.0
@@ -205,8 +196,6 @@ This package contains conduits for synchronizing PalmPilot<tm> or other
 PalmOS<tm> devices with %{name}.
 %endif
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6+
 %package bogofilter
 Group: Applications/Productivity
 Summary: Bogofilter plugin for Evolution
@@ -215,7 +204,6 @@ Requires: bogofilter
 
 %description bogofilter
 This package contains the plugin to filter junk mail using Bogofilter.
-%endif
 
 %package spamassassin
 Group: Applications/Productivity
@@ -397,13 +385,6 @@ done
 grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
 grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6
-rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
-rm -f $RPM_BUILD_ROOT{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
-rm -f $RPM_BUILD_ROOT{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
-%endif
-
 %post
 /sbin/ldconfig
 scrollkeeper-update -q
@@ -420,12 +401,9 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6
 %post bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null
-%endif
 
 %postun
 /sbin/ldconfig
@@ -694,14 +672,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
-%if ! %{disable_bogofilter}
-# Disable bogofilter subpackage if EL6
 %files bogofilter
 %defattr(-, root, root)
 %{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug
 %{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
 %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
-%endif
 
 %files spamassassin
 %defattr(-, root, root)
@@ -721,9 +696,6 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Dec 02 2009 Warren Togami <wtogami@redhat.com> - 2.28.1-3
-- Disable bogofilter subpackage if EL6+
-
 * Mon Oct 19 2009 Milan Crha <mcrha@redhat.com> - 2.28.1-1.fc12
 - Update to 2.28.1
 - Remove patch 'Tweak desktop file for GNOME Shell' (fixed upstream).

From 49d633cd2b43b3ece59d84e3b7e43996889b3bc3 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Wed, 2 Dec 2009 19:53:47 +0000
Subject: [PATCH 09/12] bump

---
 evolution.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index e37d22b..77431a4 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 2.28.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL

From 4bf1a351f83be06fc76726699b2803ca82c886ea Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@fedoraproject.org>
Date: Mon, 14 Dec 2009 15:34:50 +0000
Subject: [PATCH 10/12] - Update to 2.28.2

---
 .cvsignore     | 2 +-
 evolution.spec | 7 +++++--
 sources        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index e9f6b00..ddb0a47 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.28.1.tar.bz2
+evolution-2.28.2.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 77431a4..142da08 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.28.1
-Release: 4%{?dist}
+Version: 2.28.2
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec 14 2009 Milan Crha <mcrha@redhat.com> - 2.28.2-1.fc12
+- Update to 2.28.2
+
 * Mon Oct 19 2009 Milan Crha <mcrha@redhat.com> - 2.28.1-1.fc12
 - Update to 2.28.1
 - Remove patch 'Tweak desktop file for GNOME Shell' (fixed upstream).
diff --git a/sources b/sources
index def1746..577ad3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15043e64f22000f6f0bf57e0373c7169  evolution-2.28.1.tar.bz2
+2af2e699cd8a46b8f7b9baec3184f685  evolution-2.28.2.tar.bz2

From b7ef9b6493531c38fcef1841819f871f4c0fc0e1 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Tue, 2 Mar 2010 03:52:57 +0000
Subject: [PATCH 11/12] - Update to 2.28.3

---
 .cvsignore     | 2 +-
 evolution.spec | 5 ++++-
 sources        | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ddb0a47..6db41c9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.28.2.tar.bz2
+evolution-2.28.3.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 142da08..287c789 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,7 +42,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.28.2
+Version: 2.28.3
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Mar 01 2010 Matthew Barnes <mbarnes@redhat.com> - 2.28.3-1.fc12
+- Update to 2.28.3
+
 * Mon Dec 14 2009 Milan Crha <mcrha@redhat.com> - 2.28.2-1.fc12
 - Update to 2.28.2
 
diff --git a/sources b/sources
index 577ad3d..352634e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2af2e699cd8a46b8f7b9baec3184f685  evolution-2.28.2.tar.bz2
+23424e7e4be8b1c066a6b8a939a2c582  evolution-2.28.3.tar.bz2

From ad2d267cd8fad2619a98fb1469423a0943d7b746 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 14:00:55 +0000
Subject: [PATCH 12/12] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c22b7db..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: evolution
-# $Id: Makefile,v 1.2 2007/10/15 18:44:15 notting Exp $
-NAME := evolution
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index 06de2d2..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-12