From 130ea7bb738edd8bf5eb7e6e56c7543c454ef36f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 25 Jul 2014 00:09:25 +0100 Subject: [PATCH] 1.0.28 --- .gitignore | 7 +---- alsa-tools-1.0.27-non-x86.patch | 12 -------- alsa-tools.spec | 53 +++++---------------------------- sources | 2 +- 4 files changed, 9 insertions(+), 65 deletions(-) delete mode 100644 alsa-tools-1.0.27-non-x86.patch diff --git a/.gitignore b/.gitignore index fb51a06..1f79e8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -alsa-tools-1.0.23-pruned.tar.bz2 -/alsa-tools-1.0.25-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 +/alsa-tools-1.*.tar.bz2 diff --git a/alsa-tools-1.0.27-non-x86.patch b/alsa-tools-1.0.27-non-x86.patch deleted file mode 100644 index 5fe93b6..0000000 --- a/alsa-tools-1.0.27-non-x86.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 2e9b4cd..558494e 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.27 -Release: 4%{?dist} +Version: 1.0.28 +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 @@ -47,10 +47,7 @@ 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 +BuildRequires: alsa-lib-devel >= %{version} %if 0%{!?_without_tools:1} BuildRequires: gtk+-devel BuildRequires: gtk2-devel @@ -104,14 +101,13 @@ The following tools are available: %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .non-x86 %build mv seq/sbiload . ; rm -rf seq for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do cd $i ; %configure - %{__make} %{?_smp_mflags} || exit 1 + make %{?_smp_mflags} || exit 1 cd .. done @@ -239,6 +235,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Thu Jul 24 2014 Peter Robinson 1.0.28-1 +- Update to 1.0.28 + * Sat Jun 07 2014 Fedora Release Engineering - 1.0.27-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -393,41 +392,3 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d * Wed Apr 06 2005 Thorsten Leemhuis - 1.0.8-1 - Update to 1.0.8 - -* Sun Mar 29 2005 Thorsten Leemhuis - 0:1.0.6-2 -- Add "--without tools" and "--with firmware" options -- Drop unneeded BR: automake - -* Sun Jan 02 2005 Thorsten Leemhuis - 0:1.0.6-0.fdr.1 -- Update to 1.0.6 for FC3 -- add new files in {_datadir}/sounds/ -- add patch0 for as10k1 - -* Sat Apr 03 2004 Thorsten Leemhuis - 0:1.0.4-0.fdr.1 -- Update to 1.0.4 - -* Fri Jan 16 2004 Thorsten Leemhuis - 0:1.0.1-0.fdr.2 -- Integrate Michaels patch that fixes: -- fix desktop files for fedora.us, adds buildreq desktop-file-utils -- fix %%install section for short-circuit installs - -* Fri Jan 09 2004 Thorsten Leemhuis - 0:1.0.1-0.fdr.1 -- Update to 1.0.1 - -* Sun Dec 14 2003 Thorsten Leemhuis 1.0.0-0.fdr.0.3.rc2 -- exit if error during build or install -- fix install errors hdspconf, hdspmixer, usx2yloader -- Split package in alsa-tools and alsa-tools-firmware -- Integrate more docs - -* Fri Dec 06 2003 Thorsten Leemhuis 1.0.0-0.fdr.0.2.rc2 -- Update to 1.0.0rc2 -- some minor corrections in style - -* Thu Dec 04 2003 Thorsten Leemhuis 1.0.0-0.fdr.0.1.rc1 -- Update to 1.0.0rc1 -- Remove firmware files -- extra package now. -- Add description - -* Wed Aug 13 2003 Dams 0:tools-0.fdr.1 -- Initial build. diff --git a/sources b/sources index 6f60f43..aa86039 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ea381d00a6069a98613aa7effa4cb51 alsa-tools-1.0.27.tar.bz2 +e6c929175d8ee729c06d49b51439bad6 alsa-tools-1.0.28.tar.bz2