From 4c0e75ffb634b1ac27e7025ef1ba1798fc271c4b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 3 Aug 2006 18:12:42 +0000 Subject: [PATCH] - Remove patch for RH bug #167157, as it fixed it the wrong way. - The real fix for #167157 is in evolution-data-server-1.7.4-5. - No longer packaging unused patches. --- evolution.spec | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/evolution.spec b/evolution.spec index 8e33ba8..92c2f13 100644 --- a/evolution.spec +++ b/evolution.spec @@ -48,7 +48,7 @@ Name: evolution Version: 2.7.4 -Release: 4 +Release: 5 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -79,16 +79,20 @@ Patch14: evolution-2.4.1-hide-switcher-buttons-by-default.patch # Patch15: 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. Patch16: 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). 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.7.1-notification-cleanups.patch -Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.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 # Gnome.org #343331 @@ -112,13 +116,9 @@ Patch28: evolution-2.7.3-submit-bug-report.patch # RH bug #178295 / Gnome.org bug #348638 Patch29: evolution-2.7.4-deleting-preedit-buffer.patch -# RH bug #167157 / Gnome.org bug #334464 -Patch30: evolution-2.7.4-fix-crash-on-paste.patch - ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} -Requires: ORBit2 >= 2.7.5 Requires: dbus >= %{dbus_version} Requires: evolution-data-server >= %{eds_version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -232,13 +232,13 @@ Development files needed for building things which link against evolution. %patch12 -p1 -b .move-autosave-file %patch13 -p1 -b .fix-164957 %patch14 -p1 -b .hide-switcher-buttons-by-default -#patch15 -p1 -b .fix-conduits +#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 .notification-cleanups -%patch21 -p1 -b .fix-missing-declarations-2.5.5.1 +%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 @@ -247,7 +247,6 @@ Development files needed for building things which link against evolution. %patch27 -p1 -b .replicated-cjk-input %patch28 -p1 -b .submit-bug-report %patch29 -p1 -b .deleting-preedit-buffer -%patch30 -p1 -b .fix-crash-on-paste mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -638,6 +637,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Aug 2 2006 Matthew Barnes - 2.7.4-5 +- Remove patch for RH bug #167157, as it fixed it the wrong way. +- The real fix for #167157 is in evolution-data-server-1.7.4-5. +- No longer packaging unused patches. + * Mon Jul 31 2006 Matthew Barnes - 2.7.4-4 - Add patch for RH bug #178295. - Add patch for RH bug #167157.