pool/fuse
SHA256
5
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 1055738 from filesystems

Browse Source 
Replace transitional %usrmerged macro with regular version check (boo#1206798) (forwarded request 1053948 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/1055738
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fuse?expand=0&rev=76
This commit is contained in:
Dominique Leuenberger 2023-01-05 14:00:00 +00:00 committed by Git OBS Bridge
commit 5a3839f012
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fuse.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:36:59 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 23 12:48:31 UTC 2021 - Jan Engelhardt <jengelh@inai.de> Mon Aug 23 12:48:31 UTC 2021 - Jan Engelhardt <jengelh@inai.de>

10
fuse.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package fuse # spec file for package fuse
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2023 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
@ -130,7 +130,7 @@ install -m644 -D util/udev.rules %{buildroot}/%{_sysconfdir}/udev/rules.d/99-fus
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
# not needed for fuse, might reappar in separate package: # not needed for fuse, might reappar in separate package:
rm -f %{buildroot}/%{_libdir}/libulockmgr.a rm -f %{buildroot}/%{_libdir}/libulockmgr.a
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
mkdir %{buildroot}/sbin mkdir %{buildroot}/sbin
mkdir %{buildroot}/%{_lib} mkdir %{buildroot}/%{_lib}
ln -s -v %{_sbindir}/mount.fuse %{buildroot}/sbin ln -s -v %{_sbindir}/mount.fuse %{buildroot}/sbin
@ -169,7 +169,7 @@ rm -rf doc/Makefile.am doc/Makefile.in doc/Makefile
%{_sysconfdir}/udev/rules.d/99-fuse.rules %{_sysconfdir}/udev/rules.d/99-fuse.rules
%endif %endif
%verify(not mode) %attr(4750,root,trusted) %{_bindir}/fusermount %verify(not mode) %attr(4750,root,trusted) %{_bindir}/fusermount
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/sbin/mount.fuse /sbin/mount.fuse
%endif %endif
%{_sbindir}/mount.fuse %{_sbindir}/mount.fuse
@ -180,13 +180,13 @@ rm -rf doc/Makefile.am doc/Makefile.in doc/Makefile
%{_mandir}/man8/mount.fuse.8%{?ext_man} %{_mandir}/man8/mount.fuse.8%{?ext_man}
%files -n libfuse2 %files -n libfuse2
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/%{_lib}/libfuse.so.2* /%{_lib}/libfuse.so.2*
%endif %endif
%{_libdir}/libfuse.so.2* %{_libdir}/libfuse.so.2*
%files -n libulockmgr1 %files -n libulockmgr1
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/%{_lib}/libulockmgr.so.* /%{_lib}/libulockmgr.so.*
%endif %endif
%{_libdir}/libulockmgr.so.* %{_libdir}/libulockmgr.so.*