From 176dd44bf38e69e3afa49323b768d3fb7ea21b1d2feb802ec4a195e94d37987c Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Fri, 20 Nov 2020 12:41:15 +0000
Subject: [PATCH] Accepting request 849596 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849596
OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=28
---
 fillup.changes |  5 +++++
 fillup.spec    | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/fillup.changes b/fillup.changes
index d68969a..6781fe6 100644
--- a/fillup.changes
+++ b/fillup.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 16 09:47:35 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Wed Jan 15 09:38:33 UTC 2020 - Adam Majer <adam.majer@suse.de>
 
diff --git a/fillup.spec b/fillup.spec
index b84590b..899cca2 100644
--- a/fillup.spec
+++ b/fillup.spec
@@ -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 @@ Release:        0
 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 -m 755 BIN/fillup %{buildroot}/%{_bindir}
 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 @@ make %{?_smp_mflags} test    OPTISPLUS="%{optflags}"
 %files
 %defattr(-,root,root)
 # rpm scriptlets still use this, based on %*fillup* macros
+%if !0%{?usrmerged}
 /bin/fillup
+%endif
 %{_bindir}/fillup
 %{_mandir}/man8/fillup*