From 020c59b89d9e4077a354b334817b8e5f485cc026897fb4387aeb49266764ca8e Mon Sep 17 00:00:00 2001 From: Kai-Uwe Behrmann Date: Thu, 18 Oct 2012 08:59:27 +0000 Subject: [PATCH] Accepting request 138675 from openSUSE:Factory:Staging:Systemd - Fix build with new udev rules directory location. OBS-URL: https://build.opensuse.org/request/show/138675 OBS-URL: https://build.opensuse.org/package/show/multimedia:color_management/argyllcms?expand=0&rev=16 --- argyllcms.changes | 5 +++++ argyllcms.spec | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/argyllcms.changes b/argyllcms.changes index a1d9928..ff15539 100644 --- a/argyllcms.changes +++ b/argyllcms.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 18 08:36:09 UTC 2012 - fcrozat@suse.com + +- Fix build with new udev rules directory location. + ------------------------------------------------------------------- Fri Oct 12 07:40:47 UTC 2012 - coolo@suse.com diff --git a/argyllcms.spec b/argyllcms.spec index fe029ed..918a4c2 100644 --- a/argyllcms.spec +++ b/argyllcms.spec @@ -16,6 +16,12 @@ # +%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 +%define _udevrulesdir /usr/lib/udev/rules.d +%else +%define _udevrulesdir /lib/udev/rules.d +%endif + %define archivename Argyll_V%{version}%{?alphaversion}_src.zip Name: argyllcms @@ -120,7 +126,7 @@ echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXd rm bin/License.txt -mkdir -p $RPM_BUILD_ROOT/{%{_bindir},lib/udev/rules.d,%{_datadir}/color/argyll} +mkdir -p $RPM_BUILD_ROOT/{%{_bindir},%{_datadir}/color/argyll} install -m 0755 -D bin/* $RPM_BUILD_ROOT/%{_bindir} @@ -137,9 +143,9 @@ install -d -m 0755 %{buildroot}%{_datadir}/PolicyKit/policy/ install -p -m 0644 %{SOURCE2} \ %{buildroot}%{_datadir}/PolicyKit/policy/ %else -install -d -m 0755 %{buildroot}/lib/udev/rules.d +install -d -m 0755 %{buildroot}%{_udevrulesdir} install -p -m 0644 libusb1/55-Argyll.rules \ - %{buildroot}/lib/udev/rules.d + %{buildroot}%{_udevrulesdir} %endif %clean @@ -157,7 +163,7 @@ rm -rf %{buildroot} %{_datadir}/hal/fdi/policy/10osvendor/19-color.fdi %{_datadir}/PolicyKit/policy/color-device-file.policy %else -/lib/udev/rules.d/55-Argyll.rules +%{_udevrulesdir}/55-Argyll.rules %endif %files doc