rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Attempt to split the gnome-pilot stuff into a separate evolution-conduits

Browse Source 
subpackage (RH bug #178155).
This commit is contained in:
Matthew Barnes 2007-10-30 16:27:34 +00:00
parent 5e441ab5cd
commit 4e4dfca454
5 changed files with 50 additions and 3141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1167
evolution-2.10.0-e-source-combo-box.patch
View File

File diff suppressed because it is too large Load Diff

1788
evolution-2.11.92-icon-names.patch
View File

File diff suppressed because it is too large Load Diff

129
evolution-2.11.92-mail-attachment.patch
View File

@ -1,129 +0,0 @@
diff -up evolution-2.11.92/mail/em-folder-browser.c.mail-attachment evolution-2.11.92/mail/em-folder-browser.c
--- evolution-2.11.92/mail/em-folder-browser.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/mail/em-folder-browser.c 2007-09-11 18:58:15.000000000 -0400
@@ -218,7 +218,7 @@ static EMFBSearchBarItem temp_view_items
{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},
{{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL},
{{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL},
- {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "stock_attach"},
+ {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"},
{{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"},
{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"},
/* { NULL, 0, NULL }, */
diff -up evolution-2.11.92/mail/message-list.c.mail-attachment evolution-2.11.92/mail/message-list.c
--- evolution-2.11.92/mail/message-list.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/mail/message-list.c 2007-09-11 18:58:15.000000000 -0400
@@ -223,7 +223,7 @@ static struct {
{ "stock_mail-unread-multiple", NULL },
{ "stock_mail-open-multiple", NULL },
{ NULL, NULL },
- { "stock_attach", NULL },
+ { "mail-attachment", NULL },
{ "emblem-important", NULL },
{ "stock_score-lowest", NULL },
{ "stock_score-lower", NULL },
diff -up evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment evolution-2.11.92/widgets/misc/e-attachment-bar.c
--- evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment 2007-09-02 14:57:07.000000000 -0400
+++ evolution-2.11.92/widgets/misc/e-attachment-bar.c 2007-09-11 18:58:15.000000000 -0400
@@ -281,8 +281,7 @@ update (EAttachmentBar *bar)
attachment = priv->attachments->pdata[i];
if (!attachment->is_available_local || !attachment->body) {
- /* stock_attach would be better, but its fugly scaled up */
- if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) {
+ if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) {
attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");
g_object_unref (pixbuf);
}
@@ -373,8 +372,7 @@ update (EAttachmentBar *bar)
pixbuf = e_icon_for_mime_type (mime_type, 48);
if (pixbuf == NULL) {
g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
- /* stock_attach would be better, but its fugly scaled up */
- pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
+ pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG);
}
g_free (mime_type);
}
diff -up evolution-2.11.92/composer/e-msg-composer.c.mail-attachment evolution-2.11.92/composer/e-msg-composer.c
--- evolution-2.11.92/composer/e-msg-composer.c.mail-attachment 2007-09-02 14:56:48.000000000 -0400
+++ evolution-2.11.92/composer/e-msg-composer.c 2007-09-11 18:58:15.000000000 -0400
@@ -2208,11 +2208,11 @@ static BonoboUIVerb verbs [] = {
};
static EPixmap pixcache [] = {
- E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,
-/* E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */
+/* E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */
E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU),
@@ -3989,7 +3989,7 @@ create_composer (int visible_mask)
gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5);
expander_hbox = gtk_hbox_new (FALSE, 0);
- p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU);
+ p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU);
gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5);
gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1);
diff -up evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-week-view.c
--- evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-week-view.c 2007-09-11 18:58:16.000000000 -0400
@@ -697,7 +697,7 @@ e_week_view_realize (GtkWidget *widget)
week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
- week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
+ week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
}
diff -up evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment evolution-2.11.92/calendar/gui/dialogs/comp-editor.c
--- evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment 2007-09-02 14:57:08.000000000 -0400
+++ evolution-2.11.92/calendar/gui/dialogs/comp-editor.c 2007-09-11 18:58:15.000000000 -0400
@@ -1486,8 +1486,8 @@ static BonoboUIVerb verbs [] = {
};
static EPixmap pixmaps[] = {
- E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
E_PIXMAP_END
};
@@ -1546,7 +1546,7 @@ setup_widgets (CompEditor *editor)
gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5);
expander_hbox = gtk_hbox_new (FALSE, 0);
- attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
+ attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf);
gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5);
gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1);
diff -up evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-day-view.c
--- evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400
+++ evolution-2.11.92/calendar/gui/e-day-view.c 2007-09-11 18:58:16.000000000 -0400
@@ -1423,7 +1423,7 @@ e_day_view_realize (GtkWidget *widget)
day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
- day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
+ day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
/* Set the canvas item colors. */
@@ -1497,7 +1497,7 @@ e_day_view_realize (GtkWidget *widget)
day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
- day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
+ day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
/* Set the canvas item colors. */

21
evolution-2.6.0-prototypes.patch
View File

@ -1,21 +0,0 @@
--- evolution-2.6.0/calendar/gui/dialogs/event-page.c.prototypes 2006-03-14 01:00:04.000000000 -0500
+++ evolution-2.6.0/calendar/gui/dialogs/event-page.c 2006-03-14 01:00:21.000000000 -0500
@@ -59,6 +59,8 @@
#include "event-page.h"
#include "e-send-options-utils.h"
+GtkWidget *alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store);
+
/* Private part of the EventPage structure */
--- evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c.prototypes 2006-03-13 14:14:07.000000000 -0500
+++ evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c 2006-03-13 14:14:24.000000000 -0500
@@ -32,6 +32,7 @@
#include "../calendar-config.h"
#include "cal-prefs-dialog.h"
#include <libgnomeui/gnome-color-picker.h>
+#include <libgnomeui/gnome-file-entry.h>
#include <widgets/misc/e-dateedit.h>
#include <e-util/e-dialog-widgets.h>
#include <e-util/e-util-private.h>

86
evolution.spec
View File

@ -30,9 +30,9 @@
%define nm_support 0
%endif
%ifarch s390 s390x
%define pilot_support 0
%define build_conduits 0
%else
%define pilot_support 1
%define build_conduits 1
%endif
%define use_mozilla_nss 1
@ -45,7 +45,7 @@
Name: evolution
Version: 2.21.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2 and GFDL+
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@ -174,7 +174,7 @@ BuildRequires: gstreamer-devel
BuildRequires: openldap-devel >= 2.0.11
%endif
%if %{pilot_support}
%if %{build_conduits}
BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version}
# bleah, gnome-pilot really sucks this in, but then I have to have an explicit
# versioning for gnome-pilot when it changes less than pilot-link itself
@ -199,13 +199,13 @@ BuildRequires: libnotify-devel
%description
Evolution is the GNOME mailer, calendar, contact manager and
communications tool. The tools which make up Evolution will
be tightly integrated with one another and act as a seamless
communications tool. The components which make up Evolution
are tightly integrated with one another and act as a seamless
personal information-management tool.
%package devel
Group: Development/Libraries
Summary: Development files for building against evolution
Summary: Development files for building against %{name}
Requires: %{name} = %{version}
Requires: evolution-data-server-devel >= %{eds_version}
Requires: gtkhtml3-devel >= %{gtkhtml_version}
@ -214,15 +214,27 @@ Requires: libxml2-devel
Obsoletes: libgal2-devel <= %{last_libgal2_version}
%description devel
Development files needed for building things which link against evolution.
Development files needed for building things which link against %{name}.
%package help
Group: Applications/Productivity
Summary: Help files for Evolution
Summary: Help files for %{name}
Requires: %{name} = %{version}-%{release}
%description help
This package contains the help for Evolution.
This package contains user documentation for %{name}.
%if %{build_conduits}
%package conduits
Group: Applictions/Communications
Summary: gnome-pilot conduits for %{name}
Requires: %{name} = %{version}-%{release}
Requires: gnome-pilot >= %{gnome_pilot_version}
%description conduits
The package contains conduits for synchronizing PalmPilot<tm> or other
PalmOS<tm> devices with %{name}.
%endif
%prep
%setup -q -n evolution-%{version}
@ -261,10 +273,10 @@ done
%define ldap_flags --without-openldap
%endif
%if %{pilot_support}
%define pilot_flags --enable-pilot-conduits=yes
%if %{build_conduits}
%define pilot_flags --enable-pilot-conduits
%else
%define pilot_flags --enable-pilot-conduits=no
%define pilot_flags --disable-pilot-conduits
%endif
%if %{krb5_support}
@ -274,9 +286,9 @@ done
%endif
%if %{nntp_support}
%define nntp_flags --enable-nntp=yes
%define nntp_flags --enable-nntp
%else
%define nntp_flags --enable-nntp=no
%define nntp_flags --disable-nntp
%endif
%if %{use_mozilla_nss}
@ -293,9 +305,9 @@ fi
%endif
%if %{exchange_support}
%define exchange_flags --enable-exchange=yes
%define exchange_flags --enable-exchange
%else
%define exchange_flags --enable-exchange=no
%define exchange_flags --disable-exchange
%endif
CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
@ -486,24 +498,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
%{_libexecdir}/evolution/%{evo_major}/killev
# Various conduits for gnome-pilot:
%if %{pilot_support}
%dir %{_libdir}/evolution/%{evo_major}/conduits
%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
%{_libdir}/gnome-pilot/conduits/e-address.conduit
%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so
%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
%{_libdir}/gnome-pilot/conduits/e-calendar.conduit
%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so
%{_libdir}/gnome-pilot/conduits/e-memo.conduit
%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so
%{_libdir}/gnome-pilot/conduits/e-todo.conduit
%endif
# The plugin directory:
%dir %{evo_plugin_dir}
@ -667,10 +661,30 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so
%files help -f help.lang
%defattr(-, root, root)
%dir %{_datadir}/omf/evolution
%if %{build_conduits}
%files conduits
%defattr(-, root, root)
%dir %{_libdir}/evolution/%{evo_major}/conduits
%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so
%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so
%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so
%{_libdir}/gnome-pilot/conduits/e-address.conduit
%{_libdir}/gnome-pilot/conduits/e-calendar.conduit
%{_libdir}/gnome-pilot/conduits/e-memo.conduit
%{_libdir}/gnome-pilot/conduits/e-todo.conduit
%endif
%changelog
* Mon Oct 29 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.1-2.fc9
* Tue Oct 30 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.1-2.fc9
- Attempt to split the gnome-pilot stuff into a separate
evolution-conduits subpackage (RH bug #178155).
* Mon Oct 29 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.1-1.fc9
- Update to 2.21.1
- Remove redundant requirements.
- Bump EDS requirement to 2.21.1.