pool/btrfsprogs
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 766653 from home:dimstar:Factory

Browse Source 
- 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.

OBS-URL: https://build.opensuse.org/request/show/766653
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=329
This commit is contained in:
David Sterba 2020-01-23 20:10:04 +00:00 committed by Git OBS Bridge
parent 8348b28f52
commit 5e8de45aba
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
btrfsprogs.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jan 23 13:00:39 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- 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 Wed Dec 4 00:00:00 CET 2019 - dsterba@suse.cz

6
btrfsprogs.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package btrfsprogs # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
%define udev_with_btrfs_builtin 190 %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} %define package_udev_rules %{udev_version} >= %{udev_with_btrfs_builtin}
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
@ -74,7 +74,7 @@ BuildRequires: pkg-config
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} >= 1310
BuildRequires: suse-module-tools BuildRequires: suse-module-tools
%endif %endif
BuildRequires: udev BuildRequires: pkgconfig(udev)
%if 0%{?suse_version} == 1310 %if 0%{?suse_version} == 1310
BuildRequires: libudev-devel BuildRequires: libudev-devel
%endif %endif