rpms/hplip
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Link libsane-hpaio against libsane (bug #234813).

Browse Source 
- Resolves: rhbz#234813
This commit is contained in:
Tim Waugh 2007-04-03 12:53:42 +00:00
parent 64e40436b4
commit 98e583d922
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hplip-libsane.patch Normal file
View File

@ -0,0 +1,22 @@
--- hplip-1.7.2/Makefile.in.libsane 2007-04-03 13:52:04.000000000 +0100
+++ hplip-1.7.2/Makefile.in 2007-04-03 13:53:17.000000000 +0100
@@ -579,7 +579,7 @@
# scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER)
# The following is a interlibrary dependency that must be compiled first.
-@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la
+@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN
--- hplip-1.7.2/Makefile.am.libsane 2007-04-03 13:52:04.000000000 +0100
+++ hplip-1.7.2/Makefile.am 2007-04-03 13:52:40.000000000 +0100
@@ -192,7 +192,7 @@
# scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER)
# The following is a interlibrary dependency that must be compiled first.
-libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la
+libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN

7
hplip.spec
View File

@ -20,6 +20,7 @@ Patch4: hplip-cups-backend.patch
Patch5: hplip-libm.patch
Patch6: hplip-ipv6.patch
Patch7: hplip-marker-supply.patch
Patch8: hplip-libsane.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Requires: desktop-file-utils >= 0.2.92
@ -85,6 +86,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Use marker-supply-low IPP message.
%patch7 -p1 -b .marker-supply
# Link libsane-hpaio against libsane (bug #234813).
%patch8 -p1 -b .libsane
autoconf # for patch4
%build
@ -185,6 +189,9 @@ fi
exit 0
%changelog
* Tue Apr 3 2007 Tim Waugh <twaugh@redhat.com>
- Link libsane-hpaio against libsane (bug #234813).
* Fri Mar 30 2007 Tim Waugh <twaugh@redhat.com>
- Use marker-supply-low IPP message.