diff --git a/crda.changes b/crda.changes index 683657b..1d84e01 100644 --- a/crda.changes +++ b/crda.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 17 11:19:13 UTC 2012 - fcrozat@suse.com + +- Fix build with udev rules directory new location. + ------------------------------------------------------------------- Thu Sep 13 11:11:28 UTC 2012 - cfarrell@suse.com diff --git a/crda.spec b/crda.spec index afcea3b..7dea385 100644 --- a/crda.spec +++ b/crda.spec @@ -16,6 +16,13 @@ # +%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 +%define _udevrulesdir /usr/lib/udev/rules.d +%else +%define _udevrulesdir /lib/udev/rules.d + +%endif + Url: http://linuxwireless.org/en/developers/Regulatory/CRDA Name: crda @@ -47,7 +54,7 @@ through udev. make all_noverify %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir}/ install +make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir}/ UDEV_RULE_DIR=%{_udevrulesdir} install #UsrMerge mkdir $RPM_BUILD_ROOT/sbin ln -sf %{_sbindir}/{crda,regdbdump} $RPM_BUILD_ROOT/sbin @@ -61,7 +68,7 @@ ln -sf %{_sbindir}/{crda,regdbdump} $RPM_BUILD_ROOT/sbin /sbin/crda /sbin/regdbdump #EndUserMerge -/lib/udev/rules.d/85-regulatory.rules +%{_udevrulesdir}/85-regulatory.rules %{_mandir}/man8/crda.8.gz %{_mandir}/man8/regdbdump.8.gz