Merge branch 'f18' into f19

This commit is contained in:
Jiri Popelka 2013-04-11 11:09:35 +02:00
commit 6722772ddd

View File

@ -471,7 +471,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%dir %attr(0774,root,lp) %{_localstatedir}/log/hp
%dir %attr(1774,root,lp) %{_localstatedir}/log/hp/tmp
%dir %attr(0775,root,lp) %{_localstatedir}/run/hplip
%{_sysconfdir}/cron.daily/hplip_cron
%config(noreplace) %{_sysconfdir}/cron.daily/hplip_cron
%files common
%doc COPYING
@ -529,6 +529,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
* Thu Apr 11 2013 Tim Waugh <twaugh@redhat.com>
- Fixed changelog dates.
- Device ID for HP LaserJet P1005 (bug #950776).
- mark cron job file as config(noreplace)
* Tue Apr 09 2013 Jiri Popelka <jpopelka@redhat.com> - 3.13.4-1
- 3.13.4