--- a/ChangeLog	Fri Jun 20 09:07:39 2008 +0000
+++ b/ChangeLog	Fri Jun 20 09:27:42 2008 +0000
@@ -1,3 +1,13 @@
+2008-06-20  Darren Kenny  <[email protected]>
+
+	* SUNWgnome-pdf-viewer.spec:
+	  Disable PS backend until libspectre is integrated
+	  - see defect 2288 for more information.
+	* base-specs/evince.spec,
+	  patches/evince-02-gs-sfw.diff:
+	  Remove unneeded patch since gs is now in /usr/bin
+	  Fixes bug#2282
+
 2008-06-20  Jeff Cai<[email protected]>
 
 	* SUNWgnome-libs.spec: Add dependency to libtasn1.

--- a/SUNWgnome-pdf-viewer.spec	Fri Jun 20 09:07:39 2008 +0000
+++ b/SUNWgnome-pdf-viewer.spec	Fri Jun 20 09:27:42 2008 +0000
@@ -232,9 +232,13 @@
 %attr (0755, root, sys) %dir %{_sysconfdir}
 %{_sysconfdir}/gconf/schemas/evince.schemas
 %{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas
-%{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas
+#Remove until PS backend is working when libspectre is delivered.
+#%{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas
 
 %changelog
+* Fri Jun 20 2008 - [email protected]
+- PS backend is disabled until libspectre is delivered - see defect 2288 for
+  more information.
 * Wed Jan 30 2008 - [email protected]
 - Delete *.a and *.la. Add %{_libdir}/evince to %files.
 * Thu Jan  3 2008 - [email protected]

--- a/base-specs/evince.spec	Fri Jun 20 09:07:39 2008 +0000
+++ b/base-specs/evince.spec	Fri Jun 20 09:27:42 2008 +0000
@@ -12,7 +12,7 @@
 License:      GPL
 Group:        System/GUI/GNOME
 # poppler should be bumped at the same time - evince depends on poppler.
-Version:      2.22.2
+Version:      2.23.4
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -24,8 +24,6 @@
 %endif
 # date:2006-06-06 type:branding owner:gman
 Patch1:	      evince-01-menu-entry.diff
-# date:2006-05-29 type:branding owner:dkenny bugster:6430428,6431474,6553312
-Patch2:	      evince-02-gs-sfw.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -58,7 +56,6 @@
 cd po-sun; make; cd ..
 %endif
 %patch1 -p1
-%patch2 -p1
 
 # Remove DOS line end chars. Fixes #395105.
 dos2unix -ascii po/be.po po/be.po
@@ -122,6 +119,8 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Jun 20 2008 - [email protected]
+- Remove unnecessary patch for sfw since gs is now in /usr/bin.
 * Thu May 29 2008 - [email protected]
 - Bump to 2.22.2.
 * Wed Apr 09 2008 - [email protected]

--- a/patches/evince-02-gs-sfw.diff	Fri Jun 20 09:07:39 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-diff -u ./backend/ps/ps-document.c-orig ./backend/ps/ps-document.c
---- ./backend/ps/ps-document.c-orig	2006-02-20 06:09:32.000000000 +0000
-+++ ./backend/ps/ps-document.c	2006-05-29 17:08:30.616063000 +0100
-@@ -223,6 +227,10 @@
- 		return FALSE;
- 
- 	gs_path = g_find_program_in_path ("gs");
-+	/* Temporary fix until gs moves to /usr/bin */
-+	if ( gs_path == NULL ) {
-+		gs_path = g_find_program_in_path ("/usr/sfw/bin/gs");
-+	}
- 	if (!gs_path) {
- 		gchar *filename_dsp;
- 		
-diff -u evince-0.8.1/backend/ps/ps-interpreter.c-orig evince-0.8.1/backend/ps/ps-interpreter.c
---- evince-0.8.1/backend/ps/ps-interpreter.c-orig	2007-05-09 17:12:39.465323000 +0100
-+++ evince-0.8.1/backend/ps/ps-interpreter.c	2007-05-09 17:12:47.395430000 +0100
-@@ -412,6 +412,10 @@
- 
-         /* set up the args... */
-         gs_path = g_find_program_in_path ("gs");
-+        /* Temporary fix until gs moves to /usr/bin */
-+        if ( gs_path == NULL ) {
-+            gs_path = g_find_program_in_path ("/usr/sfw/bin/gs");
-+        }
-         gs_args = g_strsplit (gs_path, " ", NUM_GS_ARGS);
-         g_free (gs_path);
-         for (i = 0; i < NUM_GS_ARGS && gs_args[i]; i++, argc++) {
-