From f11ce9a93b9a6ea8c41736d613fff0c33858191cd0a48e03ab867c1b7e81cfad Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 30 Jan 2020 08:30:39 +0000 Subject: [PATCH] Accepting request 766699 from filesystems OBS-URL: https://build.opensuse.org/request/show/766699 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=109 --- btrfsprogs.changes | 8 ++++++++ btrfsprogs.spec | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 0759f02..d471bce 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 23 13:00:39 UTC 2020 - Dominique Leuenberger + +- BuildRequire pkgconfig(udev) instead of udev: Allow OBS to + shortcut through the -mini flavor. +- Use pkg-config --modversion udev to identify the current udev + version. This is more portable and supports the -mini flavors. + ------------------------------------------------------------------- Wed Dec 4 00:00:00 CET 2019 - dsterba@suse.cz diff --git a/btrfsprogs.spec b/btrfsprogs.spec index bc427cc..b90238e 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -1,7 +1,7 @@ # # spec file for package btrfsprogs # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ %define udev_with_btrfs_builtin 190 -%define udev_version %(rpm -q --queryformat %%{VERSION} udev) +%define udev_version %(pkg-config --modversion udev) %define package_udev_rules %{udev_version} >= %{udev_with_btrfs_builtin} %{?!python_module:%define python_module() python-%{**} python3-%{**}} @@ -74,7 +74,7 @@ BuildRequires: pkg-config %if 0%{?suse_version} >= 1310 BuildRequires: suse-module-tools %endif -BuildRequires: udev +BuildRequires: pkgconfig(udev) %if 0%{?suse_version} == 1310 BuildRequires: libudev-devel %endif