From 58f4c53068c057e0107508ded8e6583abd28c374e9d86852bef3966b53b84531 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 13 Jan 2023 07:39:05 +0000
Subject: [PATCH] Accepting request 1055720 from home:lnussel:usrmerge

Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1055720
OBS-URL: https://build.opensuse.org/package/show/Base:System/pciutils?expand=0&rev=88
---
 pciutils.changes | 5 +++++
 pciutils.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pciutils.changes b/pciutils.changes
index f982e41..367c58d 100644
--- a/pciutils.changes
+++ b/pciutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 13:14:15 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Fri Dec  2 21:41:01 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/pciutils.spec b/pciutils.spec
index 9b0e5d2..c4821bc 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -81,7 +81,7 @@ rm -rf %{buildroot}%{_datadir}/pci.ids*
 install -D -m 0644 lib/libpci.pc %{buildroot}%{_libdir}/pkgconfig/libpci.pc
 ln -sf %{_libdir}/libpci.so.3 %{buildroot}%{_libdir}/libpci.so
 
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir %{buildroot}/sbin
 ln -s %{_bindir}/{lspci,setpci} %{buildroot}/sbin
 %endif
@@ -98,7 +98,7 @@ rm %{buildroot}%{_mandir}/man8/update-pciids.8
 %files
 %license COPYING
 %doc README
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /sbin/lspci
 /sbin/setpci
 %endif