[sane-backends] don't use the same SONAME for backend libs and main lib

[Nils Philippsen]

commit a953f44bfaa6bed0d641f11ee4cd18f9a16a8061
Author: Nils Philippsen <nils at redhat.com>
Date:   Fri Aug 31 16:25:34 2012 +0200

    don't use the same SONAME for backend libs and main lib

 sane-backends-1.0.23-soname.patch |   49 +++++++++++++++++++++++++++++++++++++
 sane-backends.spec                |    5 ++++
 2 files changed, 54 insertions(+), 0 deletions(-)
---
diff --git a/sane-backends-1.0.23-soname.patch b/sane-backends-1.0.23-soname.patch
new file mode 100644
index 0000000..04ad829
--- /dev/null
+++ b/sane-backends-1.0.23-soname.patch
@@ -0,0 +1,49 @@
+From 031cd8dd376ed6537afd06ca5aec5e67f5da0489 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at redhat.com>
+Date: Fri, 31 Aug 2012 16:14:49 +0200
+Subject: [PATCH] patch: soname
+
+Squashed commit of the following:
+
+commit 2035ced803168210a70c4946814440764e5d0186
+Author: Nils Philippsen <nils at redhat.com>
+Date:   Fri Aug 31 16:13:51 2012 +0200
+
+    don't use the same SONAME for backend libs and main lib
+---
+ ltmain.sh | 19 -------------------
+ 1 file changed, 19 deletions(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index f3eb4c8..17d1508 100755
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -8101,25 +8101,6 @@ EOF
+ 	  dlname=$soname
+ 	fi
+ 
+-	# Local change for sane-backends: internal name for every lib
+-	# is "libsane" not "libsane-backendname". So linking to each
+-	# backend is possible. Also the following test was moved to this
+-	# location.
+-	# If -module or -export-dynamic was specified, set the dlname
+-	if test "$module" = yes || test "$export_dynamic" = yes; then
+-	  # On all known operating systems, these are identical.
+-	  dlname="$soname"
+-	fi
+-	case $host in
+-	  *mingw*)
+-	    ;;
+-	  *aix*)
+-	    ;;
+-	  *)
+-	    soname=`echo $soname | sed -e "s/libsane-[A-Za-z_0-9]*/libsane/g"`
+-	esac
+-	# End of local change
+-
+ 	lib="$output_objdir/$realname"
+ 	linknames=
+ 	for link
+-- 
+1.7.11.4
+
diff --git a/sane-backends.spec b/sane-backends.spec
index c9c499c..222bfa2 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -27,6 +27,9 @@ Patch0: sane-backends-1.0.23-udev.patch
 Patch1: sane-backends-1.0.21-epson-expression800.patch
 # Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313043
 Patch2: sane-backends-1.0.21-SCX4500W.patch
+# Fedora-specific (for now): don't use the same SONAME for backend libs and
+# main lib
+Patch3: sane-backends-1.0.23-soname.patch
 
 URL: http://www.sane-project.org
 
@@ -110,6 +113,7 @@ This package contains backend drivers to access digital cameras through SANE.
 %patch0 -p1 -b .udev
 %patch1 -p1 -b .epson-expression800
 %patch2 -p1 -b .SCX4500W
+%patch3 -p1 -b .soname
 
 %build
 %if ! 0%{?_hardened_build}
@@ -191,6 +195,7 @@ install -m 0644 tools/sane-backends.pc %{buildroot}%{_libdir}/pkgconfig/
 - version 1.0.23
 - update udev patch, remove obsolete patches
 - use %%_hardened_build macro from F-16 on instead of tweaking flags manually
+- don't use the same SONAME for backend libs and main lib
 
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.22-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild