Merge branch 'f14'

hplip.spec

@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -262,7 +262,7 @@ rm -rf  %{buildroot}%{_sysconfdir}/sane.d \
 rm -f   %{buildroot}%{_bindir}/foomatic-rip \
         %{buildroot}%{_libdir}/cups/filter/foomatic-rip \
         %{buildroot}%{_libdir}/*.la \
-        %{buildroot}%{_libdir}/python*/site-packages/*.la \
+        %{buildroot}%{python_sitearch}/*.la \
         %{buildroot}%{_libdir}/libhpip.so \
         %{buildroot}%{_libdir}/sane/*.la \
         %{buildroot}%{_datadir}/cups/model/foomatic-ppds \
@@ -423,7 +423,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
@@ -456,6 +456,11 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Sep 30 2010 Tim Waugh <twaugh@redhat.com> - 3.10.6-7
+- More fixes from package review:
+  - Avoided another macro in comment.
+  - Use python_sitearch macro throughout.
+
 * Wed Sep 29 2010 jkeating - 3.10.6-6
 - Rebuilt for gcc bug 634757