From fb2a2f496a57438481dd6cd92b16879fe6d3c6d1 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 12 Apr 2013 10:30:33 +0200 Subject: [PATCH 1/3] updated to 1.0.27 --- alsa-tools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alsa-tools.spec b/alsa-tools.spec index 2bfbc93..1b1b9e1 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -25,8 +25,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.26.1 -Release: 4%{?dist} +Version: 1.0.27 +Release: 1%{?dist} # Checked at least one source file from all the sub-projects contained in # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15 @@ -236,6 +236,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Fri Apr 12 2013 Jaroslav Kysela - 1.0.27-1 +- Updated to 1.0.27 + * Sat Feb 09 2013 Rahul Sundaram - 1.0.26.1-3 - remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 - clean up spec to follow current guidelines From c07a65477b17aa705bce8e03ca32838b0bf450cc Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 12 Apr 2013 10:42:36 +0200 Subject: [PATCH 2/3] updated to 1.0.27 --- .gitignore | 1 + alsa-tools.spec | 5 +---- sources | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a2ca962..fb51a06 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ alsa-tools-1.0.23-pruned.tar.bz2 /alsa-tools-1.0.26-pruned.tar.bz2 /alsa-tools-1.0.26.1.tar.bz2 /alsa-tools-1.0.26.1-pruned.tar.bz2 +/alsa-tools-1.0.27.tar.bz2 diff --git a/alsa-tools.spec b/alsa-tools.spec index 1b1b9e1..dd8a027 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -16,9 +16,6 @@ %{?!_without_firmware: %global builddirsfirmw hdsploader mixartloader usx2yloader vxloader } -# The source tarball has been pruned to remove the "ac3dec" directory, due -# to legal concerns that the contents might be subject to patent claims - # Note that the Version is intended to coincide with the version of ALSA # included with the Fedora kernel, rather than necessarily the very latest # upstream version of alsa-tools @@ -33,7 +30,7 @@ Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ -Source0: %{name}-%{version}-pruned.tar.bz2 +Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 # The icons below were created by Tim Jackson from screenshots of the # apps in question. They suck, a lot. Better alternatives welcome! diff --git a/sources b/sources index a0978d7..6f60f43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2bf2db319a747edd4e954866d8ba8de7 alsa-tools-1.0.26.1-pruned.tar.bz2 +1ea381d00a6069a98613aa7effa4cb51 alsa-tools-1.0.27.tar.bz2 From 56bee4fad4ae41e4871b4eb764b1688478f5a280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 21 May 2013 13:05:16 +0200 Subject: [PATCH 3/3] fix build on non-x86 arches --- alsa-tools-1.0.27-non-x86.patch | 12 ++++++++++++ alsa-tools.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 alsa-tools-1.0.27-non-x86.patch diff --git a/alsa-tools-1.0.27-non-x86.patch b/alsa-tools-1.0.27-non-x86.patch new file mode 100644 index 0000000..5fe93b6 --- /dev/null +++ b/alsa-tools-1.0.27-non-x86.patch @@ -0,0 +1,12 @@ +diff -up alsa-tools-1.0.27/hda-verb/hda-verb.c.s390 alsa-tools-1.0.27/hda-verb/hda-verb.c +--- alsa-tools-1.0.27/hda-verb/hda-verb.c.s390 2013-05-21 12:31:13.000000000 +0200 ++++ alsa-tools-1.0.27/hda-verb/hda-verb.c 2013-05-21 12:31:42.000000000 +0200 +@@ -13,7 +13,7 @@ + #include + #include + #include +-#ifndef __PPC__ ++#if defined(__i386__) || defined(__x86_64__) + #include + #endif + #include diff --git a/alsa-tools.spec b/alsa-tools.spec index dd8a027..7567b90 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -23,7 +23,7 @@ Summary: Specialist tools for ALSA Name: alsa-tools Version: 1.0.27 -Release: 1%{?dist} +Release: 2%{?dist} # Checked at least one source file from all the sub-projects contained in # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15 @@ -45,6 +45,9 @@ Source6: hwmixvolume.png Source7: hwmixvolume.desktop Source9: hdajackretask.desktop +# build fix for non-x86 arches +Patch0: %{name}-1.0.27-non-x86.patch + BuildRequires: alsa-lib-devel >= 1.0.24 %if 0%{!?_without_tools:1} BuildRequires: gtk+-devel @@ -99,6 +102,7 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .non-x86 %build mv seq/sbiload . ; rm -rf seq @@ -233,6 +237,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue May 21 2013 Dan Horák - 1.0.27-2 +- fix build on non-x86 arches + * Fri Apr 12 2013 Jaroslav Kysela - 1.0.27-1 - Updated to 1.0.27