Tue Jul 28 11:27:46 UTC 2009

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19382

Modified Files:
	.cvsignore sources system-config-printer.spec upstream-key.gpg 
Added Files:
	system-config-printer-1.1.10.tar.bz2.sig 
	system-config-printer-case-insensitive-matching.patch 
Removed Files:
	system-config-printer-1.1.8.tar.bz2.sig 
	system-config-printer-arrows.patch 
	system-config-printer-bug507489.patch 
	system-config-printer-gutenprint.patch 
	system-config-printer-https.patch 
	system-config-printer-incorrect-auth.patch 
	system-config-printer-ipp-nonfatal-exception.patch 
	system-config-printer-nmblookup-failure.patch 
	system-config-printer-packagekit.patch 
	system-config-printer-properties-cancel.patch 
	system-config-printer-remote-location-field.patch 
	system-config-printer-stopped-jobs.patch 
Log Message:
* Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.10-1
- Dropped no-longer-used python-sexy dependency.
- 1.1.10:
  - Now uses gnome-packagekit utility to install packages
    instead of the D-Bus API.
  - Fixed detection of stopped jobs with CUPS 1.4.
  - Fixed tracebacks when adding a new printer and when receiving
    IPP notifications.
  - Fixed 'location' field for printers added on remote CUPS servers.
  - Fixed handling of incorrect authentication.
  - Some UI and troubleshooter fixes have been made.

--- NEW FILE system-config-printer-1.1.10.tar.bz2.sig ---
ˆ?
Ð›ç’Ðº“åƒ
system-config-printer-case-insensitive-matching.patch:
 ppds.py |   25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

--- NEW FILE system-config-printer-case-insensitive-matching.patch ---
diff -up system-config-printer-1.1.10/cupshelpers/ppds.py.case-insensitive-matching system-config-printer-1.1.10/cupshelpers/ppds.py
--- system-config-printer-1.1.10/cupshelpers/ppds.py.case-insensitive-matching	2009-07-22 13:22:49.000000000 +0100
+++ system-config-printer-1.1.10/cupshelpers/ppds.py	2009-07-28 12:20:27.934951967 +0100
@@ -159,29 +159,32 @@ def ppdMakeModelSplit (ppd_make_and_mode
     # HP PPDs give NickNames like:
     # *NickName: "HP LaserJet 4 Plus v2013.111 Postscript (recommended)"
     # Find the version number.
-    v = model.find (" v")
+    modell = model.lower ()
+    v = modell.find (" v")
     if v != -1 and (model[v + 2].isdigit () or
                     (model[v + 2] == '.' and
                      model[v + 3].isdigit ())):
         # Truncate at that point.
         model = model[:v]
+        modell = modell[:v]
 
     for suffix in [" hpijs",
-                   " Foomatic/",
+                   " foomatic/",
                    " - ",
                    " w/",
                    " (",
-                   " PostScript",
-                   " PS",
-                   " PS1",
-                   " PS2",
-                   " PS3",
-                   " PXL",
-                   " series"
+                   " postscript",
+                   " ps",
+                   " ps1",
+                   " ps2",
+                   " ps3",
+                   " pxl",
+                   " series",
                    ","]:
-        s = model.find (suffix)
+        s = modell.find (suffix)
         if s != -1:
             model = model[:s]
+            modell = modell[:s]
 
     if makel == "hp":
         modelnames = {"dj": "DeskJet",
@@ -190,10 +193,10 @@ def ppdMakeModelSplit (ppd_make_and_mode
                       "color lj": "Color LaserJet",
                       "ps ": "PhotoSmart",
                       "hp ": ""}
-        modell = model.lower ()
         for (name, fullname) in modelnames.iteritems ():
             if modell.startswith (name):
                 model = fullname + model[len (name):]
+                modell = model.lower ()
 
     for mfr in [ "Apple", "Canon", "Epson", "Lexmark", "Oki" ]:
         if makel == mfr.lower ():


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/.cvsignore,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- .cvsignore	18 Jun 2009 16:48:15 -0000	1.202
+++ .cvsignore	28 Jul 2009 11:27:45 -0000	1.203
@@ -201,3 +201,4 @@ system-config-printer-1.1.6.tar.bz2
 system-config-printer-1.1.7.tar.bz2
 pycups-1.9.46.tar.bz2
 system-config-printer-1.1.8.tar.bz2
+system-config-printer-1.1.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/sources,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- sources	18 Jun 2009 16:48:15 -0000	1.208
+++ sources	28 Jul 2009 11:27:45 -0000	1.209
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 895d4170542ec80c74d41746a9474409  pycups-1.9.46.tar.bz2
-fa520cbf9cd86dc6fa8becd872bbbfa9  system-config-printer-1.1.8.tar.bz2
+18d7455f832a9bc5b72d15e5e38913cd  system-config-printer-1.1.10.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- system-config-printer.spec	24 Jul 2009 09:00:29 -0000	1.270
+++ system-config-printer.spec	28 Jul 2009 11:27:45 -0000	1.271
@@ -6,25 +6,15 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.8
-Release: 7%{?dist}
+Version: 1.1.10
+Release: 1%{?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.1/system-config-printer-%{version}.tar.bz2
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-Patch1: system-config-printer-bug507489.patch
-Patch2: system-config-printer-ipp-nonfatal-exception.patch
-Patch3: system-config-printer-https.patch
-Patch4: system-config-printer-remote-location-field.patch
-Patch5: system-config-printer-nmblookup-failure.patch
-Patch6: system-config-printer-properties-cancel.patch
-Patch7: system-config-printer-incorrect-auth.patch
-Patch8: system-config-printer-packagekit.patch
-Patch9: system-config-printer-stopped-jobs.patch
-Patch10: system-config-printer-gutenprint.patch
-Patch11: system-config-printer-arrows.patch
+Patch1: system-config-printer-case-insensitive-matching.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -47,7 +37,6 @@ Requires: gnome-icon-theme
 Requires: desktop-notification-daemon
 Requires: notify-python
 Requires: gnome-python2-gnomekeyring
-Requires: python-sexy
 Requires: libxml2-python
 
 Obsoletes: system-config-printer-gui <= 0.6.152
@@ -74,17 +63,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .bug507489
-%patch2 -p1 -b .ipp-nonfatal-exception
-%patch3 -p1 -b .https
-%patch4 -p1 -b .remote-location-field
-%patch5 -p1 -b .nmblookup-failure
-%patch6 -p1 -b .properties-cancel
-%patch7 -p1 -b .incorrect-auth
-%patch8 -p1 -b .packagekit
-%patch9 -p1 -b .stopped-jobs
-%patch10 -p1 -b .gutenprint
-%patch11 -p1 -b .arrows
+%patch1 -p1 -b .case-insensitive-matching
 
 %build
 %configure
@@ -187,6 +166,18 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.10-1
+- Dropped no-longer-used python-sexy dependency.
+- 1.1.10:
+  - Now uses gnome-packagekit utility to install packages
+    instead of the D-Bus API.
+  - Fixed detection of stopped jobs with CUPS 1.4.
+  - Fixed tracebacks when adding a new printer and when receiving
+    IPP notifications.
+  - Fixed 'location' field for printers added on remote CUPS servers.
+  - Fixed handling of incorrect authentication.
+  - Some UI and troubleshooter fixes have been made.
+
 * Fri Jul 24 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-7
 - Removed gnome-packagekit dependency.  The presence of
   gpk-install-package-name is detected at run-time, and the program


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/upstream-key.gpg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- upstream-key.gpg	9 Aug 2007 14:19:31 -0000	1.2
+++ upstream-key.gpg	28 Jul 2009 11:27:46 -0000	1.3
@@ -1,36 +1,36 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-mQGiBEa5fNcRBACJCPsz2q0hj0p5pJABzMKTb4r5lko0upe6ZYOQ2NFZw61upKzI
-uFanlwDVi3MaEHIGf8hsYr82GxTFUc+O2DFskKwEuZ3O4Q50qqkHAnMLZ2VFKXyF
-VJRPUrezpiXifbRjdV3ED0ikc7+ANArUStqbaIvjM3zJOo5GuEcO7AAPiwCgofNk
-1DG1GNH8cBxqGQoEPYrm/pkD/1e7OsMk50XXTQd77hZW1ViIQK8P4tkj65FWBgNg
-d5PyXNqGfOcskn+iVbx9cGsTgAbfP5IVlnxCmf3QE2rLelJtX++aCUmM4irDclTv
-9hn5UQf1QPqvwHFr+h6FHAg8WjHhdORc8hDlWMntmAArjmqFY4FcF/DZMzddZNgf
-jklwA/0aOef82dkwMbgmtLMcx1m0QTSBV04x2z3UIuBLdG9klhzTSCzr0EbtoSWe
-8JN5LdZr//BDJV5elyEWuiQP5uMhXkrVWCZlt3hJ8zvncO/1gnPQPzRty3IuoAyO
-j4uIWLupjdHVqqBDhJEmc+MvjRgQvUkdt07PEm5ehaRxaB36I7QdVGltIFdhdWdo
-IDx0d2F1Z2hAcmVkaGF0LmNvbT6IZgQTEQIAJgUCRrl9JAIbAwUJA8JnAAYLCQgH
-AwIEFQIIAwQWAgMBAh4BAheAAAoJEGklkaMet5kjzfYAoIjd5Y/5+BKxYMXndh4a
-54MVmEXoAJ0f1pdb+zMVcCMs/lyB2oF/+nMWwYhGBBARAgAGBQJGuX11AAoJEO3n
-xuaBAwm9DF0AnAnBbra0+WvYa1TLgdIA/ME9r/NNAJ9hXtoFm8s/rAw3YUM79wK1
-8P1RIrQcVGltIFdhdWdoIDx0aW1AY3liZXJlbGsubmV0PohmBBMRAgAmBQJGuXzX
-AhsDBQkDwmcABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQaSWRox63mSPQowCg
-jEKmAQght3t/7JVPX6H29kZyqFYAni3DbBuKULwKMuL71PA556bVbdsMiEYEEBEC
-AAYFAka5fXUACgkQ7efG5oEDCb3VrwCfft0SMdCYReiyNoazvWmVvfPk1hgAn2JH
-1pdBUCMeMVrxbIBfngNM6Me0uQINBEa5fNcQCACqm3SBctiw150XfY5AWUFPwmJB
-xX2YTG867RiuaXntFCdERybikjmgNVVlCRudufdqs2bqeqY+oFvS3TMz7SOQmSwv
-QJbEx7WrR7RWU9l0UWMPmiOZ6ZMZjwl2qArvR28RME+n2ooFjuOV3xzb1f4itbo0
-KDshdhoXvcr93z7+vSMjAGLwrLButh1BwbadSAFyIkIyguakKak+vY5kcBPbYUh6
-AnLKWZJF/UNzC6gU4fqc1kLM7RbPLO8oXMgghqcEDK7AVQoXD13xXL6+oDCtwv1u
-zZ6HTYK4l7Dcnpr9nQALF/yepD0xqpRcAA5GFrElFxdVoF24kRKy56+eOOkTAAMG
-B/9npM+/tnF49zw4onQjqEtie1lxDKZAgOmbu34aaH0udF8n37XQdmd4z7M2/Jf8
-qFBqeO01MfYmuAfZ9esM+Sneh3/Nvmi5++kz7IKS4V6EE4DndLZW+hnO09i498Fe
-dwEkhsxpU3YqB9IL6iNjKjQgYtfYBlDJvBwtlgUzKK80toAH6XPA6j/SBjJM6vZb
-P1XpZajWbkvhKzYfqXtjXZ2dqIGbtSW8uJr1Ighr9ZYQvK0r6XkhZBoUorteQUS4
-IrweKXRGnUeOHuUXr8d7rzsufSP6ZNhQQvwG80vr8V4Z++8YKpfyv8uOwAc3GK/u
-9O+CLk4lvD4SBCVoZaSCv/9aiE8EGBECAA8FAka5fNcCGwwFCQPCZwAACgkQaSWR
-ox63mSPTcgCfUiOr+XPLLhqJEQLQHp+Y8FvU7voAnRQuODX6A2Siap8Aw09esWVq
-L7PW
-=wzDO
+mQGiBEpnDbARBADRsKGwS54yxqAoniGaI8X+saG4ezdZ1OmPr9f7L4PugzjjL7qR
+p9O7hj+RZNVM7QR9nPUFTawBTfWQisyS8/a3xiBbQxlhW8uuORhM2gTkVGGlGbCc
+jH+RT0T8t/75m6n2IXKATqugrMH60NXreQQuCKWgCrT6TroMldlVQpBaFwCgx/s0
+1KlfCY42Er0YA/DDpMgTYhUEAI0PgOpD6C8ncEpqvSYSs1qyvRsrpp86M/nyi+pm
+15+7IZhlXE53gXeSLT+dTutvVQtbXbf2DwJmAKdjQw1Y4esjxwH1bPYnPnTlIlZ6
+CHQbYO0n6u2pDnSF8sxi3ene6BSuL7NvKpejwXqLEQFGjaop5eAdDs6YvHNU3Yev
+os0UA/4t9TstI4laLwvCqZ7npwsNxT/1sXa5F09d26oTSZlJwSEmGe6+tOqAbDYn
+1mrCajNt40pGPBKXhE2UNJIBrrWSjZCAp4LSmj6KCEXs35fpmUhUp54V79cC4AI/
+rezLlZIB6l4Dey1is5bkw1yOsBT6Qf4lGJHkggyUfW/ymGZfqbQdVGltIFdhdWdo
+IDx0d2F1Z2hAcmVkaGF0LmNvbT6IZgQTEQIAJgUCSmcOPwIbAwUJA8JnAAYLCQgH
+AwIEFQIIAwQWAgMBAh4BAheAAAoJEAS0Gn2aStrXYHMAoLxVaLxFP6P6rRlQtla+
+NO1KSkMBAJ9jNppMaAf2pHi1b9CoD4f4MEvOS4hGBBARAgAGBQJKZxDHAAoJEO3n
+xuaBAwm91N0AoJROznoZyHKXRxgzLyXemIA4TYMAAJ9Y9HdZOenEMw9HMg36guZK
+dBIVLLQcVGltIFdhdWdoIDx0aW1AY3liZXJlbGsubmV0PohmBBMRAgAmBQJKZw2w
+AhsDBQkDwmcABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQBLQafZpK2tet4gCf
+VKhWbUJAcIlNpWpYD0kYgGty/ucAoIfsKq9FNBPw9pQPaDnxbKDyserxiEYEEBEC
+AAYFAkpnEMcACgkQ7efG5oEDCb0RvACePTmfisPxeKkGo6QoA42MFH5wtPIAn329
+9ur6BKDz/QrKVT13CxRoKosLuQINBEpnDbAQCACCZaJHH6EctIyz+PYBCzz889PR
+iLAOyKlbrgaR4KhVGBFttKyOJkEk+UvxLUuRkOOY6i6TWbT3qNUnZT6QkftGulal
+8MAtBf2xnJXEsyKgPkRkeDAx3uvMBfrW0wgxcFw9K6E+p8x76bFFD+FtrduDRfxk
+2jDwJgyYubnM3+nPZzZXfuFnxSRYjJcoAq4O61YdH8O79TElEGqTwd/BHeIexEf2
+BkBAscE4GCmGXTYCsLByY8sGD13U7OO3Kk4ul4FgI/mzM25zgqqhbAObjsIwJqE+
+6MXqkkylmo+noTe3zlfNdnR1xkmYUCfUc4+WeFyziHRiXMkt5OYY5wDW5WGnAAMF
+B/4gvjt8SXekSxgdFCuEOQ0J2YM4DElQkaf+Tggbr9F3hnsWfJ49gEipCWEhKPt2
+ks4kDexO/Cn6SI7SQUPiNUWylm80G1Dd+xaQ9qrN1KTsReACXOCKoRgz64MooSOj
+Qs8YIGI/ejLzPkn6mUEmFRHssd4jmmSCbF99AmVh6Z4VnkKLTG+z3KQUymF0ng5b
+AAcwTOJhlAR7xrBJGfhnRUTIaNtD+UnBsoxApeUJie2lc84Pc10p56TGomkEy3Ib
+se1kk4w3mZ8kkR57voh/PovSl/8NyPmv81oVHbJnGLKAVku4XT0IBQOBdDKeRKHB
+tlPLsK9KFx2LxhtAmQN4C/j5iE8EGBECAA8FAkpnDbACGwwFCQPCZwAACgkQBLQa
+fZpK2teQogCgg68475moQ7dh/HIUHRNJKZJfmoQAoIw92pM7V5VYMpz9kW+701Fu
+JofS
+=vrpj
 -----END PGP PUBLIC KEY BLOCK-----


--- system-config-printer-1.1.8.tar.bz2.sig DELETED ---


--- system-config-printer-arrows.patch DELETED ---


--- system-config-printer-bug507489.patch DELETED ---


--- system-config-printer-gutenprint.patch DELETED ---


--- system-config-printer-https.patch DELETED ---


--- system-config-printer-incorrect-auth.patch DELETED ---


--- system-config-printer-ipp-nonfatal-exception.patch DELETED ---


--- system-config-printer-nmblookup-failure.patch DELETED ---


--- system-config-printer-packagekit.patch DELETED ---


--- system-config-printer-properties-cancel.patch DELETED ---


--- system-config-printer-remote-location-field.patch DELETED ---


--- system-config-printer-stopped-jobs.patch DELETED ---


