Merge branch 'f17' into f18
This commit is contained in:
commit
36071cd09d
@ -1,7 +1,7 @@
|
|||||||
Summary: HP Linux Imaging and Printing Project
|
Summary: HP Linux Imaging and Printing Project
|
||||||
Name: hplip
|
Name: hplip
|
||||||
Version: 3.12.11
|
Version: 3.12.11
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: GPLv2+ and MIT
|
License: GPLv2+ and MIT
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
|
|
||||||
@ -116,7 +116,6 @@ Group: Applications/Publishing
|
|||||||
License: BSD
|
License: BSD
|
||||||
Epoch: %{hpijs_epoch}
|
Epoch: %{hpijs_epoch}
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
Requires: net-snmp
|
|
||||||
Requires: cups >= 1:1.4
|
Requires: cups >= 1:1.4
|
||||||
|
|
||||||
%description -n hpijs
|
%description -n hpijs
|
||||||
@ -533,6 +532,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
|||||||
%postun libs -p /sbin/ldconfig
|
%postun libs -p /sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 16 2013 Jiri Popelka <jpopelka@redhat.com> 3.12.11-4
|
||||||
|
- hpijs no longer requires net-snmp (bug #376641, bug #895643).
|
||||||
|
|
||||||
* Tue Jan 15 2013 Jiri Popelka <jpopelka@redhat.com> 3.12.11-3
|
* Tue Jan 15 2013 Jiri Popelka <jpopelka@redhat.com> 3.12.11-3
|
||||||
- Use the form of import of PIL that is pillow compatible (bug #895266).
|
- Use the form of import of PIL that is pillow compatible (bug #895266).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user