diff --git a/.cvsignore b/.cvsignore index c615e87..38732fa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ hplip-0.9.4.tar.gz hplip-0.9.5.tar.gz hplip-0.9.6.tar.gz hplip-0.9.7.tar.gz +hplip-0.9.8.tar.gz diff --git a/hplip.spec b/hplip.spec index c9d8f8e..bbb030a 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 0.9.7 -Release: 8 +Version: 0.9.8 +Release: 1 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -11,8 +11,7 @@ Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.t Patch1: hplip-quiet.patch Patch2: hplip-desktop.patch Patch3: hplip-config.patch -Patch4: hplip-0.9.7-2.patch -Patch5: hplip-initscript.patch +Patch4: hplip-0.9.8-1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -65,11 +64,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Use static IP ports (for SELinux policy). %patch3 -p1 -b .config -# Apply patch 0.9.7-2 -%patch4 -p1 -b .0.9.7-2 - -# Fix initscript (bug #176966). -%patch5 -p1 -b .initscript +# Apply patch 0.9.8-1 +%patch4 -p1 -b .0.9.8-1 %build %configure --disable-foomatic-install --disable-cups-install @@ -109,6 +105,9 @@ desktop-file-install --vendor HP \ mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip +# Don't package hpfax yet. +rm -f %{buildroot}%{_libdir}/cups/backend/hpfax + %clean rm -rf %{buildroot} @@ -156,6 +155,11 @@ if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ fi %changelog +* Thu Feb 2 2006 Tim Waugh 0.9.8-1 +- 0.9.8. +- No longer need initscript patch. +- Don't package hpfax yet. + * Wed Jan 18 2006 Tim Waugh 0.9.7-8 - Don't package PPD files. diff --git a/sources b/sources index 727d113..e6fae50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2ee27d7c347f549306a880561c5030a hplip-0.9.7.tar.gz +3eae08ec7dbecdc03e7972b132dfdde6 hplip-0.9.8.tar.gz