rpms/evolution/FC-6 evolution.spec, 1.196, 1.197 evolution-2.6.0-prototypes.patch, 1.3, NONE evolution-2.7.1-notification-cleanups.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: mbarnes

Update of /cvs/dist/rpms/evolution/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv4272

Modified Files:
	evolution.spec 
Removed Files:
	evolution-2.6.0-prototypes.patch 
	evolution-2.7.1-notification-cleanups.patch 
Log Message:
- Remove some old patches.
- Use stricter build settings.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-6/evolution.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- evolution.spec	19 Oct 2006 22:09:56 -0000	1.196
+++ evolution.spec	27 Oct 2006 13:31:37 -0000	1.197
@@ -82,35 +82,32 @@
 # We do not ship gnome-common (or at least we're not supposed to).
 Patch17: evolution-2.7.1-no-gnome-common.patch
 
-#Patch18: evolution-2.7.1-notification-cleanups.patch
-Patch19: evolution-2.6.0-prototypes.patch
-
 # Gnome.org #343331
-Patch20: evolution-2.7.2.1-quit-resize-crash.patch
+Patch18: evolution-2.7.2.1-quit-resize-crash.patch
 
 # RH bug #157400 / Gnome.org bug #303877
-Patch21: evolution-2.7.4-candidate-window-position-task.patch
+Patch19: evolution-2.7.4-candidate-window-position-task.patch
 
 # RH bug #157505 / Gnome.org bug #303878
-Patch22: evolution-2.7.4-candidate-window-position-calendar.patch
+Patch20: evolution-2.7.4-candidate-window-position-calendar.patch
 
 # RH bug #166231 / Gnome.org bug #264485
-Patch23: evolution-2.7.3-replicated-cjk-input.patch
+Patch21: evolution-2.7.3-replicated-cjk-input.patch
 
 # RH bug #178295 / Gnome.org bug #348638
-Patch24: evolution-2.7.4-deleting-preedit-buffer.patch
+Patch22: evolution-2.7.4-deleting-preedit-buffer.patch
 
 # RH bug #202289
-Patch25: evolution-2.7.92-fix-prgname.patch
+Patch23: evolution-2.7.92-fix-prgname.patch
 
 # RH bug #161885 / Gnome.org bug #309166
-Patch26: evolution-2.8.0-indic-cursor-movement.patch
+Patch24: evolution-2.8.0-indic-cursor-movement.patch
 
 # Gnome.org bug #357216
-Patch27: evolution-2.8.0-deprecated-gdk-font.patch
+Patch25: evolution-2.8.0-deprecated-gdk-font.patch
 
 # Gnome.org bug #357970
-Patch28: evolution-2.8.0-more-deprecated.patch
+Patch26: evolution-2.8.0-more-deprecated.patch
 
 ### Dependencies ###
 
@@ -231,17 +228,15 @@
 #patch15 -p1 -b .fix-conduits  # leave commented
 %patch16 -p1 -b .fix-conduit-dir
 %patch17 -p1 -b .no-gnome-common
-#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 .replicated-cjk-input
-%patch24 -p1 -b .deleting-preedit-buffer
-%patch25 -p1 -b .fix-prgname
-%patch26 -p1 -b .indic-cursor-movement
-%patch27 -p1 -b .deprecated-gdk-font
-%patch28 -p1 -b .more-deprecated
+%patch18 -p1 -b .quit-resize-crash
+%patch19 -p1 -b .candidate-window-position-task
+%patch20 -p1 -b .candidate-window-position-calendar
+%patch21 -p1 -b .replicated-cjk-input
+%patch22 -p1 -b .deleting-preedit-buffer
+%patch23 -p1 -b .fix-prgname
+%patch24 -p1 -b .indic-cursor-movement
+%patch25 -p1 -b .deprecated-gdk-font
+%patch26 -p1 -b .more-deprecated
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -334,13 +329,7 @@
   %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \
   --enable-plugins=all
 export tagname=CC
-
-# Do the make, with various flags:
-%if %{require_function_declarations}
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration -UGNOME_DISABLE_DEPRECATED"
-%else
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED"
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -647,7 +636,7 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
-* Thu Oct 19 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.1.1-1.fc6
+* Fri Oct 27 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.1.1-1.fc6
 - Update to 2.8.1.1
 - Use stricter build settings.
 - Make .desktop symlinks absolute (RH bug #209322).


--- evolution-2.6.0-prototypes.patch DELETED ---


--- evolution-2.7.1-notification-cleanups.patch DELETED ---