- 2.4.1

- regenerate patch 101 to handle conflict in calendar/gui.print.c:
    print_week_day_event introduced by fix to upstream bug
244981 (end date added while printing in the week view); bump patch name
    from version 5 to version 6
- removed patch 804 (conduits-multi-day-crash); this is now in upstream
    tarball

.cvsignore

@@ -1 +1 @@
-evolution-2.4.0.tar.bz2
+evolution-2.4.1.tar.bz2

evolution.spec

@@ -26,8 +26,8 @@
 %define exchange_support 1
 
 Name: evolution
-Version: 2.4.0
-Release: 2
+Version: 2.4.1
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -45,7 +45,7 @@ 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-5.patch
+Patch101: evo-calendar-print-with-pango-6.patch
 
 #Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
 
@@ -81,9 +81,6 @@ Patch802: evolution-2.2.2-fix-conduit-dir.patch
 # Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools):
 Patch803: evolution-2.2.2-no-gnome-common.patch
 
-# Patch for RH bug 157074:
-Patch804: evo-conduits-multi-day-crash.patch
-
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
 
@@ -204,7 +201,6 @@ cd ../..
 %patch800 -p0 -b .fix-conduits
 %patch802 -p1 -b .fix-conduit-dir
 %patch803 -p1 -b .no-gnome-common
-%patch804 -p0 -b .conduits-multi-day-crash
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -366,6 +362,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Tue Oct  4 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-1
+- 2.4.1
+- regenerate patch 101 to handle conflict in 
+  calendar/gui.print.c: print_week_day_event introduced by fix to upstream bug
+  244981 (end date added while printing in the week view); bump patch name from
+  version 5 to version 6
+- removed patch 804 (conduits-multi-day-crash); this is now in upstream tarball
+
 * Wed Sep 14 2005 Jeremy Katz <katzj@redhat.com> - 2.4.0-2
 - rebuild for mozilla on ppc64
 

sources

@@ -1 +1 @@
-c6b38b9a6ba920be5a859e9ed368508d  evolution-2.4.0.tar.bz2
+13235405e08d14a54129e3a65548f58e  evolution-2.4.1.tar.bz2