rpms/evolution/devel evolution-2.9.3-implicit-function-declaration.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 evolution-2.9.2-gtk-font-button.patch, 1.1, 1.2 evolution.spec, 1.206, 1.207 sources, 1.60, 1.61 evolution-2.8.0-more-deprecated.patch, 1.1, NONE

Tue Dec 5 12:36:32 UTC 2006

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-2.9.2-gtk-font-button.patch 
	evolution.spec sources 
Added Files:
	evolution-2.9.3-implicit-function-declaration.patch 
Removed Files:
	evolution-2.8.0-more-deprecated.patch 
Log Message:

* Mon Dec 04 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-1.fc7
- Update to 2.9.3
- Add patch for GNOME bug #382431 (implicit function declaration).
- Remove patch for GNOME bug #357970 (fixed upstream).


evolution-2.9.3-implicit-function-declaration.patch:
 em-format.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE evolution-2.9.3-implicit-function-declaration.patch ---
--- evolution-2.9.3/mail/em-format.c.implicit-function-declaration	2006-12-04 18:11:17.000000000 -0500
+++ evolution-2.9.3/mail/em-format.c	2006-12-04 18:11:44.000000000 -0500
@@ -54,6 +54,7 @@
 
 #include "em-format.h"
 #include "em-utils.h"
+#include "mail-config.h"
 
 #define d(x) 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	7 Nov 2006 11:46:54 -0000	1.60
+++ .cvsignore	5 Dec 2006 12:36:29 -0000	1.61
@@ -1 +1 @@
-evolution-2.9.2.tar.bz2
+evolution-2.9.3.tar.bz2

evolution-2.9.2-gtk-font-button.patch:
 em-mailer-prefs.c |   20 +++++++++++---------
 em-mailer-prefs.h |    6 +++---
 mail-config.glade |   32 ++++++++++++++++----------------
 3 files changed, 30 insertions(+), 28 deletions(-)

Index: evolution-2.9.2-gtk-font-button.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.9.2-gtk-font-button.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.9.2-gtk-font-button.patch	28 Nov 2006 21:35:13 -0000	1.1
+++ evolution-2.9.2-gtk-font-button.patch	5 Dec 2006 12:36:29 -0000	1.2
@@ -75,25 +75,6 @@
  	/* Loading Images */
 --- evolution-2.9.2/mail/mail-config.glade.gtk-font-button	2006-07-19 11:26:27.000000000 -0400
 +++ evolution-2.9.2/mail/mail-config.glade	2006-11-11 08:31:53.000000000 -0500
-@@ -3342,7 +3342,7 @@
- 		      <child>
- 			<widget class="GtkLabel" id="label583">
- 			  <property name="visible">True</property>
--			 <property name="label" translatable="yes">S_end message receipts:</property>
-+			  <property name="label" translatable="yes">S_end message receipts:</property>
- 			  <property name="use_underline">True</property>
- 			  <property name="use_markup">False</property>
- 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-@@ -3352,8 +3352,8 @@
- 			  <property name="yalign">0.5</property>
- 			  <property name="xpad">0</property>
- 			  <property name="ypad">0</property>
--			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- 			  <property name="mnemonic_widget">receipt_policy_dropdown</property>
-+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- 			  <property name="width_chars">-1</property>
- 			  <property name="single_line_mode">False</property>
- 			  <property name="angle">0</property>
 @@ -4700,14 +4700,14 @@
  			      </child>
  
@@ -132,33 +113,6 @@
  				  <property name="focus_on_click">True</property>
  				  <signal name="font_set" handler="changed"/>
  				</widget>
-@@ -6572,7 +6572,7 @@
- 		      <child>
- 			<widget class="GtkLabel" id="label571">
- 			  <property name="visible">True</property>
--			  <property name="label" translatable="no">    </property>
-+			  <property name="label">    </property>
- 			  <property name="use_underline">False</property>
- 			  <property name="use_markup">False</property>
- 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-@@ -6675,7 +6675,7 @@
- 		  <child>
- 		    <widget class="GtkLabel" id="label572">
- 		      <property name="visible">True</property>
--		      <property name="label" translatable="no">    </property>
-+		      <property name="label">    </property>
- 		      <property name="use_underline">False</property>
- 		      <property name="use_markup">False</property>
- 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-@@ -6731,7 +6731,7 @@
- 			  <child>
- 			    <widget class="GtkLabel" id="label575">
- 			      <property name="visible">True</property>
--			      <property name="label" translatable="no">    </property>
-+			      <property name="label">    </property>
- 			      <property name="use_underline">False</property>
- 			      <property name="use_markup">False</property>
- 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
 @@ -8484,14 +8484,14 @@
  		  </child>
  


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- evolution.spec	28 Nov 2006 21:35:13 -0000	1.206
+++ evolution.spec	5 Dec 2006 12:36:29 -0000	1.207
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.9.2
-Release: 3%{?dist}
+Version: 2.9.3
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -112,36 +112,36 @@
 # GNOME bug #357216
 Patch28: evolution-2.8.0-deprecated-gdk-font.patch
 
-# GNOME bug #357970
-Patch29: evolution-2.8.0-more-deprecated.patch
-
 # RH bug #202751 / GNOME bug #355766
-Patch30: evolution-2.8.0-fix-indic-printing.patch
+Patch29: evolution-2.8.0-fix-indic-printing.patch
 
 # GNOME bug #360946
-Patch31: evolution-2.8.1-about-dialog.patch
+Patch30: evolution-2.8.1-about-dialog.patch
 
 # GNOME bug #362638
-Patch32: evolution-2.8.1-kill-ethread.patch
+Patch31: evolution-2.8.1-kill-ethread.patch
 
 # GNOME bug #363695
-Patch33: evolution-2.9.1-kill-ememory.patch
+Patch32: evolution-2.9.1-kill-ememory.patch
 
 # RH bug #176400
-Patch34: evolution-2.9.1-im-context-reset.patch
+Patch33: evolution-2.9.1-im-context-reset.patch
 
 # RH bug #182247
-Patch35: evolution-2.9.1-first-ascii.patch
+Patch34: evolution-2.9.1-first-ascii.patch
 
 # GNOME bug #373837
-Patch36: evolution-2.9.2-gtk-font-button.patch
+Patch35: evolution-2.9.2-gtk-font-button.patch
 
 # Port evolution conduits to pilot-link 0.12
 # http://mail.gnome.org/archives/evolution-patches/2006-August/msg00083.html
-Patch37: evolution-2.9.2-pilot-link-0.12.patch
+Patch36: evolution-2.9.2-pilot-link-0.12.patch
 
 # RH bug #215466 / GNOME bug #377511
-Patch38: evolution-2.9.2-optional-participant.patch
+Patch37: evolution-2.9.2-optional-participant.patch
+
+# GNOME bug #382431
+Patch38: evolution-2.9.3-implicit-function-declaration.patch
 
 ## Dependencies ###
 
@@ -273,16 +273,16 @@
 %patch26 -p1 -b .indic-cursor-movement
 %patch27 -p1 -b .kill-emutex
 %patch28 -p1 -b .deprecated-gdk-font
-%patch29 -p1 -b .more-deprecated
-%patch30 -p1 -b .fix-indic-printing
-%patch31 -p1 -b .about-dialog
-%patch32 -p1 -b .kill-ethread
-%patch33 -p1 -b .kill-ememory
-%patch34 -p1 -b .im-context-reset
-%patch35 -p1 -b .first-ascii
-%patch36 -p1 -b .gtk-font-button
-%patch37 -p1 -b .pilot-link-0.12
-%patch38 -p1 -b .optional-participant
+%patch29 -p1 -b .fix-indic-printing
+%patch30 -p1 -b .about-dialog
+%patch31 -p1 -b .kill-ethread
+%patch32 -p1 -b .kill-ememory
+%patch33 -p1 -b .im-context-reset
+%patch34 -p1 -b .first-ascii
+%patch35 -p1 -b .gtk-font-button
+%patch36 -p1 -b .pilot-link-0.12
+%patch37 -p1 -b .optional-participant
+%patch38 -p1 -b .implicit-function-declaration
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -401,7 +401,7 @@
 %endif
 
 # scrollkeeper gets handled in %post
-rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
+rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-mail.desktop \
@@ -414,10 +414,10 @@
   $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-tasks.desktop
 
 # remove upstream desktop file; use the symlinks from above (#103826)
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop
+rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution-%{evo_major}.keys
-rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution-%{evo_major}.mime
+rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys
+rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
 
 # evolution link
 ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution
@@ -465,7 +465,7 @@
 %{_datadir}/applications/redhat-evolution-tasks.desktop
 
 # Online help:
-%{_datadir}/gnome/help/evolution-%{evo_major}
+%{_datadir}/gnome/help/evolution
 %{_datadir}/omf/evolution
 
 # IDL files (should this be in devel subpackage?)
@@ -685,6 +685,11 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Dec 04 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-1.fc7
+- Update to 2.9.3
+- Add patch for GNOME bug #382431 (implicit function declaration).
+- Remove patch for GNOME bug #357970 (fixed upstream).
+
 * Tue Nov 28 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.2-3.fc7
 - Add patch to port evolution conduits to pilot-link 0.12.
 - Add patch for RH bug #215466 (optional meeting participants).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	7 Nov 2006 11:46:54 -0000	1.60
+++ sources	5 Dec 2006 12:36:29 -0000	1.61
@@ -1 +1 @@
-d6e24a907faed31cc809455e5b0eef47  evolution-2.9.2.tar.bz2
+03c29ef09dbd1b04623f736cbd8e14a7  evolution-2.9.3.tar.bz2


--- evolution-2.8.0-more-deprecated.patch DELETED ---


