diff --git a/.cvsignore b/.cvsignore index c2c65c4..d42406a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.3.tar.bz2 +evolution-2.7.4.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 7058dc3..38eefa7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,8 +46,8 @@ ### Abstract ### Name: evolution -Version: 2.7.3 -Release: 10.1 +Version: 2.7.4 +Release: 1 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -67,7 +67,6 @@ Patch98: evolution-1.4.4-ldap-x86_64-hack.patch # patches sent upstream Patch100: evo-addressbook-print-with-pango-2.patch -Patch101: evo-calendar-print-with-pango-7.patch #Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch @@ -116,26 +115,20 @@ Patch809: evolution-2.6.0-prototypes.patch # Gnome.org #343331 Patch900: evolution-2.7.2.1-quit-resize-crash.patch -# Gnome.org #345677 - fixed upstream -Patch901: evolution-2.7.3-no-boolean-in-schemas.patch - # RH bug #157400 / Gnome.org bug #303877 -Patch902: evolution-2.7.3-candidate-window-position-task.patch +Patch901: evolution-2.7.3-candidate-window-position-task.patch # RH bug #157505 / Gnome.org bug #303878 -Patch903: evolution-2.7.3-candidate-window-position-calendar.patch +Patch902: evolution-2.7.3-candidate-window-position-calendar.patch # RH bug #190359 / Gnome.org bug #211058 -Patch904: evolution-2.7.3-filter-datespec.patch - -# RH bug #175596 / Gnome.org bug #323952 -Patch905: evolution-2.7.3-mailing-list-menu.patch +Patch903: evolution-2.7.3-filter-datespec.patch # RH bug #166231 / Gnome.org bug #264485 -Patch906: evolution-2.7.3-replicated-cjk-input.patch +Patch904: evolution-2.7.3-replicated-cjk-input.patch # RH bug #197834 / Gnome.org bug #346797 -Patch907: evolution-2.7.3-submit-bug-report.patch +Patch905: evolution-2.7.3-submit-bug-report.patch ### Dependencies ### @@ -264,7 +257,7 @@ Development files needed for building things which link against evolution. # patches sent upstream #%patch100 -p0 -b .addressbook-print-with-pango -%patch101 -p1 -b .calendar-print-with-pango +#%patch101 -p1 -b .calendar-print-with-pango %patch106 -p1 -b .commit-enter-on-calendar %patch107 -p1 -b .move-autosave-file @@ -289,13 +282,11 @@ Development files needed for building things which link against evolution. # %patch810 -p1 -b .preedit-gnome.bz-264485 -- commented as patch 810 was unconfirmed -- majain@redhat.com %patch900 -p1 -b .quit-resize-crash -%patch901 -p1 -b .no-boolean-in-schemas -%patch902 -p1 -b .candidate-window-position-task -%patch903 -p1 -b .candidate-window-position-calendar -%patch904 -p1 -b .filter-datespec -%patch905 -p1 -b .mailing-list-menu -%patch906 -p1 -b .replicated-cjk-input -%patch907 -p1 -b .submit-bug-report +%patch901 -p1 -b .candidate-window-position-task +%patch902 -p1 -b .candidate-window-position-calendar +%patch903 -p1 -b .filter-datespec +%patch904 -p1 -b .replicated-cjk-input +%patch905 -p1 -b .submit-bug-report mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -686,6 +677,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jul 12 2006 Matthew Barnes - 2.7.4-1 +- Update to 2.7.4 +- Remove evo-calendar-print-with-pango-7.patch (fixed upstream). +- Remove patch for Gnome.org bug #345677 (fixed upstream). +- Remove patch for RH bug #175596 (fixed upstream). + * Wed Jul 12 2006 Jesse Keating - 2.7.3-10.1 - rebuild diff --git a/sources b/sources index ed9ff1f..30619cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6f155e9c5d5a11ff61ef364752af6a9 evolution-2.7.3.tar.bz2 +5d9770b3d86953e8edcd36ec9f9b8852 evolution-2.7.4.tar.bz2