Hello community, here is the log from the commit of package fillup for openSUSE:Factory checked in at 2020-11-26 23:09:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fillup (Old) and /work/SRC/openSUSE:Factory/.fillup.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fillup" Thu Nov 26 23:09:00 2020 rev:27 rq:849663 version:1.42 Changes: -------- --- /work/SRC/openSUSE:Factory/fillup/fillup.changes 2020-01-23 16:07:38.839519690 +0100 +++ /work/SRC/openSUSE:Factory/.fillup.new.5913/fillup.changes 2020-11-26 23:09:03.988810010 +0100 @@ -1,0 +2,5 @@ +Fri Oct 16 09:47:35 UTC 2020 - Ludwig Nussel <[email protected]> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fillup.spec ++++++ --- /var/tmp/diff_new_pack.vIvzYt/_old 2020-11-26 23:09:04.696810707 +0100 +++ /var/tmp/diff_new_pack.vIvzYt/_new 2020-11-26 23:09:04.696810707 +0100 @@ -1,7 +1,7 @@ # # spec file for package fillup # -# Copyright (c) 2020 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 @@ -27,7 +27,7 @@ Summary: Tool for Merging Config Files License: GPL-2.0-or-later Group: System/Base -Url: http://github.com/openSUSE/fillup +URL: http://github.com/openSUSE/fillup Source: fillup-%{version}.tar.bz2 Patch0: fillup-optflags.patch Patch1: fillup-warnings.dif @@ -65,11 +65,12 @@ install -d %{buildroot}/%{_mandir}/man8 install -m 644 SGML/fillup.8.gz %{buildroot}/%{_mandir}/man8 -#UsrMerge - There are literally hundreds of rpm scritps referencing /bin/fillup (suse macro) +%if !0%{?usrmerged} +# There are literally hundreds of rpm scritps referencing /bin/fillup (suse macro) # So let's at least keep the symlink there for now (DimStar - 2014-10-31) install -d -m 755 $RPM_BUILD_ROOT/bin ln -sf %{_bindir}/fillup $RPM_BUILD_ROOT/bin -#EndUserMerge +%endif %check make %{?_smp_mflags} test OPTISPLUS="%{optflags}" @@ -77,7 +78,9 @@ %files %defattr(-,root,root) # rpm scriptlets still use this, based on %*fillup* macros +%if !0%{?usrmerged} /bin/fillup +%endif %{_bindir}/fillup %{_mandir}/man8/fillup* _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
