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

- Rediff libsane patch.

Browse Source
This commit is contained in:
Tim Waugh 2008-12-11 12:28:29 +00:00
parent 919a179820
commit 1e1fb0cb5d
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hplip-libsane.patch
View File

@ -1,24 +1,24 @@
diff -up hplip-2.8.6/Makefile.am.libsane hplip-2.8.6/Makefile.am diff -up hplip-2.8.10/Makefile.am.libsane hplip-2.8.10/Makefile.am
--- hplip-2.8.6/Makefile.am.libsane 2008-06-23 12:13:10.000000000 +0100 --- hplip-2.8.10/Makefile.am.libsane 2008-10-31 22:25:17.000000000 +0000
+++ hplip-2.8.6/Makefile.am 2008-06-23 12:14:24.000000000 +0100 +++ hplip-2.8.10/Makefile.am 2008-12-11 12:26:58.000000000 +0000
@@ -187,7 +187,7 @@ else @@ -194,7 +194,7 @@ else
libsane_hpaio_la_LDFLAGS = $(BB_SCAN_VERSION) libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
endif endif
# The following is a interlibrary dependency that must be compiled first. # The following is a interlibrary dependency that must be compiled first.
-libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
+libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane +libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) $(BB_SCAN_CFLAGS) libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)
diff -up hplip-2.8.6/Makefile.in.libsane hplip-2.8.6/Makefile.in diff -up hplip-2.8.10/Makefile.in.libsane hplip-2.8.10/Makefile.in
--- hplip-2.8.6/Makefile.in.libsane 2008-06-23 12:13:10.000000000 +0100 --- hplip-2.8.10/Makefile.in.libsane 2008-10-31 22:27:27.000000000 +0000
+++ hplip-2.8.6/Makefile.in 2008-06-23 12:14:39.000000000 +0100 +++ hplip-2.8.10/Makefile.in 2008-12-11 12:26:58.000000000 +0000
@@ -1679,7 +1679,7 @@ lib_LTLIBRARIES = $(am__append_4) @@ -2653,7 +2653,7 @@ dist_unrel_DATA =
@DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = $(BB_SCAN_VERSION) @DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
@DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation $(BB_SCAN_VERSION) @DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
# The following is a interlibrary dependency that must be compiled first. # The following is a interlibrary dependency that must be compiled first.
-@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
+@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane
#libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) $(BB_SCAN_CFLAGS) @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS)

5
hplip.spec
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: 2.8.10 Version: 2.8.10
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -301,6 +301,9 @@ fi
exit 0 exit 0
%changelog %changelog
* Thu Dec 11 2008 Tim Waugh <twaugh@redhat.com> 2.8.10-2
- Rediff libsane patch.
* Thu Dec 11 2008 Tim Waugh <twaugh@redhat.com> 2.8.10-1 * Thu Dec 11 2008 Tim Waugh <twaugh@redhat.com> 2.8.10-1
- 2.8.10. No longer need gzip-n or quiet patches. - 2.8.10. No longer need gzip-n or quiet patches.