diff --git a/.cvsignore b/.cvsignore index 3138041..cd8780e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -7,3 +7,4 @@ hplip-0.9.8.tar.gz hplip-0.9.9.tar.gz hplip-0.9.10.tar.gz hplip-0.9.11.tar.gz +hplip-1.6.6.tar.gz diff --git a/hplip.spec b/hplip.spec index 62d94ec..be227a1 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 0.9.11 -Release: 6 +Version: 1.6.6 +Release: 2 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -10,11 +10,11 @@ Obsoletes: xojpanel <= 0.91 Url: http://sourceforge.net/projects/hpinkjet Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz -Patch0: hplip-0.9.11-2.patch Patch1: hplip-desktop.patch Patch2: hplip-config.patch Patch3: hplip-quiet.patch Patch4: hplip-cups-backend.patch +Patch5: hplip-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -61,7 +61,6 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). %prep rm -rf $RPM_BUILD_DIR/%{name}-%{version} %setup -q -%patch0 -p1 -b .0.9.11-2 # Use /usr/share/applications for putting desktop files in. %patch1 -p1 -b .desktop @@ -75,6 +74,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Always use /usr/lib/cups/backend. %patch4 -p1 -b .cups-backend +# Work around missing linux/compiler.h. +%patch5 -p1 -b .compile + autoconf # for patch4 %build @@ -173,6 +175,9 @@ if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ fi %changelog +* Fri Jun 16 2006 Tim Waugh 1.6.6-2 +- 1.6.6. + * Mon Jun 12 2006 Tim Waugh 0.9.11-6 - Build requires autoconf (bug #194682). diff --git a/sources b/sources index adfb622..4d033e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5cf362c972d5b1733af4fb8e2ade92e4 hplip-0.9.11.tar.gz +292fbcc25b79d273d7280760ce797666 hplip-1.6.6.tar.gz