rpms/alsa-oss/devel alsa-oss-1.0.12-aoss.patch, 1.1, 1.2 alsa-oss.spec, 1.1, 1.2

Thu Feb 8 17:29:02 UTC 2007

Author: jima

Update of /cvs/extras/rpms/alsa-oss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22437

Modified Files:
	alsa-oss-1.0.12-aoss.patch alsa-oss.spec 
Log Message:

* Thu Feb 08 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.12-4
- Split out libraries to -libs subpackage, fixing BZ#221711
- Implemented changes as recommended by Jason Tibbitts
- Adjusted aoss patch to allow for 32-bit library use on x86_64
- Added reference in man page to added functionality
- Resultant alsa-oss package reports no-binary error (necessary evil, I guess)


alsa-oss-1.0.12-aoss.patch:

Index: alsa-oss-1.0.12-aoss.patch
===================================================================
RCS file: /cvs/extras/rpms/alsa-oss/devel/alsa-oss-1.0.12-aoss.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- alsa-oss-1.0.12-aoss.patch	6 Oct 2006 14:11:15 -0000	1.1
+++ alsa-oss-1.0.12-aoss.patch	8 Feb 2007 17:28:30 -0000	1.2
@@ -1,13 +1,58 @@
---- alsa/aoss.in.orig	2005-10-27 14:34:18.000000000 -0400
-+++ alsa/aoss.in	2006-04-02 15:53:53.000000000 -0400
-@@ -5,9 +5,7 @@
- #	aoss <command> <command options and arguments>
+diff -urN alsa-oss-1.0.12/alsa/aoss.1 alsa-oss-1.0.12-patched/alsa/aoss.1
+--- alsa-oss-1.0.12/alsa/aoss.1	2006-08-22 13:43:53.000000000 -0500
++++ alsa-oss-1.0.12-patched/alsa/aoss.1	2007-02-08 09:34:47.000000000 -0600
+@@ -3,7 +3,7 @@
+ aoss \- Wrapper script to facilitate use of the ALSA OSS compatibility
+ library.
+ .SH SYNOPSIS
+-\fBaoss\fP \fIosscommand\fP [arguments]
++\fBaoss\fP [-32] \fIosscommand\fP [arguments]
+ 
+ .SH DESCRIPTION
+ \fBaoss\fP is a simple wrapper script which facilitates the use of the
+@@ -38,6 +38,8 @@
+ 
+ .SS Arguments
+ .TP
++\f-32\fP
++Use 32-bit alsa-oss library (on 64-bit systems)
+ \fIosscommand\fP
+ A command that uses the OSS API
+ .TP
+diff -urN alsa-oss-1.0.12/alsa/aoss.in alsa-oss-1.0.12-patched/alsa/aoss.in
+--- alsa-oss-1.0.12/alsa/aoss.in	2006-08-22 13:43:53.000000000 -0500
++++ alsa-oss-1.0.12-patched/alsa/aoss.in	2007-02-08 09:47:20.000000000 -0600
+@@ -2,12 +2,29 @@
+ 
+ # A simple script to facilitate the use of the OSS compatibility library.
+ # Usage:
+-#	aoss <command> <command options and arguments>
++#	aoss [-32] <command> <command options and arguments>
++
++if [ -f @prefix@/lib64/libaoss.so.0 ]
++then
++  AOSS_LIBDIR=@prefix@/lib64
++else
++  AOSS_LIBDIR=@prefix@/lib
++fi
++
++if [ "$1" = "-32" ]
++then
++  if [ -f @prefix@/lib/libaoss.so.0 ]
++  then
++    AOSS_LIBDIR=@prefix@/lib
++    shift
++  else
++    echo "$0 -32 called, but 32-bit alsa-oss-libs not found! Exiting..."
++    exit 2
++  fi
++fi
  
  if [ -d /proc/asound ]; then
 -  prefix=@prefix@
 -  exec_prefix=@exec_prefix@
 -  LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
-+  LD_PRELOAD=@libdir@/libaoss.so.0${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
++  LD_PRELOAD=${AOSS_LIBDIR}/libaoss.so.0${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
  else
    exec "$@"
  fi


Index: alsa-oss.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-oss/devel/alsa-oss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-oss.spec	6 Oct 2006 14:11:15 -0000	1.1
+++ alsa-oss.spec	8 Feb 2007 17:28:30 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Advanced Linux Sound Architecture (ALSA) wrapper for OSS
 Name:		alsa-oss
 Version:	1.0.12
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.alsa-project.org/
@@ -12,22 +12,30 @@
 %ifarch x86_64
 BuildRequires:	automake, libtool
 %endif
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description
 This package contains the compatibility library and wrapper script for
 running legacy OSS applications through ALSA. Unlike the kernel
 driver, this has the advantage of supporting DMIX software mixing.
 
+%package libs
+Summary:	ALSA/OSS wrapper libraries
+Group:		System Environment/Libraries
+Requires:	%{name} = %{version}-%{release}
+%description libs
+System libraries for alsa-oss.
+
 %package devel
 Summary:	Headers for ALSA wrapper for OSS
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}, %{name}-libs = %{version}-%{release}
 %description devel
 Header files for alsa-oss.
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
 
 %build
 %ifarch x86_64
@@ -48,13 +56,16 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/aoss
+
+%files libs
+%defattr(-,root,root,-)
 %{_libdir}/*.so.*
 %{_mandir}/man?/*
 
@@ -67,6 +78,13 @@
 
 
 %changelog
+* Thu Feb 08 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.12-4
+- Split out libraries to -libs subpackage, fixing BZ#221711
+- Implemented changes as recommended by Jason Tibbitts
+- Adjusted aoss patch to allow for 32-bit library use on x86_64
+- Added reference in man page to added functionality
+- Resultant alsa-oss package reports no-binary error (necessary evil, I guess)
+
 * Fri Oct 06 2006 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.12-3
 - Added conditionalized rpath fixes for x86_64 (thanks Denis!)
 - Re-added *.a to -devel package


