rpms/cups-pk-helper/F-11 cups-pk-helper-ppd-name.patch, NONE, 1.1 cups-pk-helper.spec, 1.10, 1.11
Marek Kašík
mkasik at fedoraproject.org
Wed Sep 30 14:10:01 UTC 2009
- Previous message: rpms/openoffice.org/F-12 openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch, NONE, 1.1 openoffice.org.spec, 1.2013, 1.2014
- Next message: rpms/libvirt/F-11 libvirt-0.6.2-detect-newer-qemu-kvm-versions.patch, NONE, 1.1 libvirt-0.6.2-refactor-qemu-version-parsing.patch, NONE, 1.1 libvirt-0.6.2-svirt-sound.patch, 1.4, 1.5 libvirt.spec, 1.141, 1.142
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mkasik
Update of /cvs/pkgs/rpms/cups-pk-helper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22717
Modified Files:
cups-pk-helper.spec
Added Files:
cups-pk-helper-ppd-name.patch
Log Message:
* Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-5
- Fix adding of printers without specification of device-uri.
- Patch by Tim Waugh.
- Resolves: #526442
cups-pk-helper-ppd-name.patch:
cups.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- NEW FILE cups-pk-helper-ppd-name.patch ---
--- cups-pk-helper-0.0.4/src/cups.c 2009-09-30 15:51:20.000000000 +0200
+++ cups-pk-helper-0.0.4/src/cups.c 2009-09-30 15:53:03.000000000 +0200
@@ -2,8 +2,9 @@
* vim: set et ts=8 sw=8:
*
* Copyright (C) 2008 Novell, Inc.
+ * Copyright (C) 2009 Red Hat, Inc.
*
- * Authors: Vincent Untz
+ * Authors: Vincent Untz, Tim Waugh
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -997,11 +998,13 @@ 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_URI,
- "device-uri", NULL, printer_uri);
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);
+ }
if (info && info[0] != '\0') {
ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_TEXT,
"printer-info", NULL, info);
Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/F-11/cups-pk-helper.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cups-pk-helper.spec 30 Sep 2009 13:45:10 -0000 1.10
+++ cups-pk-helper.spec 30 Sep 2009 14:10:01 -0000 1.11
@@ -1,6 +1,6 @@
Name: cups-pk-helper
Version: 0.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A helper that makes system-config-printer use PolicyKit
Group: System Environment/Base
@@ -10,6 +10,7 @@ Source0: http://www.vuntz.net/dow
Patch0: get_devices.patch
Patch1: job_edit.patch
+Patch2: cups-pk-helper-ppd-name.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,6 +39,7 @@ interfaces available under control of Po
%patch0 -p1 -b .get-devices
%patch1 -p1 -b .job-edit
+%patch2 -p1 -b .ppd-name
%build
%configure
@@ -64,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-5
+- Fix adding of printers without specification of device-uri.
+- Patch by Tim Waugh.
+- Resolves: #526442
+
* Wed Sep 30 2009 Marek Kasik <mkasik at redhat.com> - 0.0.4-4
- Fix policies to check when editing a job.
- Previous message: rpms/openoffice.org/F-12 openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch, NONE, 1.1 openoffice.org.spec, 1.2013, 1.2014
- Next message: rpms/libvirt/F-11 libvirt-0.6.2-detect-newer-qemu-kvm-versions.patch, NONE, 1.1 libvirt-0.6.2-refactor-qemu-version-parsing.patch, NONE, 1.1 libvirt-0.6.2-svirt-sound.patch, 1.4, 1.5 libvirt.spec, 1.141, 1.142
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list