--- a/ChangeLog	Fri Mar 26 08:09:55 2010 +0000
+++ b/ChangeLog	Fri Mar 26 17:03:48 2010 +0000
@@ -1,3 +1,11 @@
+2010-03-26  Ghee Teo  <[email protected]>
+
+	Fixes busgter#6474481 which now show papi print queues.
+	* SUNWgnome-print.spec:
+	* base-specs/libgnomeprint.spec:
+	* ext-sources/Generic-PostScript_Printer-Postscript.ppd.gz:
+	* patches/libgnomeprint-04-papi-printer.diff:
+
 2010-03-26  Padraig O'Briain  <[email protected]>
 
         * base-specs/gvfs.spec: Add new patch

--- a/SUNWgnome-print.spec	Fri Mar 26 08:09:55 2010 +0000
+++ b/SUNWgnome-print.spec	Fri Mar 26 17:03:48 2010 +0000
@@ -24,6 +24,7 @@
 Version:                 %{default_pkg_version}
 Source:                  %{name}-manpages-0.1.tar.gz
 Source1:                 http://dlc.sun.com/osol/jds/downloads/extras/libgnomeprint-%{g20_version}.tar.bz2
+Source4:                 Generic-PostScript_Printer-Postscript.ppd.gz
 # owner:davelam date:2008-05-14 type:bug bugzilla:532100
 Patch1:                  libgnomeprint-sun-01-add-libm.diff
 
@@ -180,6 +181,8 @@
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-print-2.0/ppd/Generic
+cp %SOURCE4 $RPM_BUILD_ROOT%{_datadir}/gnome-print-2.0/ppd/Generic
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-print-2.0/*/lib*a
 

--- a/base-specs/libgnomeprint.spec	Fri Mar 26 08:09:55 2010 +0000
+++ b/base-specs/libgnomeprint.spec	Fri Mar 26 17:03:48 2010 +0000
@@ -25,6 +25,8 @@
 Patch2:       libgnomeprint-02-evince-crash.diff
 # owner:chrisk date:2010-01-13 type:bug
 Patch3:       libgnomeprint-03-module-sections.diff
+# owner:gheet date;2010-03-25 type:bug bugster:6474481
+Patch4:       libgnomeprint-04-papi-printer.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -75,6 +77,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %ifos linux

Binary file ext-sources/Generic-PostScript_Printer-Postscript.ppd.gz has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libgnomeprint-04-papi-printer.diff	Fri Mar 26 17:03:48 2010 +0000
@@ -0,0 +1,21 @@
+diff -urN -x'*.orig' -x'*.rej' libgnomeprint-2.18.6/libgnomeprint/modules/papi/gnome-print-papi.c ../SUNWgnome-print-2.29.92.hacked/libgnomeprint-2.18.6/libgnomeprint/modules/papi/gnome-print-papi.c
+--- libgnomeprint-2.18.6/libgnomeprint/modules/papi/gnome-print-papi.c	2010-03-25 15:40:30.626047574 +0000
++++ ../SUNWgnome-print-2.29.92.hacked/libgnomeprint-2.18.6/libgnomeprint/modules/papi/gnome-print-papi.c	2010-03-26 16:15:50.597742000 +0000
+@@ -45,7 +45,7 @@
+ #include <libgnomeprint/gpa/gpa-settings.h>
+ 
+ #define d(x)
+-#define	GENERIC_PPD_FILE "file://localhost/usr/lib/lp/model/ppd/system/foomatic/Generic/Generic-PostScript_Printer-Postscript.ppd.gz"
++#define	GENERIC_PPD_FILE "file://localhost/usr/share/gnome-print-2.0/ppd/Generic/Generic-PostScript_Printer-Postscript.ppd.gz"
+ 
+ /* Argument order: id, name */
+ 
+@@ -759,7 +759,7 @@
+ 			status = papiAttributeListGetString (attrs, NULL,
+ 				"printer-name", &name);
+ 			status2 = papiAttributeListGetString (attrs, NULL,
+-				"printer-uri", &uri);
++				"printer-uri-supported", &uri);
+ 			if (status == PAPI_OK && status2 == PAPI_OK) {
+ 				is_default =
+ 					(name != NULL && !strcmp (def, name));