Merge branch 'f13' into f14

This commit is contained in:
Tim Waugh 2011-01-12 16:55:07 +00:00
commit 8f5a3bc5f9

View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.10.9
Release: 12%{?dist}
Release: 13%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@ -362,6 +362,7 @@ 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*
rm -f %{buildroot}/usr/lib/cups/filter/hpcac
# The systray applet doesn't work properly (displays icon as a
# window), so don't ship the launcher yet.
@ -489,7 +490,6 @@ rm -rf %{buildroot}
%{_datadir}/cups/drv/*
# 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
/usr/lib/cups/filter/hpcupsfax
/usr/lib/cups/filter/hplipjs
@ -520,6 +520,9 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
* Wed Jan 12 2011 Tim Waugh <twaugh@redhat.com> - 3.10.9-13
- Removed unused hpcac filter to avoid unnecessary perl dependency.
* Wed Jan 12 2011 Tim Waugh <twaugh@redhat.com> - 3.10.9-12
- Removed duplicate pstotiff files.