Hello community, here is the log from the commit of package xfsdump for openSUSE:Factory checked in at 2020-12-09 22:11:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfsdump (Old) and /work/SRC/openSUSE:Factory/.xfsdump.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfsdump" Wed Dec 9 22:11:54 2020 rev:33 rq:853719 version:3.1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/xfsdump/xfsdump.changes 2020-02-06 13:18:42.532657045 +0100 +++ /work/SRC/openSUSE:Factory/.xfsdump.new.2328/xfsdump.changes 2020-12-09 22:11:55.815097993 +0100 @@ -1,0 +2,5 @@ +Thu Nov 26 13:42:57 UTC 2020 - Ludwig Nussel <lnus...@suse.de> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfsdump.spec ++++++ --- /var/tmp/diff_new_pack.4CyNzC/_old 2020-12-09 22:11:56.439098626 +0100 +++ /var/tmp/diff_new_pack.4CyNzC/_new 2020-12-09 22:11:56.443098629 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfsdump # -# Copyright (c) 2018 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/ # @@ -22,7 +22,7 @@ Summary: Administrative Utilities for the XFS File System License: GPL-2.0-or-later Group: System/Filesystems -Url: https://xfs.wiki.kernel.org/ +URL: https://xfs.wiki.kernel.org/ Source0: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/xfsdump-%{version}.tar.xz Source1: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/xfsdump-%{version}.tar.sign Source2: %{name}.keyring @@ -71,20 +71,18 @@ export DIST_ROOT=%{buildroot} make DESTDIR=%{buildroot} install %{?_smp_mflags} %find_lang xfsdump -# Remove the link created by the make file -rm %{buildroot}/%{_sbindir}/{xfsdump,xfsrestore} mv %{buildroot}/sbin/{xfsdump,xfsrestore} %{buildroot}/%{_sbindir} -#UsrMerge +%if !0%{?usrmerged} ln -s %{_sbindir}/xfsdump %{buildroot}/sbin ln -s %{_sbindir}/xfsrestore %{buildroot}/sbin -#EndUsrMerge +%endif %files -f xfsdump.lang %defattr(-,root,root,755) %{_sbindir}/* -#UsrMerge +%if !0%{?usrmerged} /sbin/* -#EndUsrMerge +%endif %doc %{_defaultdocdir}/%{name} %{_mandir}/man8/* %if 0%{?suse_version} > 1200 _______________________________________________ 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
