Merge branch 'f13' into f14

hplip.spec

@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.9
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -361,6 +361,7 @@ rm -f %{buildroot}%{_datadir}/hplip/hplip-install
 rm -rf %{buildroot}%{_datadir}/hplip/install.*
 rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template
 rm -f %{buildroot}%{_datadir}/cups/mime/pstotiff.types
+rm -f %{buildroot}%{_datadir}/hplip/fax/pstotiff*
 
 # The systray applet doesn't work properly (displays icon as a
 # window), so don't ship the launcher yet.
@@ -519,6 +520,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 12 2011 Tim Waugh <twaugh@redhat.com> - 3.10.9-12
+- Removed duplicate pstotiff files.
+
 * Wed Jan 12 2011 Tim Waugh <twaugh@redhat.com> - 3.10.9-11
 - Fixed "CUPS Web Interface" button (bug #633899).
 - Set mimedir explicitly via configure.