[hplip/f18: 2/2] Merge branch 'f17' into f18

[Jiří Popelka]

commit 3893993073b89d29f28a3f99cdc110b852e9a766
Merge: a4aa71a 6de3e03
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Mar 8 14:10:40 2013 +0100

    Merge branch 'f17' into f18

 .gitignore              |    1 +
 hplip-3.13.2.tar.gz.asc |    7 -------
 hplip-3.13.3.tar.gz.asc |    7 +++++++
 hplip-pillow.patch      |   39 ---------------------------------------
 hplip.spec              |    9 ++++-----
 sources                 |    2 +-
 6 files changed, 13 insertions(+), 52 deletions(-)
---
diff --cc hplip.spec
index f01c481,0781215..989133a
--- a/hplip.spec
+++ b/hplip.spec
@@@ -1,12 -1,6 +1,12 @@@
 +# we don't want to provide private python extension libs
 +%{?filter_setup:
 +%filter_provides_in %{python_sitearch}/.*\.so$
 +%filter_setup
 +}
 +
  Summary: HP Linux Imaging and Printing Project
  Name: hplip
- Version: 3.13.2
+ Version: 3.13.3
  Release: 1%{?dist}
  License: GPLv2+ and MIT
  Group: System Environment/Daemons