Hello community, here is the log from the commit of package alsa-oss for openSUSE:Factory checked in at 2013-05-28 07:24:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-oss (Old) and /work/SRC/openSUSE:Factory/.alsa-oss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-oss" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-oss/alsa-oss.changes 2012-04-03 09:19:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-oss.new/alsa-oss.changes 2013-05-28 07:24:12.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 23 15:50:21 CEST 2013 - [email protected] + +- Backport upstream fixes: + 0001-Fix-path-to-libaoss.so.patch + 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-path-to-libaoss.so.patch 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-oss.spec ++++++ --- /var/tmp/diff_new_pack.B2flL5/_old 2013-05-28 07:24:13.000000000 +0200 +++ /var/tmp/diff_new_pack.B2flL5/_new 2013-05-28 07:24:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package alsa-oss # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,9 @@ Source: ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{package_version}.tar.bz2 Source2: baselibs.conf # Patch: alsa-oss-hg-fixes.diff +# upstream fixes +Patch1: 0001-Fix-path-to-libaoss.so.patch +Patch2: 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch Url: http://www.alsa-project.org/ %ifarch s390x Recommends: %{name}-32bit = %{version} @@ -41,6 +44,8 @@ %prep %setup -q -n %{name}-%{package_version} # %patch -p1 +%patch1 -p1 +%patch2 -p1 %build autoreconf -fi ++++++ 0001-Fix-path-to-libaoss.so.patch ++++++ >From 53e8f2dace57cd428e046059ac7172e58d206429 Mon Sep 17 00:00:00 2001 From: Jordi Mallach <[email protected]> Date: Wed, 15 May 2013 18:58:05 +0200 Subject: [PATCH 1/2] Fix path to libaoss.so. Fix path to libaoss.so using ${libdir} instead of ${exec_prefix}. ${libdir} has the value given at configure time and works with Debian's Multiarch implementation. Signed-off-by: Jordi Mallach <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- alsa/aoss.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa/aoss.in b/alsa/aoss.in index c551431..d8e1d6d 100644 --- a/alsa/aoss.in +++ b/alsa/aoss.in @@ -6,8 +6,8 @@ if [ -d /proc/asound ]; then prefix=@prefix@ - exec_prefix=@exec_prefix@ - LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" + libdir=@libdir@ + LD_PRELOAD=${libdir}/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" else exec "$@" fi -- 1.8.2.3 ++++++ 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch ++++++ >From 39df15865875c005ca13714ca464833162a2a24d Mon Sep 17 00:00:00 2001 From: Jordi Mallach <[email protected]> Date: Wed, 15 May 2013 18:58:07 +0200 Subject: [PATCH 2/2] Add AM_MAINTAINER_MODE([enable]) to configure.in. Signed-off-by: Jordi Mallach <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- configure.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.in b/configure.in index d0318e7..0afeb8a 100644 --- a/configure.in +++ b/configure.in @@ -2,6 +2,8 @@ AC_PREREQ(2.59) AC_INIT(alsa/alsa-oss.c) AM_INIT_AUTOMAKE(alsa-oss, 1.0.25) +AM_MAINTAINER_MODE([enable]) + LIBTOOL_VERSION_INFO="0:0:0" AC_SUBST(LIBTOOL_VERSION_INFO) -- 1.8.2.3 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
