OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=4

build-fixes.diff

@@ -1,4 +1,6 @@
---- addressbook/gui/widgets/e-minicard.c
+Index: addressbook/gui/widgets/e-minicard.c
+===================================================================
+--- addressbook/gui/widgets/e-minicard.c.orig
 +++ addressbook/gui/widgets/e-minicard.c
 @@ -30,6 +30,7 @@
  #include <libgnomecanvas/gnome-canvas-pixbuf.h>
@@ -8,9 +10,11 @@
  #include <misc/e-canvas-utils.h>
  #include <misc/e-canvas.h>
  #include <libebook/e-book.h>
---- calendar/gui/calendar-component.c
+Index: calendar/gui/calendar-component.c
+===================================================================
+--- calendar/gui/calendar-component.c.orig
 +++ calendar/gui/calendar-component.c
-@@ -1302,6 +1302,8 @@
+@@ -1302,6 +1302,8 @@ create_local_item_cb (EUserCreatableItem
  		calendar_setup_new_calendar (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (component_view->calendar))));
  }
  
@@ -19,9 +23,11 @@
  static CalendarComponentView *
  create_component_view (CalendarComponent *calendar_component)
  {
---- calendar/gui/e-week-view-event-item.c
+Index: calendar/gui/e-week-view-event-item.c
+===================================================================
+--- calendar/gui/e-week-view-event-item.c.orig
 +++ calendar/gui/e-week-view-event-item.c
-@@ -1097,6 +1097,9 @@
+@@ -1097,6 +1097,9 @@ e_week_view_event_item_draw (GnomeCanvas
  			cairo_save (cr);
  			gdk_cairo_set_source_color (cr,  &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
  			cairo_set_line_width (cr, 0.7);
@@ -31,9 +37,11 @@
  			cairo_move_to (cr, rect_x2, y2);
  			cairo_line_to (cr, rect_x2, y2);
  			cairo_stroke (cr);
---- mail/mail-send-recv.c
+Index: mail/mail-send-recv.c
+===================================================================
+--- mail/mail-send-recv.c.orig
 +++ mail/mail-send-recv.c
-@@ -325,6 +325,8 @@
+@@ -325,6 +325,8 @@ dialog_map (GtkWidget *window, GdkEvent 
  	if (h > 400)
  		h = 400;
  	gtk_widget_set_usize (window, w, h);
@@ -42,14 +50,3 @@
  }
  
  static struct _send_data *
---- plugins/publish-calendar/url-editor-dialog.c
-+++ plugins/publish-calendar/url-editor-dialog.c
-@@ -285,7 +285,7 @@
- 		gtk_entry_set_text (GTK_ENTRY (dialog->server_entry), euri->host);
- 
- 	if (euri->port)
--		gtk_entry_set_text (GTK_ENTRY (dialog->port_entry), euri->port);
-+		gtk_entry_set_text (GTK_ENTRY (dialog->port_entry), (void *)euri->port);
- 
- 	if (euri->path)
- 		gtk_entry_set_text (GTK_ENTRY (dialog->file_entry), euri->path);

evolution-2.10.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46035f6ea64c9310d6f5c9ebe0cdd851e3a3d6748d0e7d545e088dd2682251c7
+size 15525569

evolution-2.9.91.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e353e6f1c8bc862aa2a947bd6b8efd8c14ae2bf7628e32b2d736c668de0b6ac9
-size 13809217

evolution.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 22 13:08:10 CST 2007 - maw@suse.de
+
+- Update to version 2.10.0
+- Update the required intltool version.
+
 -------------------------------------------------------------------
 Mon Mar 12 16:44:10 CST 2007 - maw@suse.de
 

evolution.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package evolution (Version 2.9.91)
+# spec file for package evolution (Version 2.10.0)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,14 +11,14 @@
 # norootforbuild
 
 Name:           evolution
-BuildRequires:  evolution-data-server-devel gnome-common gnome-doc-utils-devel gnome-icon-theme-devel gnome-pilot-devel gtk-doc gtkhtml2-devel intltool kdelibs3-doc libidl libnotify libnotify-devel mDNSResponder-devel mozilla-nss-devel openldap2 perl-XML-Parser python-devel scrollkeeper update-desktop-files
+BuildRequires:  evolution-data-server-devel gnome-common gnome-doc-utils-devel gnome-icon-theme-devel gnome-pilot-devel gtk-doc gtkhtml2-devel intltool kdelibs3-doc libidl libnotify libnotify-devel mDNSResponder-devel mozilla-nss-devel notification-daemon openldap2 perl-XML-Parser python-devel scrollkeeper update-desktop-files
 License:        GNU General Public License (GPL)
 Group:          Productivity/Networking/Email/Clients
 Obsoletes:      evoltn
 Provides:       evoltn
 Autoreqprov:    on
 Obsoletes:      bonobo-conf
-Version:        2.9.91
+Version:        2.10.0
 Release:        1
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.8/%{name}-%{version}.tar.bz2
@@ -335,7 +335,7 @@ make %{?jobs:-j%jobs}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/*/images/about-box.png
+cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/2.10/images/about-box.png
 %suse_update_desktop_file -G "Mail and Calendar" evolution Core-Office
 for xml in $RPM_BUILD_ROOT/%{_datadir}/gnome/help/evolution-*/*/evolution-*.xml; do
     meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
@@ -381,6 +381,8 @@ fi
 %{_datadir}/idl/*
 %{_datadir}/omf/*
 %{_datadir}/pixmaps/*.png
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_libdir}/bonobo/servers/*.server
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/*
@@ -408,6 +410,10 @@ fi
 %{_datadir}/gnome/help/evolution/sv/*.*
 %dir %{_datadir}/gnome/help/evolution/sv/figures
 %{_datadir}/gnome/help/evolution/sv/figures/*.*
+%dir %{_datadir}/gnome/help/evolution/en_GB
+%{_datadir}/gnome/help/evolution/en_GB/*.*
+%dir %{_datadir}/gnome/help/evolution/en_GB/figures
+%{_datadir}/gnome/help/evolution/en_GB/figures/*.*
 
 %files devel 
 %defattr(-,root,root)
@@ -422,6 +428,9 @@ fi
 %{_libdir}/evolution/*/conduits/*.so
 
 %changelog
+* Thu Mar 22 2007 - maw@suse.de
+- Update to version 2.10.0
+- Update the required intltool version.
 * Mon Mar 12 2007 - maw@suse.de
 - Update to version 2.9.91
 - Remove upstreamed bnc-214647-add-prefer-plain-plugin.patch