From 03997a741e6b85f83fc8282cf84d94de6d0627e2f8df04bbc9336642a9452a20 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 7 Aug 2015 07:49:31 +0000 Subject: [PATCH] Accepting request 321028 from home:dimstar:Factory Minor change in identifying the udev version, fixes issues like https://build.opensuse.org/package/live_build_log/openSUSE:Factory:Staging:A:DVD/libgphoto2/standard/ppc64le, where sometimes udev-mini is installed in the buildenv (to avoid build cycles) OBS-URL: https://build.opensuse.org/request/show/321028 OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=141 --- libgphoto2.changes | 8 ++++++++ libgphoto2.spec | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libgphoto2.changes b/libgphoto2.changes index 6cb2fd4..f4c6446 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 7 07:39:31 UTC 2015 - dimstar@opensuse.org + +- Change udev BuildRequires for pkgconfig(udev) +- use pkg-config --modversion udev instead of querying the package + database. udev is often installed as udev-mini in OBS' build env, + which the rpm -q udev call could not find. + ------------------------------------------------------------------- Sun Jul 5 21:36:34 UTC 2015 - meissner@suse.com diff --git a/libgphoto2.spec b/libgphoto2.spec index 9f46bd3..35263d4 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -16,7 +16,7 @@ # -%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 +%if %( pkg-config --modversion udev ) > 190 %define _udevrulesdir /usr/lib/udev/rules.d %else %define _udevrulesdir /lib/udev/rules.d @@ -36,7 +36,7 @@ BuildRequires: libusb-1_0-devel BuildRequires: libxml2-devel BuildRequires: lockdev-devel BuildRequires: pkg-config -BuildRequires: udev +BuildRequires: pkgconfig(udev) %if 0%{?suse_version} > 1230 BuildRequires: systemd-rpm-macros %endif