Merge branch 'f17' into f18

This commit is contained in:
Jiri Popelka 2012-10-02 17:39:22 +02:00
commit 367b82990d

View File

@ -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.9 Version: 3.12.9
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
@ -459,10 +459,10 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%{_datadir}/hplip/installer %{_datadir}/hplip/installer
%{_datadir}/hplip/pcard %{_datadir}/hplip/pcard
%{_datadir}/hplip/prnt %{_datadir}/hplip/prnt
%{_datadir}/hplip/prnt/plugins
%{_datadir}/hplip/scan %{_datadir}/hplip/scan
%{_localstatedir}/lib/hp %{_localstatedir}/lib/hp
%dir %attr(0774,root,lp) %{_localstatedir}/log/hp %dir %attr(0774,root,lp) %{_localstatedir}/log/hp
%dir %attr(1774,root,lp) %{_localstatedir}/log/hp/tmp
%{_sysconfdir}/cron.daily/hplip_cron %{_sysconfdir}/cron.daily/hplip_cron
%files common %files common
@ -524,6 +524,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Tue Oct 02 2012 Jiri Popelka <jpopelka@redhat.com> 3.12.9-6
- Ship %%{_localstatedir}/log/hp/tmp directory (bug #859658)
* Mon Oct 01 2012 Jiri Popelka <jpopelka@redhat.com> 3.12.9-5 * Mon Oct 01 2012 Jiri Popelka <jpopelka@redhat.com> 3.12.9-5
- release bump - release bump