- Update to 2.9.3

- Add patch for GNOME bug #382431 (implicit function declaration).
- Remove patch for GNOME bug #357970 (fixed upstream).
This commit is contained in:
Matthew Barnes 2006-12-05 12:36:29 +00:00
parent 39e25a5f96
commit 293861cfed
4 changed files with 36 additions and 77 deletions

View File

@ -1 +1 @@
evolution-2.9.2.tar.bz2
evolution-2.9.3.tar.bz2

View File

@ -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>

View File

@ -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 @@ Patch27: evolution-2.8.0-kill-emutex.patch
# 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 @@ Development files needed for building things which link against evolution.
%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 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la
%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 @@ ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-tasks.desktop \
$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 @@ rm -rf $RPM_BUILD_ROOT
%{_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 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
* Mon Dec 04 2006 Matthew Barnes <mbarnes@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@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).

View File

@ -1 +1 @@
d6e24a907faed31cc809455e5b0eef47 evolution-2.9.2.tar.bz2
03c29ef09dbd1b04623f736cbd8e14a7 evolution-2.9.3.tar.bz2