From 7f4bba3287872b30c07a181e1bb6aaf81efac80c Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 10 Jan 2007 16:14:44 +0000 Subject: [PATCH] - 1.6.12. --- .cvsignore | 1 + hplip-libm.patch | 24 ++++++++++++------------ hplip.spec | 30 +++++++++--------------------- sources | 2 +- 4 files changed, 23 insertions(+), 34 deletions(-) diff --git a/.cvsignore b/.cvsignore index e295c77..77d0066 100644 --- a/.cvsignore +++ b/.cvsignore @@ -11,3 +11,4 @@ hplip-1.6.6.tar.gz hplip-1.6.6a.tar.gz hplip-1.6.7.tar.gz hplip-1.6.10.tar.gz +hplip-1.6.12.tar.gz diff --git a/hplip-libm.patch b/hplip-libm.patch index 9bd59a2..4bdd60d 100644 --- a/hplip-libm.patch +++ b/hplip-libm.patch @@ -1,22 +1,22 @@ ---- hplip-1.6.6a/Makefile.in.libm 2006-07-04 15:55:53.000000000 +0100 -+++ hplip-1.6.6a/Makefile.in 2006-07-04 15:56:36.000000000 +0100 -@@ -480,7 +480,7 @@ +--- hplip-1.6.12.8-rc3/Makefile.in.libm 2006-12-12 21:25:19.000000000 +0000 ++++ hplip-1.6.12.8-rc3/Makefile.in 2006-12-13 17:15:04.000000000 +0000 +@@ -509,7 +509,7 @@ ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \ - ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h + ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h -libhpip_la_LDFLAGS = -version-info 0:1:0 +libhpip_la_LDFLAGS = -lm -version-info 0:1:0 - # sane backend - BASENAME = sane-hpaio ---- hplip-1.6.6a/Makefile.am.libm 2006-07-04 15:55:24.000000000 +0100 -+++ hplip-1.6.6a/Makefile.am 2006-07-04 15:55:36.000000000 +0100 -@@ -151,7 +151,7 @@ + # hpaio sane backend + @SCAN_BUILD_TRUE@MAJORVER = 1 +--- hplip-1.6.12.8-rc3/Makefile.am.libm 2006-11-30 23:56:21.000000000 +0000 ++++ hplip-1.6.12.8-rc3/Makefile.am 2006-12-13 17:16:12.000000000 +0000 +@@ -158,7 +158,7 @@ ip/ipmain.c ip/xchgbpp.c ip/xcrop.c ip/xgamma.c ip/xjpg_dec.c ip/xjpg_huf.c ip/xpcx.c ip/xsaturation.c ip/xtable.c ip/xtonemap.c \ ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \ - ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h + ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h -libhpip_la_LDFLAGS = -version-info 0:1:0 +libhpip_la_LDFLAGS = -lm -version-info 0:1:0 - # sane backend - BASENAME=sane-hpaio + if SCAN_BUILD + diff --git a/hplip.spec b/hplip.spec index f52668e..8caded9 100644 --- a/hplip.spec +++ b/hplip.spec @@ -12,17 +12,13 @@ Obsoletes: xojpanel <= 0.91 Conflicts: selinux-policy < 2.3.4-1 Url: http://hplip.sourceforge.net/ -Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.8-rc3.tar.gz +Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz Patch1: hplip-desktop.patch Patch2: hplip-guest.patch Patch3: hplip-quiet.patch Patch4: hplip-cups-backend.patch -Patch5: hplip-broken-conf.patch -Patch6: hplip-libm.patch -Patch7: hplip-loop.patch -Patch8: hplip-ipv6.patch -Patch9: hplip-sane-debug.patch -Patch10: hplip-out-of-paper.patch +Patch5: hplip-libm.patch +Patch6: hplip-ipv6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -67,8 +63,8 @@ ExcludeArch: s390 s390x SANE driver for scanners in HP's multi-function devices (from HPOJ). %prep -rm -rf $RPM_BUILD_DIR/%{name}-%{version}.8-rc3 -%setup -n %{name}-%{version}.8-rc3 -q +rm -rf $RPM_BUILD_DIR/%{name}-%{version} +%setup -q # Use /usr/share/applications for putting desktop files in. %patch1 -p1 -b .desktop @@ -79,20 +75,11 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}.8-rc3 # Always use /usr/lib/cups/backend. %patch4 -p1 -b .cups-backend -# Fixed default config file (bug #211072). -%patch5 -p1 -b .broken-conf - # libhpip should link against libm (bug #197599). -%patch6 -p1 -b .libm - -# Don't wake up every half a second (bug #204725). -%patch7 -p1 -b .loop +%patch5 -p1 -b .libm # IPv6 support (bug #198377). -%patch8 -p1 -b .ipv6 - -# Report out-of-paper and offline conditions in CUPS backend (bug #216477). -%patch10 -p1 -b .out-of-paper +%patch6 -p1 -b .ipv6 autoconf # for patch4 @@ -195,7 +182,8 @@ exit 0 %changelog * Wed Jan 10 2007 Tim Waugh 1.6.12-1 -- 1.6.12. +- 1.6.12. No longer need broken-conf, loop, out-of-paper or + sane-debug patches. * Thu Dec 7 2006 Jeremy Katz - 1.6.10-7 - rebuild against python 2.5 diff --git a/sources b/sources index 776c533..83089bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01519018343978776fe4acfbdb7cb6df hplip-1.6.10.tar.gz +8adcb93703f6e90510f51b3cf96567c9 hplip-1.6.12.tar.gz