From 463ecbab4142b4f9ad58dc7924d94b5bc30e8ea39aea778cf6c3e59858e4d973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Mon, 12 Nov 2012 22:45:04 +0000 Subject: [PATCH] Accepting request 140998 from home:tiwai:branches:multimedia:libs - Fix build breakage on 11.4 - Correct udev rules path (the recent udev places /usr/lib/udev) OBS-URL: https://build.opensuse.org/request/show/140998 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=64 --- alsa-utils.changes | 6 ++++++ alsa-utils.spec | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/alsa-utils.changes b/alsa-utils.changes index 0024d01..a7aa261 100644 --- a/alsa-utils.changes +++ b/alsa-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 12 16:37:20 CET 2012 - tiwai@suse.de + +- Fix build breakage on 11.4 +- Correct udev rules path (the recent udev places /usr/lib/udev) + ------------------------------------------------------------------- Sat Nov 3 17:18:45 UTC 2012 - crrodriguez@opensuse.org diff --git a/alsa-utils.spec b/alsa-utils.spec index da33736..63cf1ce 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -21,14 +21,25 @@ %define use_systemd 1 BuildRequires: systemd %define use_varlib 1 +%if %suse_version == 1140 +%define _unitdir /lib/systemd/system +%endif %else %define use_systemd 0 %define use_varlib 0 %endif +%if %suse_version > 1200 +%define _udevdir %(pkg-config --variable=udevdir udev) +%else +%define _udevdir /lib/udev +%endif Name: alsa-utils BuildRequires: alsa-devel BuildRequires: automake +%if %suse_version > 1200 +BuildRequires: libudev-devel +%endif BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: xmlto @@ -90,6 +101,7 @@ opts="$opts --with-asound-state-dir=/etc" %if %suse_version < 1030 opts="$opts --disable-xmlto" %endif +opts="$opts --with-udev-rules-dir=%{_udevdir}/rules.d" %configure --with-curses=ncursesw $opts make %{?_smp_mflags} @@ -119,7 +131,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/alsa %{_sbindir}/* %{_datadir}/sounds/alsa %{_datadir}/alsa -/lib/udev +%{_udevdir} %if %use_systemd %{_unitdir}/*.service %{_unitdir}/basic.target.wants/alsa-restore.service