Merge branch 'f12' into f13

hplip.spec

@@ -427,7 +427,7 @@ rm -rf %{buildroot}
 %dir %{_datadir}/ppd/HP
 %{_datadir}/ppd/HP/*.ppd.gz
 %{_datadir}/cups/drv/*
-# Note: this must be /usr/lib not %{_libdir}, since that's the
+# Note: this must be /usr/lib not %%{_libdir}, since that's the
 # CUPS serverbin directory.
 /usr/lib/cups/filter/hpcac
 /usr/lib/cups/filter/hpcups
@@ -460,6 +460,10 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 22 2010 Tim Waugh <twaugh@redhat.com>
+- More fixes from package review:
+  - Avoided another macro in comment.
+
 * Mon Sep 20 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.6-5
 - Increased timeouts for curl, wget, ping for high latency networks (bug #635388).