rpms/evolution/FC-5 evolution-2.6.2-no-gnome-common.patch, NONE, 1.1 .cvsignore, 1.46, 1.47 evolution.spec, 1.136, 1.137 sources, 1.47, 1.48 evolution-2.5.2-no-gnome-common.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: mbarnes

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

Modified Files:
	.cvsignore evolution.spec sources 
Added Files:
	evolution-2.6.2-no-gnome-common.patch 
Removed Files:
	evolution-2.5.2-no-gnome-common.patch 
Log Message:
- Update to 2.6.2
- Remove NSS/NSPR chunk from evolution-2.5.2-no-gnome-common.patch
  (fixed upstream) and rename to version 2.6.2.


evolution-2.6.2-no-gnome-common.patch:
 configure.in |    3 ---
 1 files changed, 3 deletions(-)

--- NEW FILE evolution-2.6.2-no-gnome-common.patch ---
--- evolution-2.5.2/configure.in.mozillanss   2005-12-15 22:16:46.000000000 -0500
+++ evolution-2.5.2/configure.in      2005-12-15 22:41:29.000000000 -0500
@@ -1127,9 +1135,6 @@
 dnl *************************
 dnl CFLAGS and LIBS and stuff
 dnl *************************
-
-GNOME_COMPILE_WARNINGS(yes)
-CFLAGS="$CFLAGS $WARN_CFLAGS"
 case $CFLAGS in
 *-Wall*)
 	# Turn off the annoying "comparison between signed and unsigned"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	13 Mar 2006 17:45:46 -0000	1.46
+++ .cvsignore	30 May 2006 14:30:46 -0000	1.47
@@ -1 +1 @@
-evolution-2.6.0.tar.bz2
+evolution-2.6.2.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- evolution.spec	12 Apr 2006 13:34:28 -0000	1.136
+++ evolution.spec	30 May 2006 14:30:46 -0000	1.137
@@ -38,8 +38,8 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.6.1
-Release: 1.fc5.2
+Version: 2.6.2
+Release: 1.fc5.1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -94,7 +94,7 @@
 Patch802: evolution-2.5.4-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.5.2-no-gnome-common.patch
+Patch803: evolution-2.6.2-no-gnome-common.patch
 
 Patch804: evolution-2.4.1-fix-missing-declarations.patch
 Patch805: evolution-2.5.4-fix-missing-declarations.patch
@@ -635,6 +635,11 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue May 30 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.2-1.fc5.1
+- Update to 2.6.2
+- Remove NSS/NSPR chunk from evolution-2.5.2-no-gnome-common.patch
+  (fixed upstream) and rename to version 2.6.2.
+
 * Wed Apr 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.1-1.fc5.2
 - Rebuild against new (old) pilot-link
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	11 Apr 2006 03:07:22 -0000	1.47
+++ sources	30 May 2006 14:30:46 -0000	1.48
@@ -1 +1 @@
-6ca70a86e6d8e8b3824e58f28a362065  evolution-2.6.1.tar.bz2
+24b97cf70a3c1e9e34f6e328e6910ab1  evolution-2.6.2.tar.bz2


--- evolution-2.5.2-no-gnome-common.patch DELETED ---