diff --git a/cups-backends-silenct-hal.patch b/cups-backends-silenct-hal.patch new file mode 100644 index 0000000..579aed3 --- /dev/null +++ b/cups-backends-silenct-hal.patch @@ -0,0 +1,30 @@ +diff -ur /usr/src/packages/BUILD/cups-backends-1.0/hal.c ./hal.c +--- /usr/src/packages/BUILD/cups-backends-1.0/hal.c 2005-07-26 05:50:29.000000000 -0400 ++++ ./hal.c 2007-07-12 15:39:37.000000000 -0400 +@@ -75,11 +75,14 @@ + static void + list_devices (void) + { +- LibHalContext *hal_ctx; +- char **printers; +- int i, n; ++ //LibHalContext *hal_ctx; ++ //char **printers; ++ //int i, n; + +- if (!(hal_ctx = get_hal_ctx ())) ++ printf("direct hal \"Unknown\" \"Hal printing backend\"\n"); ++ ++#if 0 ++ if (!(hal_ctx = get_hal_ctx ())) + return; + + printers = libhal_find_device_by_capability (hal_ctx, "printer", &n, NULL); +@@ -126,6 +129,7 @@ + + libhal_ctx_shutdown (hal_ctx, NULL); + libhal_ctx_free (hal_ctx); ++#endif + } + + /* diff --git a/cups-backends.changes b/cups-backends.changes index 4dce3ae..2130895 100644 --- a/cups-backends.changes +++ b/cups-backends.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 30 20:31:55 CEST 2007 - crivera@suse.de + +- Silence the hal backend. This will allow current printers + that use the hal backend to work, but it will not report new + printers. This is the first step toward removing the backend + completely. + ------------------------------------------------------------------- Wed Mar 22 19:20:19 CET 2006 - lmuelle@suse.de diff --git a/cups-backends.spec b/cups-backends.spec index c73d257..92bc100 100644 --- a/cups-backends.spec +++ b/cups-backends.spec @@ -1,7 +1,7 @@ # # spec file for package cups-backends (Version 1.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,10 +13,10 @@ Name: cups-backends BuildRequires: cups-devel hal-devel Summary: Various Free Backends for the cups Package -License: GPL +License: GPL v2 or later Group: Hardware/Printing Version: 1.0 -Release: 11 +Release: 103 Source0: http://www.srz.de/Members/bla/cups/backend/hpnpf/hpnpf.tgz Source1: http://www.srz.de/Members/bla/cups/backend/hpnpf/hpnpf.txt Source2: cups-pipe.pl @@ -24,6 +24,7 @@ Source4: hal.c Source5: http://www.linuxprinting.org/download/printing/beh Source6: README-beh.html Patch0: hpnpf.patch +Patch1: cups-backends-silenct-hal.patch Requires: cups-libs, dbus-1, hal BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,6 +47,7 @@ cd .. cp -a %{SOURCE4} . cp -a %{SOURCE5} beh cp -a %{SOURCE6} . +%patch1 -p0 %build gcc $RPM_OPT_FLAGS -fPIC -fPIE -pie -DDBUS_API_SUBJECT_TO_CHANGE \ @@ -65,7 +67,12 @@ install -m 755 -D beh $RPM_BUILD_ROOT%{_libdir}/cups/backend/beh %{_libdir}/cups/backend/* %doc README-beh.html -%changelog -n cups-backends +%changelog +* Mon Jul 30 2007 - crivera@suse.de +- Silence the hal backend. This will allow current printers + that use the hal backend to work, but it will not report new + printers. This is the first step toward removing the backend + completely. * Wed Mar 22 2006 - lmuelle@suse.de - Update beh backend to the current version. - Add beh documentation derivated from http://www.linuxprinting.org/beh.html.