Hello community, here is the log from the commit of package dosfstools for openSUSE:Factory checked in at 2020-11-26 23:10:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dosfstools (Old) and /work/SRC/openSUSE:Factory/.dosfstools.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dosfstools" Thu Nov 26 23:10:13 2020 rev:52 rq:849837 version:4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dosfstools/dosfstools.changes 2017-02-03 17:35:56.343665101 +0100 +++ /work/SRC/openSUSE:Factory/.dosfstools.new.5913/dosfstools.changes 2020-11-26 23:11:39.164931756 +0100 @@ -1,0 +2,5 @@ +Tue Nov 10 10:57:30 UTC 2020 - Ludwig Nussel <lnus...@suse.de> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosfstools.spec ++++++ --- /var/tmp/diff_new_pack.HgubwU/_old 2020-11-26 23:11:40.792932094 +0100 +++ /var/tmp/diff_new_pack.HgubwU/_new 2020-11-26 23:11:40.796932095 +0100 @@ -1,7 +1,7 @@ # # spec file for package dosfstools # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,9 +20,9 @@ Version: 4.1 Release: 0 Summary: Utilities for Making and Checking MS-DOS FAT File Systems on Linux -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Filesystems -Url: https://github.com/dosfstools/dosfstools +URL: https://github.com/dosfstools/dosfstools Source: https://github.com/dosfstools/dosfstools/releases/download/v%{version}/dosfstools-%{version}.tar.gz Source2: https://github.com/dosfstools/dosfstools/releases/download/v%{version}/dosfstools-%{version}.tar.gz.sig Source3: %{name}.keyring @@ -51,10 +51,10 @@ %install %make_install -#UsrMerge +%if !0%{?usrmerged} mkdir %{buildroot}/sbin ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos,fsck.fat,fsck.vfat,mkfs.fat,mkfs.vfat} %{buildroot}/sbin -#EndUsrMerge +%endif %check make check @@ -62,9 +62,9 @@ %files %defattr(-,root,root) %doc %{_docdir}/dosfstools -#UsrMerge +%if !0%{?usrmerged} /sbin/* -#EndUsrMerge +%endif %{_sbindir}/dosfsck %{_sbindir}/dosfslabel %{_sbindir}/fatlabel _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
