This commit is contained in:
Tim Waugh 2006-06-16 11:37:49 +00:00
parent 81cf9c9d2a
commit dc3d2ba960
3 changed files with 11 additions and 5 deletions

View File

@ -7,3 +7,4 @@ hplip-0.9.8.tar.gz
hplip-0.9.9.tar.gz hplip-0.9.9.tar.gz
hplip-0.9.10.tar.gz hplip-0.9.10.tar.gz
hplip-0.9.11.tar.gz hplip-0.9.11.tar.gz
hplip-1.6.6.tar.gz

View File

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

View File

@ -1 +1 @@
5cf362c972d5b1733af4fb8e2ade92e4 hplip-0.9.11.tar.gz 292fbcc25b79d273d7280760ce797666 hplip-1.6.6.tar.gz