rpms/evolution/devel evolution.spec, 1.171, 1.172 evo-conduits-multi-day-crash.patch, 1.1, NONE evolution-2.0.2-fix_alarm_notify_cleanup.patch, 1.1, NONE evolution-2.0.2-unmatched-vfolder-properties-141458.patch, 1.1, NONE evolution-2.1.6-gcc4-fixes.patch, 1.1, NONE evolution-2.2.0-XB73192.patch, 1.1, NONE evolution-2.2.0-fix-for-dbus31.patch, 1.1, NONE evolution-2.2.1.1-XB73844.patch, 1.1, NONE evolution-2.2.2-commit-enter-on-calendar.patch, 1.2, NONE evolution-2.2.2-fix-new-mail-notify.patch, 1.1, NONE evolution-2.3.5.1-fix-150458.patch, 1.3, NONE evolution-2.7.4-fix-crash-on-paste.patch, 1.1, NONE gb-309138-attach-48417-fix-evo-conduit-memleaks.patch, 1.1, NONE rh-161817-attach-116019-conduit_pilot_link_updates.diff, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Aug 3 18:12:45 UTC 2006
Author: mbarnes
Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24476
Modified Files:
evolution.spec
Removed Files:
evo-conduits-multi-day-crash.patch
evolution-2.0.2-fix_alarm_notify_cleanup.patch
evolution-2.0.2-unmatched-vfolder-properties-141458.patch
evolution-2.1.6-gcc4-fixes.patch evolution-2.2.0-XB73192.patch
evolution-2.2.0-fix-for-dbus31.patch
evolution-2.2.1.1-XB73844.patch
evolution-2.2.2-commit-enter-on-calendar.patch
evolution-2.2.2-fix-new-mail-notify.patch
evolution-2.3.5.1-fix-150458.patch
evolution-2.7.4-fix-crash-on-paste.patch
gb-309138-attach-48417-fix-evo-conduit-memleaks.patch
rh-161817-attach-116019-conduit_pilot_link_updates.diff
Log Message:
- 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.
Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- evolution.spec 31 Jul 2006 19:06:03 -0000 1.171
+++ evolution.spec 3 Aug 2006 18:12:42 -0000 1.172
@@ -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 @@
# 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 @@
# 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 @@
%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 @@
%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 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* Wed Aug 2 2006 Matthew Barnes <mbarnes at redhat.com> - 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 <mbarnes at redhat.com> - 2.7.4-4
- Add patch for RH bug #178295.
- Add patch for RH bug #167157.
--- evo-conduits-multi-day-crash.patch DELETED ---
--- evolution-2.0.2-fix_alarm_notify_cleanup.patch DELETED ---
--- evolution-2.0.2-unmatched-vfolder-properties-141458.patch DELETED ---
--- evolution-2.1.6-gcc4-fixes.patch DELETED ---
--- evolution-2.2.0-XB73192.patch DELETED ---
--- evolution-2.2.0-fix-for-dbus31.patch DELETED ---
--- evolution-2.2.1.1-XB73844.patch DELETED ---
--- evolution-2.2.2-commit-enter-on-calendar.patch DELETED ---
--- evolution-2.2.2-fix-new-mail-notify.patch DELETED ---
--- evolution-2.3.5.1-fix-150458.patch DELETED ---
--- evolution-2.7.4-fix-crash-on-paste.patch DELETED ---
--- gb-309138-attach-48417-fix-evo-conduit-memleaks.patch DELETED ---
--- rh-161817-attach-116019-conduit_pilot_link_updates.diff DELETED ---
More information about the fedora-cvs-commits
mailing list