diff --git a/.cvsignore b/.cvsignore index 978ed68..0b53a69 100644 --- a/.cvsignore +++ b/.cvsignore @@ -31,3 +31,4 @@ hplip-3.9.2.tar.gz hplip-3.9.6b.tar.gz hplip-3.9.8.tar.gz hplip-3.10.2.tar.gz +hpcups-update-ppds.sh diff --git a/hplip.spec b/hplip.spec index 8943813..e09c695 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -13,6 +13,7 @@ Conflicts: selinux-policy < 3.0.3-3 Url: http://hplip.sourceforge.net/ Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz +Source1: hpcups-update-ppds.sh Patch1: hplip-pstotiff-is-rubbish.patch Patch2: hplip-strstr-const.patch Patch3: hplip-ui-optional.patch @@ -202,6 +203,9 @@ desktop-file-install --vendor HP \ --add-category Application \ hplip.desktop +# Regenerate hpcups PPDs on upgrade if necessary (bug #579355). +install -p -m755 %{SOURCE1} %{buildroot}%{_bindir}/hpcups-update-ppds + %{__mkdir_p} %{buildroot}%{_sysconfdir}/sane.d/dll.d echo hpaio > %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio @@ -337,6 +341,7 @@ rm -rf %{buildroot} %files -n hpijs %defattr(-,root,root) %{_bindir}/hpijs +%{_bindir}/hpcups-update-ppds %dir %{_datadir}/ppd/HP %{_datadir}/ppd/HP/*.ppd.gz %{_datadir}/cups/drv/* @@ -365,7 +370,13 @@ fi %postun gui /usr/bin/update-desktop-database &>/dev/null ||: +%post -n hpijs +%{_bindir}/hpcups-update-ppds &>/dev/null ||: + %changelog +* Wed Apr 7 2010 Tim Waugh - 3.10.2-3 +- Regenerate hpcups PPDs on upgrade if necessary (bug #579355). + * Tue Mar 23 2010 Tim Waugh - 3.10.2-2 - Explicitly destroy tray icon on exit (bug #543286). diff --git a/sources b/sources index c39277f..73c48b1 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 4df6f16c47ae7edd015bf2cf5155f26f hplip-3.10.2.tar.gz +110820c749dc7ec81e949c193187cb39 hpcups-update-ppds.sh