Accepting request 39815 from home:lnussel:branches:graphics

Copy from home:lnussel:branches:graphics/sane-backends via accept of submit request 39815 revision 2.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/39815
OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=25

disable-resmgr-support.patch

@@ -1,35 +0,0 @@
---- configure.in.orig	2010-04-26 02:55:27.000000000 +0200
-+++ configure.in	2010-05-07 12:14:59.000000000 +0200
-@@ -155,16 +155,22 @@ AC_CHECK_HEADERS([asm/io.h],,,[#include
- 
- SANE_CHECK_MISSING_HEADERS
- 
--AC_CHECK_HEADER(resmgr.h,[
--	AC_CHECK_LIB(
--		resmgr,
--		rsm_open_device,[
--			AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr library])
--			RESMGR_LIBS="-lresmgr"
--		]
--	)
--])
--AC_SUBST(RESMGR_LIBS)
-+# Since Suse Linux 10.0 resmgr installs ACLs on device nodes.
-+# Therefore there is no need to patch applications with special resmgr
-+# support anymore.
-+# As the "rsm_open_device" calls in sanei_scsi.c and sanei_usb.c
-+# are optionally via "ifdef HAVE_RESMGR" with fallback "open" calls,
-+# the special resmgr support is not removed but only disabled here:
-+# AC_CHECK_HEADER(resmgr.h,[
-+# 	AC_CHECK_LIB(
-+# 		resmgr,
-+# 		rsm_open_device,[
-+# 			AC_DEFINE(HAVE_RESMGR,1,[define if you have the resmgr library])
-+# 			RESMGR_LIBS="-lresmgr"
-+# 		]
-+# 	)
-+# ])
-+# AC_SUBST(RESMGR_LIBS)
- 
- dnl ***********************************************************************
- dnl Checks for types and structures

sane-backends.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 11 14:31:58 UTC 2010 - lnussel@suse.de
+
+- remove disable-resmgr-support.patch. It's not needed as configure won't find
+  resmgr anyways
+
 -------------------------------------------------------------------
 Fri May  7 11:43:41 CEST 2010 - jsmeix@suse.de
 

sane-backends.spec

@@ -123,8 +123,6 @@ Patch15:        fix-genesys-create_range-type.patch
 # Patch100... is SUSE specific stuff:
 # Patch100 lets the "canon" backend do scanner auto-recognition:
 Patch100:       canon-backend-autoprobing.patch
-# Patch101 disables the special resmgr support in SANE (resmgr works now via ACLs):
-Patch101:       disable-resmgr-support.patch
 # Patch102 builds libsane-* modules as libtool modules:
 # SANE backends (i.e. driver modules) are regular shared libraries.
 # Nothing is linked directly with a /usr/lib/sane/libsane-<driver>.so module.
@@ -304,14 +302,6 @@ only overcomplicated because when more than one scanner uses the same
 driver, a complicated check would be needed to avoid that the driver is
 accidentally disabled when only one scanner was disconnected.
 
-Note that driver activation alone is not sufficient to have a usable
-"scanner autoconfiguration" for the user. What is also needed are
-appropriate USB device file permissions so that the user's scanning
-software can access the device. But this is already in place via the
-HAL 70-scanner.fdi file which triggers the resmgr to grant access
-permissions for the user who is currently locally logged in (i.e. who
-works directly at the computer where the USB scanner is).
-
 If you do not like automated driver activation, do not install this
 package or remove it when it is already installed.
 
@@ -339,8 +329,6 @@ Authors:
 # Patch100... is SUSE specific stuff:
 # Patch100 lets the "canon" backend do scanner auto-recognition:
 %patch100
-# Patch101 disables the special resmgr support in SANE (resmgr works now via ACLs):
-%patch101
 # Patch103 installs tools/umax_pp as /usr/bin/umax_pp:
 %patch103
 # Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am