From 5ae4a2502a3cfa72542e724472b11a93f03807d7f53c9193401030670f3ad83c Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 26 Nov 2020 10:08:40 +0000
Subject: [PATCH] Accepting request 849613 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849613
OBS-URL: https://build.opensuse.org/package/show/Base:System/initviocons?expand=0&rev=14
---
 initviocons.changes |  5 +++++
 initviocons.spec    | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/initviocons.changes b/initviocons.changes
index 3101d28..b9b7a6c 100644
--- a/initviocons.changes
+++ b/initviocons.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 16 09:56:18 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Wed May 31 21:41:00 UTC 2017 - meissner@suse.com
 
diff --git a/initviocons.spec b/initviocons.spec
index 8d44a4c..58a0e91 100644
--- a/initviocons.spec
+++ b/initviocons.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package initviocons
 #
-# 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,16 +12,16 @@
 # 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/
 #
 
 
 Name:           initviocons
-Url:            http://svn.poeml.de/viewcvs/initviocons/
+URL:            http://svn.poeml.de/viewcvs/initviocons/
 Version:        0.5
 Release:        0
 Summary:        Terminal Initialization, e.g. for the iSeries Virtual Console
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Console
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake
@@ -54,17 +54,17 @@ make CFLAGS="$RPM_OPT_FLAGS -Wall"
 %install
 %make_install
 install -m 0755 termprobes $RPM_BUILD_ROOT/%{_bindir}/termprobes
-#UsrMerge
+%if !0%{?usrmerged}
 mkdir -p $RPM_BUILD_ROOT/bin
 ln -sf %{_bindir}/initviocons $RPM_BUILD_ROOT/bin
-#EndUsrMerge
+%endif
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README
-#UsrMerge 
+%if !0%{?usrmerged}
 /bin/*
-#EndUsrMerge
+%endif
 %{_bindir}/*
 
 %changelog