Merge branch 'f18' into f19
This commit is contained in:
commit
6722772ddd
@ -471,7 +471,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
|||||||
%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
|
%dir %attr(1774,root,lp) %{_localstatedir}/log/hp/tmp
|
||||||
%dir %attr(0775,root,lp) %{_localstatedir}/run/hplip
|
%dir %attr(0775,root,lp) %{_localstatedir}/run/hplip
|
||||||
%{_sysconfdir}/cron.daily/hplip_cron
|
%config(noreplace) %{_sysconfdir}/cron.daily/hplip_cron
|
||||||
|
|
||||||
%files common
|
%files common
|
||||||
%doc COPYING
|
%doc COPYING
|
||||||
@ -529,6 +529,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
|||||||
* Thu Apr 11 2013 Tim Waugh <twaugh@redhat.com>
|
* Thu Apr 11 2013 Tim Waugh <twaugh@redhat.com>
|
||||||
- Fixed changelog dates.
|
- Fixed changelog dates.
|
||||||
- Device ID for HP LaserJet P1005 (bug #950776).
|
- 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
|
* Tue Apr 09 2013 Jiri Popelka <jpopelka@redhat.com> - 3.13.4-1
|
||||||
- 3.13.4
|
- 3.13.4
|
||||||
|
Loading…
Reference in New Issue
Block a user