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

Accepting request 1053546 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1053546
OBS-URL: https://build.opensuse.org/package/show/Base:System/dosfstools?expand=0&rev=80
This commit is contained in:
Matej Cepl 2023-01-05 06:25:12 +00:00 committed by Git OBS Bridge
parent eae0fe52c1
commit 29ba9626e0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dosfstools.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:33:50 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 3 12:54:11 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org> Thu Feb 3 12:54:11 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>

6
dosfstools.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package dosfstools # spec file for package dosfstools
# #
# Copyright (c) 2022 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
@ -48,7 +48,7 @@ floppies.
%install %install
%make_install %make_install
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
mkdir %{buildroot}/sbin mkdir %{buildroot}/sbin
ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos,fsck.fat,fsck.vfat,mkfs.fat,mkfs.vfat} %{buildroot}/sbin ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos,fsck.fat,fsck.vfat,mkfs.fat,mkfs.vfat} %{buildroot}/sbin
%endif %endif
@ -58,7 +58,7 @@ ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos,fsck.fat,fs
%files %files
%doc %{_docdir}/dosfstools %doc %{_docdir}/dosfstools
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/sbin/* /sbin/*
%endif %endif
%{_sbindir}/dosfsck %{_sbindir}/dosfsck