diff --git a/module-build.diff b/module-build.diff
new file mode 100644
index 0000000..cd46b51
--- /dev/null
+++ b/module-build.diff
@@ -0,0 +1,11 @@
+--- backend/Makefile.in
++++ backend/Makefile.in
+@@ -180,7 +180,7 @@ DISTFILES = abaton.c abaton.conf.in abaton.h agfafocus.c agfafocus.conf.in \
+ libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
+ @$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
+ $(LDFLAGS) $(BACKENDLIBS) $^ @LIBTOOL_LINK_EXTRA@ -rpath $(libsanedir) \
+- -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG)
++ -module -avoid-version -no-undefined
+
+ %-s.lo: %-s.c
+ @$(LIBTOOL) $(MCOMP) $(COMPILE) -DSTUBS -DBACKEND_NAME=$* $<
diff --git a/rpmlintrc b/rpmlintrc
deleted file mode 100644
index 7c893c3..0000000
--- a/rpmlintrc
+++ /dev/null
@@ -1,4 +0,0 @@
-# This line is mandatory to access the configuration functions
-from Config import *
-
-addFilter("sane-backends devel-file-in-non-devel-package .*libsane.*.so")
diff --git a/sane-backends.changes b/sane-backends.changes
index b40b8ba..6ecf26c 100644
--- a/sane-backends.changes
+++ b/sane-backends.changes
@@ -1,7 +1,7 @@
-------------------------------------------------------------------
-Wed Jun 6 01:19:40 CEST 2007 - ro@suse.de
+Wed Jun 6 15:25:26 CEST 2007 - dmueller@suse.de
-- suppress devel file warnings for libsane*.so
+- build modules as libtool modules
-------------------------------------------------------------------
Sat Apr 21 15:15:08 CEST 2007 - aj@suse.de
diff --git a/sane-backends.spec b/sane-backends.spec
index 0f0bc14..b69dff1 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -17,11 +17,10 @@ Group: Hardware/Scanner
Autoreqprov: on
Summary: SANE (Scanner Access Now Easy) scanner drivers
Version: 1.0.18
-Release: 34
+Release: 36
URL: http://www.sane-project.org/
# URL for Source0: http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz
Source0: sane-backends-%{version}.tar.bz2
-Source1: rpmlintrc
# Source100... is SUSE specific stuff:
Source100: sane-dev
Source101: sane-port
@@ -74,6 +73,7 @@ Patch6: fix-ambiguous-post-pre-increment.patch
Patch100: canon-backend-autoprobing.patch
# Patch101 disables the special resmgr support in SANE (resmgr works now via ACLs):
Patch101: disable-resmgr-support.patch
+Patch102: module-build.diff
# Install into this non-root directory (required when norootforbuild is used):
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# The postinstall script requires this:
@@ -214,6 +214,7 @@ mv po/sane-backends.no.po po/sane-backends.nb.po
%patch100
# Patch101 disables the special resmgr support in SANE (resmgr works now via ACLs):
%patch101
+%patch102
# Source100... is SUSE specific stuff:
# Replace hpoj.desc descriptions-external file by our enhanced version:
cp %{SOURCE103} doc/descriptions-external/hpoj.desc
@@ -342,8 +343,8 @@ exit 0
%doc %{_mandir}/man8/saned.8.gz
%changelog
-* Wed Jun 06 2007 - ro@suse.de
-- suppress devel file warnings for libsane*.so
+* Wed Jun 06 2007 - dmueller@suse.de
+- build modules as libtool modules
* Sat Apr 21 2007 - aj@suse.de
- Use texlive.
* Wed Feb 21 2007 - jsmeix@suse.de