From 570e585f7b98a393c75cd0f56e3347731918e39b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 5 Sep 2006 11:48:57 +0000 Subject: [PATCH] - Update to 2.8.0 - Remove patch for RH bug #197868 (fixed upstream). - Remove patch for RH bug #201541 (fixed upstream). - Remove patch for RH bug #201831 (fixed upstream). - Remove patch for RH bug #202383 (fixed upstream). - Remove patch for RH bug #203036 (fixed upstream). - Remove patch for Gnome.org bug #352248 (fixed upstream). - Remove patch for Gnome.org bug #352423 (fixed upstream). - Update patch for Gnome.org bug #351332 (partially fixed upstream). --- .cvsignore | 2 +- evolution.spec | 105 +++++++++++++++++++++---------------------------- sources | 2 +- 3 files changed, 46 insertions(+), 63 deletions(-) diff --git a/.cvsignore b/.cvsignore index 252164e..b2067f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.92.tar.bz2 +evolution-2.8.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 963fd65..6af4650 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.7.92 -Release: 7%{?dist} +Version: 2.8.0 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -84,62 +84,39 @@ Patch16: evolution-2.5.4-fix-conduit-dir.patch # We do not ship gnome-common (or at least we're not supposed to). Patch17: evolution-2.7.1-no-gnome-common.patch -# XXX Make sure these are still needed and push them upstream. -#Patch18: evolution-2.4.1-fix-missing-declarations.patch -#Patch19: evolution-2.5.4-fix-missing-declarations.patch -#Patch20: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch - -Patch21: evolution-2.7.1-notification-cleanups.patch -Patch22: evolution-2.6.0-prototypes.patch +#Patch18: evolution-2.7.1-notification-cleanups.patch +Patch19: evolution-2.6.0-prototypes.patch # Gnome.org #343331 -Patch23: evolution-2.7.2.1-quit-resize-crash.patch +Patch20: evolution-2.7.2.1-quit-resize-crash.patch # RH bug #157400 / Gnome.org bug #303877 -Patch24: evolution-2.7.4-candidate-window-position-task.patch +Patch21: evolution-2.7.4-candidate-window-position-task.patch # RH bug #157505 / Gnome.org bug #303878 -Patch25: evolution-2.7.4-candidate-window-position-calendar.patch +Patch22: evolution-2.7.4-candidate-window-position-calendar.patch # RH bug #190359 / Gnome.org bug #211058 -Patch26: evolution-2.7.3-filter-datespec.patch +Patch23: evolution-2.7.3-filter-datespec.patch # RH bug #166231 / Gnome.org bug #264485 -Patch27: evolution-2.7.3-replicated-cjk-input.patch +Patch24: evolution-2.7.3-replicated-cjk-input.patch # RH bug #178295 / Gnome.org bug #348638 -Patch28: evolution-2.7.4-deleting-preedit-buffer.patch - -# RH bug #197868 / Gnome.org bug #350823 -Patch29: evolution-2.7.91-default-mailer.patch - -# Gnome.org bug #351332 -Patch30: evolution-2.7.91-fix-missing-declarations.patch - -# RH bug #202383 / Gnome.org bug #351263 -Patch31: evolution-2.7.91-fix-duplicate-alarm.patch - -# RH bug #201831 / Gnome.org bug #350901 -Patch32: evolution-2.7.91-mail-account-disable.patch - -# Gnome.org bug #352248 -Patch33: evolution-2.7.91-provide-camel-exception.patch - -# Gnome.org bug #352423 -Patch34: evolution-2.7.92-uninitialized-gerror.patch +Patch25: evolution-2.7.4-deleting-preedit-buffer.patch # Gnome.org bug #352450 (2 patches) -Patch35: evolution-2.7.92-deprecated-glib.patch -Patch36: evolution-2.7.92-deprecated-gdk.patch - -# RH bug #201541 / Gnome.org bug #336983 -Patch37: evolution-2.7.92-fix-edit-copy.patch +Patch26: evolution-2.7.92-deprecated-glib.patch +Patch27: evolution-2.7.92-deprecated-gdk.patch # RH bug #202289 -Patch38: evolution-2.7.92-fix-prgname.patch +Patch28: evolution-2.7.92-fix-prgname.patch # Gnome.org bug #353472 -Patch39: evolution-2.7.92-chain-finalize.patch +Patch29: evolution-2.7.92-chain-finalize.patch + +# Gnome.org bug #351332 +Patch30: evolution-2.8.0-fix-missing-declarations.patch ### Dependencies ### @@ -260,28 +237,19 @@ Development files needed for building things which link against evolution. #patch15 -p1 -b .fix-conduits # leave commented %patch16 -p1 -b .fix-conduit-dir %patch17 -p1 -b .no-gnome-common -#patch18 -p1 -b .fix-missing-declarations -#patch19 -p1 -b .fix-missing-declarations-2-5-4 -#patch20 -p1 -b .fix-missing-declarations-2.5.5.1 -%patch21 -p1 -b .notification-cleanups -%patch22 -p1 -b .prototypes -%patch23 -p1 -b .quit-resize-crash -%patch24 -p1 -b .candidate-window-position-task -%patch25 -p1 -b .candidate-window-position-calendar -%patch26 -p1 -b .filter-datespec -%patch27 -p1 -b .replicated-cjk-input -%patch28 -p1 -b .deleting-preedit-buffer -%patch29 -p1 -b .default-mailer +#patch18 -p1 -b .notification-cleanups +%patch19 -p1 -b .prototypes +%patch20 -p1 -b .quit-resize-crash +%patch21 -p1 -b .candidate-window-position-task +%patch22 -p1 -b .candidate-window-position-calendar +%patch23 -p1 -b .filter-datespec +%patch24 -p1 -b .replicated-cjk-input +%patch25 -p1 -b .deleting-preedit-buffer +%patch26 -p1 -b .deprecated-glib +%patch27 -p1 -b .deprecated-gdk +%patch28 -p1 -b .fix-prgname +%patch29 -p1 -b .chain-finalize %patch30 -p1 -b .fix-missing-declarations -%patch31 -p1 -b .fix-duplicate-alarm -%patch32 -p1 -b .mail-account-disable -%patch33 -p1 -b .provide-camel-exception -%patch34 -p1 -b .uninitialized-gerror -%patch35 -p1 -b .deprecated-glib -%patch36 -p1 -b .deprecated-gdk -%patch37 -p1 -b .fix-edit-copy -%patch38 -p1 -b .fix-prgname -%patch39 -p1 -b .chain-finalize mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -672,6 +640,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Sep 4 2006 Matthew Barnes - 2.8.0-1.fc6 +- Update to 2.8.0 +- Remove patch for RH bug #197868 (fixed upstream). +- Remove patch for RH bug #201541 (fixed upstream). +- Remove patch for RH bug #201831 (fixed upstream). +- Remove patch for RH bug #202383 (fixed upstream). +- Remove patch for RH bug #203036 (fixed upstream). +- Remove patch for Gnome.org bug #352248 (fixed upstream). +- Remove patch for Gnome.org bug #352423 (fixed upstream). +- Update patch for Gnome.org bug #351332 (partially fixed upstream). + +* Thu Aug 31 2006 Matthew Barnes - 2.7.92-8.fc6 +- Add patch for RH bug #203036. +- Disable notification-cleanups patch. + * Tue Aug 29 2006 Matthew Barnes - 2.7.92-7.fc6 - Add patch for Gnome.org bug #353472. diff --git a/sources b/sources index de453fa..2e05537 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c8e3e26b8861365e61e7a93713a204b evolution-2.7.92.tar.bz2 +fdcdaa4f6c11cb3b42078262838967d7 evolution-2.8.0.tar.bz2