[system-config-printer: 3/3] Merge branch 'f14'

[Tim Waugh]

commit bae429eb8d548b361ef5d256d5f3a1d11e15a377
Merge: f5a8176 b8c7ef0
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Dec 2 16:26:57 2010 +0000

    Merge branch 'f14'

 system-config-printer-compiz-rename.patch |   11 +++++++++++
 system-config-printer.spec                |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --cc system-config-printer.spec
index 86ac926,385aafb..0901166
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@@ -4,14 -6,25 +4,15 @@@
  
  Summary: A printer administration tool
  Name: system-config-printer
 -Version: 1.2.5
 -Release: 7%{?dist}
 +Version: 1.2.95
- Release: 3%{?dist}
++Release: 4%{?dist}
  License: GPLv2+
  URL: http://cyberelk.net/tim/software/system-config-printer/
  Group: System Environment/Base
  Source0: http://cyberelk.net/tim/data/system-config-printer/1.2/%{name}-%{version}.tar.xz
 -# Python bindings for libcups
 -Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 -# Python bindings for libsmbclient
 -Source2: http://pypi.python.org/packages/source/p/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 -Patch1: system-config-printer-InstallPrinterDrivers-debug.patch
 -Patch2: system-config-printer-mfg-mdl.patch
 -Patch3: system-config-printer-NPTLpdQueue.patch
 -Patch4: system-config-printer-uint32.patch
 -Patch5: system-config-printer-compiz-rename.patch
 -Patch101: pysmbc-doczip.patch
 +Patch1: system-config-printer-attach-to-status-icon.patch
++Patch2: system-config-printer-compiz-rename.patch
  BuildRequires: cups-devel >= 1.2
 -BuildRequires: python-devel >= 2.4
 -BuildRequires: libsmbclient-devel >= 3.2
  BuildRequires: desktop-file-utils >= 0.2.92
  BuildRequires: gettext-devel
  BuildRequires: intltool
@@@ -65,8 -78,27 +66,9 @@@ The udev rules and helper programs for 
  printers.
  
  %prep
 -%setup -q -a 1 -a 2
 -
 -# Show debug output whenever InstallPrinterDrivers is called.
 -%patch1 -p1 -b .InstallPrinterDrivers-debug
 -
 -# Always use MFG and MDL fields for InstallPrinterDrivers interface
 -# (bug #643073).
 -%patch2 -p1 -b .mfg-mdl
 -
 -# Don't check ComboBoxEntry for allowed characters (bug #644131).
 -%patch3 -p1 -b .NPTLpdQueue
 -
 -# Make sure InstallPrinterDrivers gets correctly typed values (bug #647270).
 -%patch4 -p1 -b .uint32
 -
 -# Grab focus on the IconView after setting it editable (bug #650995).
 -%patch5 -p1 -b .compiz-rename
 -
 -pushd pysmbc-%{pysmbc_version}
 -%patch101 -p1 -b .doczip
 -popd
 +%setup -q
 +%patch1 -p1 -b .attach-to-status-icon
++%patch2 -p1 -b .compiz-rename
  
  %build
  %configure --with-udev-rules
@@@ -176,24 -219,9 +178,27 @@@ rm -rf %buildroo
  exit 0
  
  %changelog
 -* Thu Dec  2 2010 Tim Waugh <twaugh at redhat.com> - 1.2.5-7
++* Thu Dec  2 2010 Tim Waugh <twaugh at redhat.com> - 1.2.95-4
+ - Grab focus on the IconView after setting it editable (bug #650995).
+ 
 +* Tue Nov 30 2010 Tim Waugh <twaugh at redhat.com> - 1.2.95-3
 +- Removed calls to pynotify.Notification.attach_to_status_icon()
 +  (bug #657722).
 +
 +* Fri Nov 26 2010 Jiri Popelka <jpopelka at redhat.com> 1.2.95-2
 +- Added %%ghost to /var/run/udev-configure-printer/usb-uris (bug #656698).
 +
 +* Thu Nov 25 2010 Tim Waugh <twaugh at redhat.com> - 1.2.95-1
 +- 1.2.95.
 +- Removed pycups and pysmbc tarballs as they are now packaged
 +  separately as python-cups and python-smbc.
 +
 +* Mon Nov 22 2010 Tim Waugh <twaugh at redhat.com> - 1.2.5-8
 +- Added in missing part of patch for last change (bug #655317).
 +
 +* Wed Nov  3 2010 Tim Waugh <twaugh at redhat.com> - 1.2.5-7
 +- Don't use status icon if notification server supports persistence.
 +
  * Fri Oct 29 2010 Tim Waugh <twaugh at redhat.com> - 1.2.5-6
  - Make sure InstallPrinterDrivers gets correctly typed values (bug #647270).