From 87b7df01eb53039f56c90098f96205d366b28177 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 4 Jul 2006 15:05:08 +0000 Subject: [PATCH] - libhpip should link against libm (bug #197599). --- hplip-libm.patch | 22 ++++++++++++++++++++++ hplip.spec | 11 +++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 hplip-libm.patch diff --git a/hplip-libm.patch b/hplip-libm.patch new file mode 100644 index 0000000..9bd59a2 --- /dev/null +++ b/hplip-libm.patch @@ -0,0 +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 @@ + 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 + +-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 @@ + 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 +-libhpip_la_LDFLAGS = -version-info 0:1:0 ++libhpip_la_LDFLAGS = -lm -version-info 0:1:0 + + # sane backend + BASENAME=sane-hpaio diff --git a/hplip.spec b/hplip.spec index afbb859..1decd0f 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 1.6.6a -Release: 2 +Release: 3 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -15,6 +15,7 @@ Patch2: hplip-config.patch Patch3: hplip-quiet.patch Patch4: hplip-cups-backend.patch Patch5: hplip-compile.patch +Patch6: hplip-libm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -77,6 +78,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Work around missing linux/compiler.h. %patch5 -p1 -b .compile +# libhpip should link against libm (bug #197599). +%patch6 -p1 -b .libm + autoconf # for patch4 %build @@ -177,7 +181,10 @@ fi exit 0 %changelog -* Wed Jun 28 2006 Tim Waugh 1.6.6a-1 +* Tue Jul 4 2006 Tim Waugh 1.6.6a-3 +- libhpip should link against libm (bug #197599). + +* Wed Jun 28 2006 Tim Waugh 1.6.6a-2 - 1.6.6a. * Mon Jun 26 2006 Tim Waugh