diff --git a/davfs2.changes b/davfs2.changes index e4e81e6..886a898 100644 --- a/davfs2.changes +++ b/davfs2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 10:31:14 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Wed Nov 2 11:19:48 UTC 2022 - Ali Abdallah diff --git a/davfs2.spec b/davfs2.spec index 2c4ffe2..554bc52 100644 --- a/davfs2.spec +++ b/davfs2.spec @@ -1,7 +1,7 @@ # # spec file for package davfs2 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,7 +55,7 @@ cd src dav_user="%{name}" \ dav_group="%{name}" \ %configure \ -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 ssbindir="%{_sbindir}" \ %endif --disable-static @@ -108,7 +108,7 @@ rm -rf "%{buildroot}/%{_docdir}" %{_sbindir}/umount.davfs %{_datadir}/%{name} %attr(0750, %{name}, %{name}) %{_localstatedir}/cache/%{name} -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /sbin/mount.davfs /sbin/umount.davfs %endif