Merge branch 'f18' into f19

This commit is contained in:
Jiri Popelka 2013-03-15 19:16:43 +01:00
commit 6944f554b5

View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.13.3
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
@ -48,11 +48,6 @@ Patch31: hplip-ipp-accessors.patch
Patch32: hplip-IEEE-1284-4.patch
Patch33: hplip-check.patch
Requires(pre): /sbin/service
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(preun): /sbin/chkconfig
%global hpijs_epoch 1
Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@ -531,6 +526,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
* Fri Mar 15 2013 Jiri Popelka <jpopelka@redhat.com> - 3.13.3-3
- Remove unused Requires.
* Thu Mar 14 2013 Tim Waugh <twaugh@redhat.com> - 3.13.3-2
- Moved hpfax pipe to /var/run/hplip (bug #917756).