From 58ec0b405a5a3e08f82ddec905699f41f767e578 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 14:37:41 +0000 Subject: [PATCH 1/4] 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 953c5e1fb27db15251ad40cde7d0c280fc472b0f Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Thu, 16 Aug 2007 21:41:57 +0000 Subject: [PATCH 2/4] - 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 9bf4b8832880cb5e794178c28beab90972fe36d0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:51 +0000 Subject: [PATCH 3/4] 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 9e29c8a11ff2cde86f86c01b4ea62a8f6116ed6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:45:14 +0000 Subject: [PATCH 4/4] 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