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

[Jiří Popelka]

commit 36071cd09d98b68b7f01e635a59ed60c9ffebbef
Merge: 0a6a5c8 fbef66e
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Jan 16 13:36:33 2013 +0100

    Merge branch 'f17' into f18

 hplip.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --cc hplip.spec
index c527beb,f4c3ca0..6623526
--- a/hplip.spec
+++ b/hplip.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: HP Linux Imaging and Printing Project
  Name: hplip
  Version: 3.12.11
- Release: 3%{?dist}
 -Release: 2%{?dist}
++Release: 4%{?dist}
  License: GPLv2+ and MIT
  Group: System Environment/Daemons
  
@@@ -116,8 -112,8 +116,7 @@@ Group: Applications/Publishin
  License: BSD
  Epoch: %{hpijs_epoch}
  Requires: %{name}-libs = %{version}-%{release}
- Requires: net-snmp
 -Requires: cupsddk-drivers
 -Requires: cups
 +Requires: cups >= 1:1.4
  
  %description -n hpijs
  hpijs is a collection of optimized drivers for HP printers.
@@@ -533,12 -519,9 +532,15 @@@ rm -f %{buildroot}%{_sysconfdir}/xdg/au
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Wed Jan 16 2013 Jiri Popelka <jpopelka at redhat.com> 3.12.11-2
++* Wed Jan 16 2013 Jiri Popelka <jpopelka at redhat.com> 3.12.11-4
+ - hpijs no longer requires net-snmp (bug #376641, bug #895643).
+ 
 +* Tue Jan 15 2013 Jiri Popelka <jpopelka at redhat.com> 3.12.11-3
 +- Use the form of import of PIL that is pillow compatible (bug #895266).
 +
 +* Fri Dec 07 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.11-2
 +- desktop file: remove deprecated Encoding key and Application category
 +
  * Tue Nov 27 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.11-1
  - 3.12.11
  -- release-parport.patch merged upstream