rpms/evolution/devel .cvsignore, 1.83, 1.84 evolution.spec, 1.314, 1.315 sources, 1.83, 1.84 evolution-2.21.4-bugzilla-component.patch, 1.1, NONE evolution-2.21.4-too-noisy.patch, 1.1, NONE evolution-2.5.5.1-commit-enter-on-calendar.patch, 1.1, NONE evolution-2.7.3-replicated-cjk-input.patch, 1.2, NONE evolution-2.7.4-deleting-preedit-buffer.patch, 1.2, NONE evolution-2.8.1-kill-ethread.patch, 1.20, NONE

Matthew Barnes (mbarnes) fedora-extras-commits at redhat.com
Mon Jan 14 23:17:41 UTC 2008


Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17141

Modified Files:
	.cvsignore evolution.spec sources 
Removed Files:
	evolution-2.21.4-bugzilla-component.patch 
	evolution-2.21.4-too-noisy.patch 
	evolution-2.5.5.1-commit-enter-on-calendar.patch 
	evolution-2.7.3-replicated-cjk-input.patch 
	evolution-2.7.4-deleting-preedit-buffer.patch 
	evolution-2.8.1-kill-ethread.patch 
Log Message:

* Mon Jan 14 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.5-1.fc9
- Update to 2.21.5
- The backup-restore plugin is stable again.
- Remove patch for RH bug #154360 (fixed upstream).
- Remove patch for RH bug #166231 (obsolete, possibly fixed upstream).
- Remove patch for RH bug #178295 (fixed upstream).
- Remove patch for GNOME bug #362638 (fixed upstream).
- Remove patch for GNOME bug #504030 (fixed upstream).
- Remove patch for GNOME bug #507311 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .cvsignore	18 Dec 2007 02:48:03 -0000	1.83
+++ .cvsignore	14 Jan 2008 23:16:30 -0000	1.84
@@ -1 +1 @@
-evolution-2.21.4.tar.bz2
+evolution-2.21.5.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- evolution.spec	6 Jan 2008 00:34:54 -0000	1.314
+++ evolution.spec	14 Jan 2008 23:16:30 -0000	1.315
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.21.4
-Release: 2%{?dist}
+Version: 2.21.5
+Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -60,51 +60,33 @@
 # bad hack
 Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
 
-# Fix for RH bug #154360:
-Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch
-
 # Fix for RH bug 164957 (was for 145552):
-Patch12: evolution-2.0.2-fix-145552.patch
+Patch11: evolution-2.0.2-fix-145552.patch
 
 # Patches for conduits, based upon
 # rh-161817-attach-116019-conduit_pilot_link_updates.diff
 # (the latter patch was originally by Mark G. Adams):
-# Patch13: evolution-2.5.4-fix-conduits.patch
+# Patch12: evolution-2.5.4-fix-conduits.patch
 
 # Move .conduit files from share to lib (for the sake of multilib)
 # This patch effects other parts of evolution.spec and so is necessary
 # for a successful build.
-Patch14: evolution-2.5.4-fix-conduit-dir.patch
+Patch13: evolution-2.5.4-fix-conduit-dir.patch
 
 # Remove gnome-common macros from configure.in.
 # We do not ship gnome-common (or at least we're not supposed to).
-Patch15: evolution-2.7.1-no-gnome-common.patch
-
-#Patch16: evolution-2.7.1-notification-cleanups.patch
-
-# RH bug #166231 / GNOME bug #264485
-Patch17: evolution-2.7.3-replicated-cjk-input.patch
+Patch14: evolution-2.7.1-no-gnome-common.patch
 
-# RH bug #178295 / GNOME bug #348638
-Patch18: evolution-2.7.4-deleting-preedit-buffer.patch
-
-# GNOME bug #362638
-Patch19: evolution-2.8.1-kill-ethread.patch
+#Patch15: evolution-2.7.1-notification-cleanups.patch
 
 # GNOME bug #363695
-Patch20: evolution-2.9.1-kill-ememory.patch
+Patch16: evolution-2.9.1-kill-ememory.patch
 
 # RH bug #176400
-Patch21: evolution-2.9.1-im-context-reset.patch
+Patch17: evolution-2.9.1-im-context-reset.patch
 
 # RH bug #215478 / GNOME bug #383842
-Patch22: evolution-2.9.3-source-path-entry.patch
-
-# GNOME bug #504030
-Patch23: evolution-2.21.4-too-noisy.patch
-
-# GNOME bug #507311
-Patch24: evolution-2.21.4-bugzilla-component.patch
+Patch18: evolution-2.9.3-source-path-entry.patch
 
 ## Dependencies ###
 
@@ -242,20 +224,14 @@
 %prep
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
-%patch11 -p1 -b .commit-enter-on-calendar
-%patch12 -p1 -b .fix-164957
-#patch13 -p1 -b .fix-conduits  # leave commented
-%patch14 -p1 -b .fix-conduit-dir
-%patch15 -p1 -b .no-gnome-common
-#patch16 -p1 -b .notification-cleanups
-%patch17 -p1 -b .replicated-cjk-input
-%patch18 -p1 -b .deleting-preedit-buffer
-%patch19 -p1 -b .kill-ethread
-%patch20 -p1 -b .kill-ememory
-%patch21 -p1 -b .im-context-reset
-%patch22 -p1 -b .source-path-entry
-%patch23 -p1 -b .too-noisy
-%patch24 -p1 -b .bugzilla-component
+%patch11 -p1 -b .fix-164957
+#patch12 -p1 -b .fix-conduits  # leave commented
+%patch13 -p1 -b .fix-conduit-dir
+%patch14 -p1 -b .no-gnome-common
+#patch15 -p1 -b .notification-cleanups
+%patch16 -p1 -b .kill-ememory
+%patch17 -p1 -b .im-context-reset
+%patch18 -p1 -b .source-path-entry
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -499,6 +475,7 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
 %{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
+%{_libexecdir}/evolution/%{evo_major}/evolution-backup
 %{_libexecdir}/evolution/%{evo_major}/killev
 
 # The plugin directory:
@@ -524,6 +501,10 @@
 %{evo_plugin_dir}/liborg-gnome-audio-inline.so
 %endif
 
+%{evo_plugin_dir}/org-gnome-backup-restore.eplug
+%{evo_plugin_dir}/org-gnome-backup-restore.xml
+%{evo_plugin_dir}/liborg-gnome-backup-restore.so
+
 %{evo_plugin_dir}/org-gnome-calendar-file.eplug
 %{evo_plugin_dir}/liborg-gnome-calendar-file.so
 
@@ -593,9 +574,6 @@
 %{evo_plugin_dir}/org-gnome-mark-calendar-offline.eplug
 %{evo_plugin_dir}/liborg-gnome-mark-calendar-offline.so
 
-%{evo_plugin_dir}/org-gnome-new-mail-notify.eplug
-%{evo_plugin_dir}/liborg-gnome-new-mail-notify.so
-
 %{evo_plugin_dir}/org-gnome-plugin-manager.eplug
 %{evo_plugin_dir}/liborg-gnome-plugin-manager.so
 %{evo_plugin_dir}/org-gnome-plugin-manager.xml
@@ -688,7 +666,17 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
-* Sat Jun 05 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.4-2.fc9
+* Mon Jan 14 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.5-1.fc9
+- Update to 2.21.5
+- The backup-restore plugin is stable again.
+- Remove patch for RH bug #154360 (fixed upstream).
+- Remove patch for RH bug #166231 (obsolete, possibly fixed upstream).
+- Remove patch for RH bug #178295 (fixed upstream).
+- Remove patch for GNOME bug #362638 (fixed upstream).
+- Remove patch for GNOME bug #504030 (fixed upstream).
+- Remove patch for GNOME bug #507311 (fixed upstream).
+
+* Sat Jan 05 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.4-2.fc9
 - Add patch for GNOME bug #507311 (send Bug Buddy reports to the new
   BugBuddyBugs Bugzilla component).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	18 Dec 2007 02:48:03 -0000	1.83
+++ sources	14 Jan 2008 23:16:30 -0000	1.84
@@ -1 +1 @@
-04f7d3aada64a21b6ee41ff4164f4246  evolution-2.21.4.tar.bz2
+80982f22860e447e51ddc4475cfedd70  evolution-2.21.5.tar.bz2


--- evolution-2.21.4-bugzilla-component.patch DELETED ---


--- evolution-2.21.4-too-noisy.patch DELETED ---


--- evolution-2.5.5.1-commit-enter-on-calendar.patch DELETED ---


--- evolution-2.7.3-replicated-cjk-input.patch DELETED ---


--- evolution-2.7.4-deleting-preedit-buffer.patch DELETED ---


--- evolution-2.8.1-kill-ethread.patch DELETED ---




More information about the fedora-extras-commits mailing list