[hplip/f16: 2/2] Merge branch 'f15' into f16

[Jiří Popelka]

commit a8d2282348231b5080a18299799a2f6efae0d60d
Merge: fb91162 7b8837f
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Feb 7 13:36:19 2012 +0100

    Merge branch 'f15' into f16

 .gitignore                 |    1 +
 hplip-3.11.12.tar.gz.asc   |    7 -------
 hplip-3.12.2.tar.gz.asc    |    7 +++++++
 hplip-no-system-tray.patch |   20 --------------------
 hplip.spec                 |   17 +++++------------
 sources                    |    2 +-
 6 files changed, 14 insertions(+), 40 deletions(-)
---
diff --cc hplip.spec
index 5e7b940,4458612..178a794
--- a/hplip.spec
+++ b/hplip.spec
@@@ -454,9 -444,8 +449,8 @@@ rm -f %{buildroot}%{_sysconfdir}/xdg/au
  %dir %attr(0774,root,lp) %{_localstatedir}/log/hp
  
  %files common
- %defattr(-,root,root,-)
  %doc COPYING
 -%{_sysconfdir}/udev/rules.d/*
 +/lib/udev/rules.d/*.rules
  %dir %{_sysconfdir}/hp
  %config(noreplace) %{_sysconfdir}/hp/hplip.conf
  %dir %{_datadir}/hplip