[hplip: 6/6] Merge branch 'f18'

[Jiří Popelka]

commit 037f4e95609c69b7cb028936f402c9ae4483ffce
Merge: 131b9f4 367b829
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Oct 2 17:40:47 2012 +0200

    Merge branch 'f18'

 hplip.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc hplip.spec
index 57999ee,0dc8700..0fff27c
--- a/hplip.spec
+++ b/hplip.spec
@@@ -528,7 -524,13 +528,10 @@@ rm -f %{buildroot}%{_sysconfdir}/xdg/au
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * Tue Oct 02 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.9-6
+ - Ship %%{_localstatedir}/log/hp/tmp directory (bug #859658)
+ 
 -* Mon Oct 01 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.9-5
 -- release bump
 -
 -* Thu Sep 27 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.9-4
 +* Thu Sep 27 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.9-5
  - remove useless Conflicts:, Obsoletes: and Provides: fields
  - remove %%pre section (stopping&disabling of hplip service on upgrade)
  - make hplip_cron work with non-english locale