--- a/ChangeLog	Fri Apr 28 00:10:01 2006 +0000
+++ b/ChangeLog	Fri Apr 28 00:16:06 2006 +0000
@@ -1,3 +1,12 @@
+2006-04-28  Glynn Foster  <[email protected]>
+
+	* evince.spec: Update.
+	* evolution.spec: Commit, forgot to commit earlier.
+	* patches/evince-01-desktop-display.diff: Remove.
+	* patches/evince-01-menu-entry.diff: Add new patch,
+	incorporating the one above, with 'Evince Document Viewer'
+	now installing into the Office menu.
+
 2006-04-28  Glynn Foster  <[email protected]>
 
 	* evolution.spec: Update.

--- a/evince.spec	Fri Apr 28 00:10:01 2006 +0000
+++ b/evince.spec	Fri Apr 28 00:16:06 2006 +0000
@@ -14,7 +14,7 @@
 Vendor:       Sun Microsystems, Inc.
 Summary:      Document viewer
 Source:       http://ftp.gnome.org/pub/GNOME/sources/evince/0.5/%{name}-%{version}.tar.bz2
-Patch1:	      evince-01-desktop-display.diff
+Patch1:	      evince-01-menu-entry.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -95,6 +95,10 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Apr 28 2006 - [email protected]
+- Add patch to install into Office submenu
+  with 'Evince Document Viewer'.
+
 * Tue Mar 14 2006 - [email protected]
 - Bump to 0.5.2.
 

--- a/evolution.spec	Fri Apr 28 00:10:01 2006 +0000
+++ b/evolution.spec	Fri Apr 28 00:16:06 2006 +0000
@@ -16,8 +16,7 @@
 Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
 Patch1:       evolution-01-display-mail.diff
 Patch2:       evolution-02-conduit.diff
-Patch3:       evolution-03-exchange-operation.diff
-Patch4:       evolution-04-contact-print-dialog.diff
+Patch3:       evolution-03-menu-entry.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/evolution
@@ -87,6 +86,7 @@
 %setup -q
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 %build
 

--- a/patches/evince-01-desktop-display.diff	Fri Apr 28 00:10:01 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -urNp evince-0.4.0/data/evince.desktop.in.in evince-0.4.0-hacked/data/evince.desktop.in.in
---- evince-0.4.0/data/evince.desktop.in.in	2005-08-13 15:08:25.000000000 +1200
-+++ evince-0.4.0-hacked/data/evince.desktop.in.in	2005-11-08 14:39:36.436141000 +1300
-@@ -9,7 +9,6 @@ StartupNotify=true
- Terminal=false
- Type=Application
- Icon=postscript-viewer.png
--NoDisplay=true
- X-GNOME-DocPath=
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=evince

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/evince-01-menu-entry.diff	Fri Apr 28 00:16:06 2006 +0000
@@ -0,0 +1,23 @@
+diff -urN evince-0.5.2/data/evince.desktop.in.in evince-0.5.2-hacked/data/evince.desktop.in.in
+--- evince-0.5.2/data/evince.desktop.in.in	2006-02-20 19:09:31.000000000 +1300
++++ evince-0.5.2-hacked/data/evince.desktop.in.in	2006-04-28 12:21:24.669155000 +1200
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Document Viewer
++_Name=Evince Document Viewer
+ _GenericName=Document Viewer
+ _Comment=View multipage documents
+ TryExec=evince
+@@ -9,10 +9,9 @@
+ Terminal=false
+ Type=Application
+ Icon=postscript-viewer.png
+-NoDisplay=true
+ X-GNOME-DocPath=
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=evince
+ X-GNOME-Bugzilla-Component=General
+-Categories=GNOME;GTK;Application;Graphics;VectorGraphics;Viewer;
++Categories=GNOME;GTK;Application;Office;
+ MimeType=@EVINCE_MIME_TYPES@