rpms/cups-pk-helper/F-12 cups-pk-helper-add-printer-ppd-optional.patch, NONE, 1.1 cups-pk-helper.spec, 1.15, 1.16

[Marek Kašík]

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7922

Modified Files:
	cups-pk-helper.spec 
Added Files:
	cups-pk-helper-add-printer-ppd-optional.patch 
Log Message:
* Thu Dec 10 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-10
- Fix adding of printers without specification of ppd-name.
- Patch by Tim Waugh.
- Resolves: #545452


cups-pk-helper-add-printer-ppd-optional.patch:
 cups.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE cups-pk-helper-add-printer-ppd-optional.patch ---
--- cups-pk-helper-0.0.4/src/cups.c	2009-12-10 15:08:12.000000000 +0100
+++ cups-pk-helper-0.0.4/src/cups.c	2009-12-10 15:09:00.000000000 +0100
@@ -998,9 +998,11 @@ cph_cups_printer_add (CphCups    *cups,
 
         ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
                       "printer-name", NULL, printer_name);
-        ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
-                      "ppd-name", NULL, ppd_file);
 
+        if (ppd_file && ppd_file[0] != '\0') {
+                ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
+                              "ppd-name", NULL, ppd_file);
+        }
         if (printer_uri && printer_uri[0] != '\0') {
                 ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
                               "device-uri", NULL, printer_uri);


Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/F-12/cups-pk-helper.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- cups-pk-helper.spec	3 Dec 2009 13:31:35 -0000	1.15
+++ cups-pk-helper.spec	10 Dec 2009 17:20:08 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -14,6 +14,7 @@ Patch2:         polkit_result.patch
 Patch3:         edit_job.patch
 Patch4:         cups-pk-helper-ppd-name.patch
 Patch5:         allow_authentication.patch
+Patch6:         cups-pk-helper-add-printer-ppd-optional.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,6 +50,7 @@ interfaces available under control of Po
 %patch3 -p1 -b .edit-job
 %patch4 -p1 -b .ppd-name
 %patch5 -p1 -b .allow_auth
+%patch6 -p1 -b .ppd
 
 %build
 # Patch0 modifies configure.ac
@@ -78,6 +80,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 10 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-10
+- Fix adding of printers without specification of ppd-name.
+- Patch by Tim Waugh.
+- Resolves: #545452
+
 * Thu Dec  3 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-9
 - Allow inactive users and any user to authenticate
 - Resolves: #543085