diff --git a/sane-backends-1.0.20-rpath.patch b/sane-backends-1.0.20-rpath.patch index ba3cd73..e2f34ef 100644 --- a/sane-backends-1.0.20-rpath.patch +++ b/sane-backends-1.0.20-rpath.patch @@ -1,11 +1,17 @@ -commit e0de6eaee11254667eb6abb6e2ccb7768bd2de4f +commit 1249be5ecbd635feeb880b2c60582b34bc04a798 Author: Nils Philippsen -Date: Tue Jun 16 16:59:43 2009 +0200 +Date: Mon Aug 31 16:38:23 2009 +0200 - patch: rpath + path: rpath Squashed commit of the following: + commit c37206c9fa724e19f6929d8a77e5399ca6b87f1f + Author: Nils Philippsen + Date: Mon Aug 31 16:34:42 2009 +0200 + + fix --enable-rpath + commit be2982b2d1ae4d889b4cecec289336b4b03579aa Author: Nils Philippsen Date: Tue Jun 2 16:12:23 2009 +0200 @@ -15,10 +21,10 @@ Date: Tue Jun 16 16:59:43 2009 +0200 make using runtime library search path configurable diff --git a/acinclude.m4 b/acinclude.m4 -index 6413b60..c6f5800 100644 +index 6413b60..b2bb065 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -383,19 +383,31 @@ dnl +@@ -383,19 +383,29 @@ dnl AC_DEFUN([SANE_LINKER_RPATH], [dnl AC_REQUIRE([AC_SUBST])dnl This line resulted in an empty AC_SUBST() !! @@ -38,9 +44,7 @@ index 6413b60..c6f5800 100644 + AC_MSG_CHECKING([whether runtime link path should be used]) + AC_ARG_ENABLE([rpath], + [AS_HELP_STRING([--enable-rpath], -+ [use runtime library search path @<:@default=yes@:>@])] -+ [], -+ [enable_readline=yes]) ++ [use runtime library search path @<:@default=yes@:>@])]) + + LINKER_RPATH= + AS_IF([test "x$enable_rpath" != xno], diff --git a/sane-backends.spec b/sane-backends.spec index ba8ba11..a67efdb 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.20 -Release: 6%{?dist} +Release: 7%{?dist} # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain # see LICENSE for details @@ -157,6 +157,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/sane-backends.pc %changelog +* Fri Aug 31 2009 Nils Philippsen - 1.0.20-7 +- fix --enable-rpath + * Mon Aug 03 2009 Nils Philippsen - 1.0.20-6 - remove ExcludeArch: s390 s390x diff --git a/sources b/sources index fe60176..541f85a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ a0cfdfdebca2feb4f2ba5d3418b15a42 sane-backends-1.0.20.tar.gz -cd71d7e8a2ea0c1a8d51901317f50d39 sane-backends-1.0.20-autoreconf.patch.bz2 +55134659213e74bc1d9d5326102072b4 sane-backends-1.0.20-autoreconf.patch.bz2