From f2565dfa60ba37ff667c363af828a83948091fba8304e19e132ebc239dd282ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 26 Apr 2015 11:25:57 +0000 Subject: [PATCH] Accepting request 303923 from home:coolo:branches:openSUSE:Factory - use pkgconfig to detect udev install directory to avoid problems during bootstrap OBS-URL: https://build.opensuse.org/request/show/303923 OBS-URL: https://build.opensuse.org/package/show/hardware/usb_modeswitch?expand=0&rev=66 --- usb_modeswitch.changes | 6 ++++++ usb_modeswitch.spec | 11 +++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/usb_modeswitch.changes b/usb_modeswitch.changes index 8e7c049..764e597 100644 --- a/usb_modeswitch.changes +++ b/usb_modeswitch.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Apr 25 08:17:32 UTC 2015 - coolo@suse.com + +- use pkgconfig to detect udev install directory to avoid problems + during bootstrap + ------------------------------------------------------------------- Wed Apr 8 02:18:03 UTC 2015 - p.drouand@gmail.com diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index 29512ce..9185cfe 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -15,13 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 -%define _udevdir /usr/lib/udev/ -%else -%define _udevdir /lib/udev/ -%endif - Name: usb_modeswitch Version: 2.2.1 Release: 0 @@ -40,11 +33,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: pkg-config BuildRequires: tcl -BuildRequires: udev +BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(libusb-1.0) Requires: tcl >= 8.4 Requires: usb_modeswitch-data = %version +%define _udevdir %(pkg-config --variable=udevdir udev) + %description USB_ModeSwitch is a mode switching tool for controlling "flip flop" (multiple device) USB gear. It allows so-called "Zero-CD" devices that