From aa7a7f17a61c08e8458573e55807a60480ae0327 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Dec 20 2010 13:27:55 +0000
Subject: Merge branch 'f13' into f14


---

diff --git a/.gitignore b/.gitignore
index 9f66f9c..154751e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -225,3 +225,4 @@ pycups-1.9.51.tar.bz2
 /pysmbc-1.0.9.tar.bz2
 /system-config-printer-1.2.4.tar.xz
 /system-config-printer-1.2.5.tar.xz
+/pycups-1.9.53.tar.bz2
diff --git a/pycups-1.9.51.tar.bz2.sig b/pycups-1.9.51.tar.bz2.sig
deleted file mode 100644
index 9909a50..0000000
Binary files a/pycups-1.9.51.tar.bz2.sig and /dev/null differ
diff --git a/pycups-1.9.53.tar.bz2.sig b/pycups-1.9.53.tar.bz2.sig
new file mode 100644
index 0000000..dd89bd3
Binary files /dev/null and b/pycups-1.9.53.tar.bz2.sig differ
diff --git a/sources b/sources
index e8aa7d9..3880460 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-7e9de64bce9496ce2d36ab513dd69dd5  pycups-1.9.51.tar.bz2
 32b995dbf8419128f652279881b9023d  pysmbc-1.0.9.tar.bz2
 600a231216fb7bde061ef753db9a7e54  system-config-printer-1.2.5.tar.xz
+5fe5b696e19ab5aa3c463b1c030e2c50  pycups-1.9.53.tar.bz2
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 385aafb..4246e7f 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,4 +1,4 @@
-%global pycups_version 1.9.51
+%global pycups_version 1.9.53
 %global pysmbc_version 1.0.9
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -219,6 +219,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Dec 20 2010 Jiri Popelka <jpopelka@redhat.com> 1.2.5-8
+- Updated pycups to 1.9.53 (bug #662805).
+
 * Thu Dec  2 2010 Tim Waugh <twaugh@redhat.com> - 1.2.5-7
 - Grab focus on the IconView after setting it editable (bug #650995).