From 15a39522400fb10698f60120f9def07bc47ac6119e3605a4d19fecb8d1f10d63 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Fri, 12 Apr 2013 14:25:44 +0000
Subject: [PATCH] Accepting request 163764 from
 home:tiwai:branches:multimedia:libs

- Updated to version 1.0.27:
  add firmware files for CA0132 HD-audio codec
- Fix macros for udev rules installation path

OBS-URL: https://build.opensuse.org/request/show/163764
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-firmware?expand=0&rev=19
---
 alsa-firmware-1.0.25.tar.bz2 |  3 ---
 alsa-firmware-1.0.27.tar.bz2 |  3 +++
 alsa-firmware.changes        |  7 +++++++
 alsa-firmware.spec           | 32 +++++++++++++++++++-------------
 4 files changed, 29 insertions(+), 16 deletions(-)
 delete mode 100644 alsa-firmware-1.0.25.tar.bz2
 create mode 100644 alsa-firmware-1.0.27.tar.bz2

diff --git a/alsa-firmware-1.0.25.tar.bz2 b/alsa-firmware-1.0.25.tar.bz2
deleted file mode 100644
index cdf5752..0000000
--- a/alsa-firmware-1.0.25.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d336c1a26dc15a56a1c62a7f1242ec85606dabae6b9f557beb67368de9336f30
-size 3866594
diff --git a/alsa-firmware-1.0.27.tar.bz2 b/alsa-firmware-1.0.27.tar.bz2
new file mode 100644
index 0000000..f1b45b4
--- /dev/null
+++ b/alsa-firmware-1.0.27.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34cde0e67fba1c86cbee5c219b91c0a245da01d268dfa7623b1a73430fd16e5b
+size 3935104
diff --git a/alsa-firmware.changes b/alsa-firmware.changes
index 6ef51a8..eacf391 100644
--- a/alsa-firmware.changes
+++ b/alsa-firmware.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 12 15:31:37 CEST 2013 - tiwai@suse.de
+
+- Updated to version 1.0.27:
+  add firmware files for CA0132 HD-audio codec
+- Fix macros for udev rules installation path
+
 -------------------------------------------------------------------
 Wed Jan 25 11:13:28 CET 2012 - tiwai@suse.de
 
diff --git a/alsa-firmware.spec b/alsa-firmware.spec
index b4182d7..49c6310 100644
--- a/alsa-firmware.spec
+++ b/alsa-firmware.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package alsa-firmware
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,17 @@
 
 
 Name:           alsa-firmware
-%define package_version	1.0.25
+%define package_version	1.0.27
 Url:            http://www.alsa-project.org/
 Summary:        Firmware Data Files for ALSA
 License:        GPL-2.0+
 Group:          Hardware/Other
 BuildRequires:  automake
-Version:        1.0.25
+%if 0%{?suse_version} > 1220
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(udev)
+%endif
+Version:        1.0.27
 Release:        0
 Source:         ftp://ftp.alsa-project.org/pub/firmware/alsa-firmware-%{package_version}.tar.bz2
 Source1:        usx2yaudio.rules
@@ -31,12 +35,15 @@ Source2:        usx2yaudio-old.rules
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Requires:       alsa
+%if 0%{?suse_version} > 1220
+%define _udevdir %(pkg-config --variable=udevdir udev)
+%else
+%define _udevdir /etc/udev
+%endif
 
 %description
 Various firmware data files for ALSA drivers.
 
-
-
 %prep
 %setup -q -n %{name}-%{package_version}
 
@@ -54,7 +61,7 @@ make DESTDIR="$RPM_BUILD_ROOT" install
 for d in vxloader mixartloader pcxhrloader; do
   rm -rf $RPM_BUILD_ROOT%{_datadir}/alsa/firmware/$d
 done
-%if %suse_version >= 1120
+%if 0%{?suse_version} >= 1120
 # some files are included in the new "kernel-firmware" package
 for d in ess korg sb16 yamaha; do
   rm -rf $RPM_BUILD_ROOT/lib/firmware/$d
@@ -76,22 +83,21 @@ popd
 rm -rf $RPM_BUILD_ROOT/lib/firmware/turtlebeach
 # install documents
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-for d in echoaudio hdsploader mixartloader pcxhrloader usx2yloader vxloader asihpi; do
+for d in echoaudio hdsploader mixartloader pcxhrloader usx2yloader vxloader asihpi ca0132; do
   (cd $d
   n=${d##*/}
   mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/$n
-  for f in AUTHORS COPYING ChangeLog NEWS README* TODO; do
+  for f in AUTHORS COPYING ChangeLog NEWS README* TODO creative.txt; do
     test -f $f || continue
     install -c -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}/$n
   done
   )
 done
 # udev rules
-mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
-%if %suse_version > 1020
-install -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/udev/rules.d/52-usx2yaudio.rules
+%if 0%{?suse_version} > 1020
+install -D -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_udevdir}/rules.d/52-usx2yaudio.rules
 %else
-install -c -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/udev/rules.d/52-usx2yaudio.rules
+install -D -c -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_udevdir}/rules.d/52-usx2yaudio.rules
 %endif
 
 %files
@@ -99,6 +105,6 @@ install -c -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/udev/rules.d/52-usx2yaudio.rul
 %doc %{_docdir}/%{name}
 /lib/firmware/*
 %{_datadir}/alsa
-/etc/udev
+%{_udevdir}
 
 %changelog