From 58ec0b405a5a3e08f82ddec905699f41f767e578 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 14:37:41 +0000 Subject: [PATCH 01/21] Initialize branch FC-6 for alsa-oss --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From c67d0e1a340b13a675e6dc6e512571539ce770ea Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Thu, 8 Feb 2007 17:28:30 +0000 Subject: [PATCH 02/21] - 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 | 55 ++++++++++++++++++++++++++++++++++---- alsa-oss.spec | 28 +++++++++++++++---- 2 files changed, 73 insertions(+), 10 deletions(-) diff --git a/alsa-oss-1.0.12-aoss.patch b/alsa-oss-1.0.12-aoss.patch index 4597c36..c3baf6f 100644 --- a/alsa-oss-1.0.12-aoss.patch +++ b/alsa-oss-1.0.12-aoss.patch @@ -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 +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 ++# aoss [-32] ++ ++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 diff --git a/alsa-oss.spec b/alsa-oss.spec index 10ac2d3..ab428e3 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -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 @@ BuildRequires: alsa-lib-devel >= %{version} %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 @@ autoreconf -f -i %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 @@ autoreconf -f -i %changelog +* Thu Feb 08 2007 Patrick "Jima" Laughton 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 1.0.12-3 - Added conditionalized rpath fixes for x86_64 (thanks Denis!) - Re-added *.a to -devel package From 6a40affc0247a4f354f5c186a3693354e08f425d Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Tue, 24 Jul 2007 13:50:55 +0000 Subject: [PATCH 03/21] - Updated to match F8 alsa-libs - Changed reference to patch filename --- alsa-oss.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index ab428e3..68999a8 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,12 +1,12 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss -Version: 1.0.12 -Release: 4%{?dist} +Version: 1.0.14 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2 -Patch: %{name}-%{version}-aoss.patch +Patch: %{name}-1.0.12-aoss.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} %ifarch x86_64 @@ -78,6 +78,10 @@ autoreconf -f -i %changelog +* Tue Jul 24 2007 Patrick "Jima" Laughton 1.0.14-1 +- Updated to match F8 alsa-libs +- Changed reference to patch filename + * Thu Feb 08 2007 Patrick "Jima" Laughton 1.0.12-4 - Split out libraries to -libs subpackage, fixing BZ#221711 - Implemented changes as recommended by Jason Tibbitts diff --git a/sources b/sources index 0ad8412..39b4547 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4d18bbf63a866d6e065b90e16acd676 alsa-oss-1.0.12.tar.bz2 +a24475b978982ff8cb2f25be793c6b83 alsa-oss-1.0.14.tar.bz2 From 89c23ab48639374ffc871a6efb668d84bebb9bde Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Wed, 25 Jul 2007 17:21:35 +0000 Subject: [PATCH 04/21] binutils/gcc bug rebuild (#249435) --- alsa-oss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index 68999a8..47bd550 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.14 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -78,6 +78,9 @@ autoreconf -f -i %changelog +* Wed Jul 25 2007 Warren Togami 1.0.14-2 +- binutils/gcc bug rebuild (#249435) + * Tue Jul 24 2007 Patrick "Jima" Laughton 1.0.14-1 - Updated to match F8 alsa-libs - Changed reference to patch filename From 583b6da3cbd66470604e3ccb1cfd33d54fb4d072 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Thu, 16 Aug 2007 21:28:19 +0000 Subject: [PATCH 05/21] - License clarification - Copied glibc open() workaround from alsa-lib-1.0.14-glibc-open.patch --- alsa-oss-glibc-open.patch | 12 ++++++++++++ alsa-oss.spec | 10 ++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 alsa-oss-glibc-open.patch diff --git a/alsa-oss-glibc-open.patch b/alsa-oss-glibc-open.patch new file mode 100644 index 0000000..bdbdfea --- /dev/null +++ b/alsa-oss-glibc-open.patch @@ -0,0 +1,12 @@ +--- alsa-oss-1.0.14/alsa/alsa-oss.c.orig 2007-05-31 03:11:51.000000000 -0500 ++++ alsa-oss-1.0.14/alsa/alsa-oss.c 2007-08-16 16:21:27.000000000 -0500 +@@ -284,6 +284,9 @@ static int mixer_open_helper(const char + return fd; + } + ++#undef open ++#undef open64 ++ + #define DECL_OPEN(name, callback) \ + int name(const char *file, int oflag, ...) \ + { \ diff --git a/alsa-oss.spec b/alsa-oss.spec index 47bd550..00c2059 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,12 +1,13 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.14 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2 Patch: %{name}-1.0.12-aoss.patch +Patch1: %{name}-glibc-open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} %ifarch x86_64 @@ -36,6 +37,7 @@ Header files for alsa-oss. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %ifarch x86_64 @@ -78,6 +80,10 @@ autoreconf -f -i %changelog +* Thu Aug 16 2007 Patrick "Jima" Laughton 1.0.14-3 +- License clarification +- Copied glibc open() workaround from alsa-lib-1.0.14-glibc-open.patch + * Wed Jul 25 2007 Warren Togami 1.0.14-2 - binutils/gcc bug rebuild (#249435) From 953c5e1fb27db15251ad40cde7d0c280fc472b0f Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Thu, 16 Aug 2007 21:41:57 +0000 Subject: [PATCH 06/21] - License clarification Thu Feb 08 2007 Patrick "Jima" Laughton 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) (keeping FC-6 branch in line with F-7; the edit was mainly for the license) --- alsa-oss.spec | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index 10ac2d3..530e67b 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,8 +1,8 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.12 -Release: 3%{?dist} -License: GPL +Release: 5%{?dist} +License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2 @@ -12,22 +12,30 @@ BuildRequires: alsa-lib-devel >= %{version} %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 @@ autoreconf -f -i %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,16 @@ autoreconf -f -i %changelog +* Thu Aug 16 2007 Patrick "Jima" Laughton 1.0.12-5 +- License clarification + +* Thu Feb 08 2007 Patrick "Jima" Laughton 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 1.0.12-3 - Added conditionalized rpath fixes for x86_64 (thanks Denis!) - Re-added *.a to -devel package From 49fa8677ee41da93153f2d04aa3e3d5ab1ae511f Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Wed, 13 Feb 2008 14:57:02 +0000 Subject: [PATCH 07/21] - New upstream version Huh...never got committed. :-( --- alsa-oss.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index 00c2059..ef33366 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss -Version: 1.0.14 -Release: 3%{?dist} +Version: 1.0.15 +Release: 0.1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -80,6 +80,9 @@ autoreconf -f -i %changelog +* Mon Oct 22 2007 Patrick "Jima" Laughton 1.0.15-0.1 +- New upstream version + * Thu Aug 16 2007 Patrick "Jima" Laughton 1.0.14-3 - License clarification - Copied glibc open() workaround from alsa-lib-1.0.14-glibc-open.patch diff --git a/sources b/sources index 39b4547..657ea6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a24475b978982ff8cb2f25be793c6b83 alsa-oss-1.0.14.tar.bz2 +49fb5fbae8bf955b248e46ff9c9a2aa1 alsa-oss-1.0.15.tar.bz2 From 9278bf943d34221be68b0eacb1d5bfadec4ee7ff Mon Sep 17 00:00:00 2001 From: perex Date: Tue, 29 Jul 2008 08:48:57 +0000 Subject: [PATCH 08/21] alsa-oss: updated to upstream - 1.0.17 --- .cvsignore | 1 + alsa-oss.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..45f7801 --- /dev/null +++ b/.cvsignore @@ -0,0 +1 @@ +alsa-oss-1.0.17.tar.bz2 diff --git a/alsa-oss.spec b/alsa-oss.spec index ef33366..e79434b 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss -Version: 1.0.15 -Release: 0.1%{?dist} +Version: 1.0.17 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -80,6 +80,9 @@ autoreconf -f -i %changelog +* Tue Jul 29 2008 Jaroslav Kysela 1.0.17-1 +- New upstream version + * Mon Oct 22 2007 Patrick "Jima" Laughton 1.0.15-0.1 - New upstream version diff --git a/sources b/sources index 657ea6f..e34fa00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49fb5fbae8bf955b248e46ff9c9a2aa1 alsa-oss-1.0.15.tar.bz2 +1b1850c2fc91476a73d50f537cbd402f alsa-oss-1.0.17.tar.bz2 From 79fa0800e43871bf4f75b0b0ad568d48fdf04c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 21 Sep 2008 08:11:47 +0000 Subject: [PATCH 09/21] - Fix Patch:/%patch0 mismatch. https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.h tml --- alsa-oss.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index e79434b..67acd9b 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,12 +1,12 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2 -Patch: %{name}-1.0.12-aoss.patch +Patch0: %{name}-1.0.12-aoss.patch Patch1: %{name}-glibc-open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} @@ -80,6 +80,9 @@ autoreconf -f -i %changelog +* Sun Sep 21 2008 Ville Skyttä - 1.0.17-2 +- Fix Patch:/%%patch0 mismatch. + * Tue Jul 29 2008 Jaroslav Kysela 1.0.17-1 - New upstream version From 808fbfbd21a5cfbdd4cf7667c56737066cdb9dd3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 00:45:54 +0000 Subject: [PATCH 10/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- alsa-oss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index 67acd9b..866e4a7 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.17 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -80,6 +80,9 @@ autoreconf -f -i %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 1.0.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Sep 21 2008 Ville Skyttä - 1.0.17-2 - Fix Patch:/%%patch0 mismatch. From c2b6c09c8dd070f63a43ca727d4a39ff30d19485 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:47:36 +0000 Subject: [PATCH 11/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- alsa-oss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index 866e4a7..3aef8a3 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.17 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -80,6 +80,9 @@ autoreconf -f -i %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.17-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 1.0.17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 177f6ecd9a28335b0ab47f2b9377d01ae1ed8b66 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:22 +0000 Subject: [PATCH 12/21] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 19ec225..81a3317 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alsa-oss -# $Id: Makefile,v 1.1 2006/10/06 09:09:36 jima Exp $ +# $Id: Makefile,v 1.1 2006/10/06 14:10:30 jima Exp $ NAME := alsa-oss SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9bf4b8832880cb5e794178c28beab90972fe36d0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:51 +0000 Subject: [PATCH 13/21] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 19ec225..81a3317 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alsa-oss -# $Id: Makefile,v 1.1 2006/10/06 09:09:36 jima Exp $ +# $Id: Makefile,v 1.1 2006/10/06 14:10:30 jima Exp $ NAME := alsa-oss SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9e323ed08058f89a3cb15a19c43943a511cf90a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:45:13 +0000 Subject: [PATCH 14/21] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 81a3317..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alsa-oss -# $Id: Makefile,v 1.1 2006/10/06 14:10:30 jima Exp $ -NAME := alsa-oss -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 9e29c8a11ff2cde86f86c01b4ea62a8f6116ed6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:45:14 +0000 Subject: [PATCH 15/21] dist-git conversion --- Makefile | 21 --------------------- branch | 1 - 2 files changed, 22 deletions(-) delete mode 100644 Makefile delete mode 100644 branch diff --git a/Makefile b/Makefile deleted file mode 100644 index 81a3317..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alsa-oss -# $Id: Makefile,v 1.1 2006/10/06 14:10:30 jima Exp $ -NAME := alsa-oss -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6 From f71282f0da93aae09865ed10ac9f84b9526ef211 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:58:32 -0600 Subject: [PATCH 16/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- alsa-oss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index 3aef8a3..ef4165b 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.17 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -80,6 +80,9 @@ autoreconf -f -i %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.17-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jul 24 2009 Fedora Release Engineering - 1.0.17-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From f345e82965e771c666ac756ce4ebb7dfbffaac32 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:11:31 -0600 Subject: [PATCH 17/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- alsa-oss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index ef4165b..d02ca87 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.17 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -80,6 +80,9 @@ autoreconf -f -i %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1.0.17-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 1.0.17-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 7e409dfee14c23a667dd6e9a6cb10baa02bb60dc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:52:04 -0500 Subject: [PATCH 18/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- alsa-oss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index d02ca87..ccef94f 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.17 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -80,6 +80,9 @@ autoreconf -f -i %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1.0.17-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 1.0.17-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From d659a38bfb32826489ecf3306ebe142a57adc9ff Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:28:47 -0600 Subject: [PATCH 19/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- alsa-oss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index ccef94f..8b97025 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.17 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -80,6 +80,9 @@ autoreconf -f -i %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.0.17-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 1.0.17-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From e11969dcb34caec72d410987d7da9a68a7bbff8f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:38:43 -0500 Subject: [PATCH 20/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- alsa-oss.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-oss.spec b/alsa-oss.spec index 8b97025..172e8dc 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.17 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -80,6 +80,9 @@ autoreconf -f -i %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.0.17-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 1.0.17-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From adf86d38a8a6f2c7673192aff7b5532c1f1661fd Mon Sep 17 00:00:00 2001 From: Till Maas Date: Mon, 19 Aug 2013 22:04:04 +0200 Subject: [PATCH 21/21] Retired on 2013-08-19 due to lack of a maintainer in preparation to branch Fedora 20 --- .gitignore | 1 - alsa-oss-1.0.12-aoss.patch | 58 -------------- alsa-oss-glibc-open.patch | 12 --- alsa-oss.spec | 152 ------------------------------------- dead.package | 1 + sources | 1 - 6 files changed, 1 insertion(+), 224 deletions(-) delete mode 100644 .gitignore delete mode 100644 alsa-oss-1.0.12-aoss.patch delete mode 100644 alsa-oss-glibc-open.patch delete mode 100644 alsa-oss.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 45f7801..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -alsa-oss-1.0.17.tar.bz2 diff --git a/alsa-oss-1.0.12-aoss.patch b/alsa-oss-1.0.12-aoss.patch deleted file mode 100644 index c3baf6f..0000000 --- a/alsa-oss-1.0.12-aoss.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 -+# aoss [-32] -+ -+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=${AOSS_LIBDIR}/libaoss.so.0${LD_PRELOAD:+:$LD_PRELOAD} exec "$@" - else - exec "$@" - fi diff --git a/alsa-oss-glibc-open.patch b/alsa-oss-glibc-open.patch deleted file mode 100644 index bdbdfea..0000000 --- a/alsa-oss-glibc-open.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- alsa-oss-1.0.14/alsa/alsa-oss.c.orig 2007-05-31 03:11:51.000000000 -0500 -+++ alsa-oss-1.0.14/alsa/alsa-oss.c 2007-08-16 16:21:27.000000000 -0500 -@@ -284,6 +284,9 @@ static int mixer_open_helper(const char - return fd; - } - -+#undef open -+#undef open64 -+ - #define DECL_OPEN(name, callback) \ - int name(const char *file, int oflag, ...) \ - { \ diff --git a/alsa-oss.spec b/alsa-oss.spec deleted file mode 100644 index 172e8dc..0000000 --- a/alsa-oss.spec +++ /dev/null @@ -1,152 +0,0 @@ -Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS -Name: alsa-oss -Version: 1.0.17 -Release: 9%{?dist} -License: GPLv2+ -Group: Applications/Multimedia -URL: http://www.alsa-project.org/ -Source: ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2 -Patch0: %{name}-1.0.12-aoss.patch -Patch1: %{name}-glibc-open.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: alsa-lib-devel >= %{version} -%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}, %{name}-libs = %{version}-%{release} -%description devel -Header files for alsa-oss. - -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 - -%build -%ifarch x86_64 -autoreconf -f -i -%endif -%configure \ -%ifarch x86_64 - --disable-rpath \ -%endif - --disable-static -%{__make} %{?_smp_mflags} - -%install -%{__rm} -rf $RPM_BUILD_ROOT -%{__make} install DESTDIR=$RPM_BUILD_ROOT -%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - -%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?/* - -%files devel -%defattr(-,root,root,-) -%doc oss-redir/README -%{_includedir}/* -%{_libdir}/*.a -%{_libdir}/*.so - - -%changelog -* Sat Aug 03 2013 Fedora Release Engineering - 1.0.17-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 1.0.17-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.0.17-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.0.17-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.0.17-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 24 2009 Fedora Release Engineering - 1.0.17-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 1.0.17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Sep 21 2008 Ville Skyttä - 1.0.17-2 -- Fix Patch:/%%patch0 mismatch. - -* Tue Jul 29 2008 Jaroslav Kysela 1.0.17-1 -- New upstream version - -* Mon Oct 22 2007 Patrick "Jima" Laughton 1.0.15-0.1 -- New upstream version - -* Thu Aug 16 2007 Patrick "Jima" Laughton 1.0.14-3 -- License clarification -- Copied glibc open() workaround from alsa-lib-1.0.14-glibc-open.patch - -* Wed Jul 25 2007 Warren Togami 1.0.14-2 -- binutils/gcc bug rebuild (#249435) - -* Tue Jul 24 2007 Patrick "Jima" Laughton 1.0.14-1 -- Updated to match F8 alsa-libs -- Changed reference to patch filename - -* Thu Feb 08 2007 Patrick "Jima" Laughton 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 1.0.12-3 -- Added conditionalized rpath fixes for x86_64 (thanks Denis!) -- Re-added *.a to -devel package -- Added %%defattr for -devel, added oss-redir/README as %%doc - -* Thu Oct 05 2006 Patrick "Jima" Laughton 1.0.12-2 -- Adding --disable-static to configure -- Removing *.a from -devel package -- Adding name and version to patch -- Removing commented-out autoreconf line -- Forcibly deleting *.a files in %%install (why didn't it believe me?) - -* Tue Oct 03 2006 Patrick "Jima" Laughton 1.0.12-1 -- Hijacked from stalled review (BZ#187706) -- Bumped to 1.0.12 for devel branch -- Removed Req for /sbin/ldconfig (unnecessary when using -p in scriptlets) -- Added dist tag! -- Made macros slightly more consistent -- Deleted .la files in %%install - -* Sun Apr 2 2006 Michel Salim 1.0.11-1.rc3 -- Initial build. diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..d108d0d --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Retired on 2013-08-19 due to lack of a maintainer in preparation to branch Fedora 20 diff --git a/sources b/sources deleted file mode 100644 index e34fa00..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -1b1850c2fc91476a73d50f537cbd402f alsa-oss-1.0.17.tar.bz2