Hello community, here is the log from the commit of package iscan-free checked in at Tue May 6 19:08:44 CEST 2008. -------- --- iscan-free/iscan-free.changes 2008-04-10 13:51:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/iscan-free/iscan-free.changes 2008-04-16 10:42:30.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 16 10:41:50 CEST 2008 - schwab@suse.de + +- Add some forward compatibility with libtool. + +------------------------------------------------------------------- New: ---- libltdl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iscan-free.spec ++++++ --- /var/tmp/diff_new_pack.j21513/_old 2008-05-06 19:07:52.000000000 +0200 +++ /var/tmp/diff_new_pack.j21513/_new 2008-05-06 19:07:52.000000000 +0200 @@ -35,6 +35,7 @@ Source0: iscan-free_2.10.0-1.tar.bz2 # A README regarding the changes of the free version: Source1: README +Patch1: libltdl.patch # Patch3 replaces fixed HZ compile-time value by sysconf(_SC_CLK_TCK) runtime value: Patch3: replace-HZ-by-sysconf_SC_CLK_TCK.patch # Patch4 applies fixes for GCC 4.3 (see http://en.opensuse.org/GCC_4.3_Transition): @@ -45,7 +46,7 @@ Patch10: adapt-man-for-free.patch # Have Epson Avasys' release number at the end of the SUSE package Version: Version: 2.10.0.1 -Release: 1 +Release: 13 # See the post and triggerin sections what is pre-required: PreReq: coreutils, /bin/grep, /bin/sed Requires: sane-backends @@ -68,6 +69,7 @@ %setup -q -n iscan-2.10.0 # Get the README regarding the changes of the free version: cp %{SOURCE1} . +%patch1 # Patch3 replaces fixed HZ compile-time value by sysconf(_SC_CLK_TCK) runtime value: %patch3 # Patch4 applies fixes for GCC 4.3: @@ -87,6 +89,7 @@ sed -i -e 's/requires DFSG non-free/requires DFSG non-free plugin in the iscan-proprietary-drivers package:/' doc/epkowa.desc %build +rm -f m4/libtool.m4 autoreconf -fi # Set our preferred architecture-specific flags for the compiler and linker: # If -D_GNU_SOURCE is not set, the prototype for strndup in /usr/include/string.h is skipped. @@ -247,6 +250,8 @@ Dirk O. Siebnich %changelog +* Wed Apr 16 2008 schwab@suse.de +- Add some forward compatibility with libtool. * Thu Apr 10 2008 jsmeix@suse.de - Updated to version 2.10.0-1 (results package version 2.10.0.1): There are many more supported models (for details see ++++++ libltdl.patch ++++++ --- configure.ac +++ configure.ac @@ -30,7 +30,10 @@ AC_SUBST(PACKAGE_RELEASE,1) dnl keep A AC_CONFIG_HEADER([config.h]) AC_CONFIG_SRCDIR([backend/epkowa.c]) +dnl Detect old libtool +m4_ifndef([LT_OUTPUT], [ AC_CONFIG_SUBDIRS([libltdl]) +]) AM_INIT_AUTOMAKE([gnu 1.7]) @@ -196,10 +199,10 @@ dnl The somewhat obscure LT_AC_PROG_SED dnl SED environment variable gets set before it's used by the libtool dnl machinery. This works around buggy libtool versions. LT_AC_PROG_SED -AC_LIB_LTDL AC_LIBLTDL_CONVENIENCE AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL +AC_LIB_LTDL AC_SUBST(LTDLINCL) AC_SUBST(LIBLTDL) --- lib/imgstream.cc +++ lib/imgstream.cc @@ -211,6 +211,17 @@ int selector (const dirent *); imgstream::dl_handle imgstream::find_dlopen (const char *libname) { +// forward compatibility +#ifndef LTDL_SHLIB_EXT +#define LTDL_SHLIB_EXT LT_MODULE_EXT +#endif +#ifndef LTDL_SHLIBPATH_VAR +#define LTDL_SHLIBPATH_VAR LT_MODULE_PATH_VAR +#endif +#ifndef LTDL_SYSSEARCHPATH +#define LTDL_SYSSEARCHPATH LT_DLSEARCH_PATH +#endif + using std::bad_alloc; dl_handle result = NULL; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org