From 8723245e45d2b40f7702474c5fe3069cda46284719c98f1407198f839aa1415c Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 27 Aug 2020 10:17:05 +0000
Subject: [PATCH] Accepting request 829927 from home:dimstar:Factory

- Install os-prober files to %{_prefix}/lib: os-prober and all its
  subscripts have /usr/lib hardcoded, so changing the location on
  the fly is no good idea (boo#1175815).

OBS-URL: https://build.opensuse.org/request/show/829927
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=100
---
 os-prober.changes |  7 +++++++
 os-prober.spec    | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/os-prober.changes b/os-prober.changes
index 4a4a324..4daea78 100644
--- a/os-prober.changes
+++ b/os-prober.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 27 08:39:13 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Install os-prober files to %{_prefix}/lib: os-prober and all its
+  subscripts have /usr/lib hardcoded, so changing the location on
+  the fly is no good idea (boo#1175815).
+
 -------------------------------------------------------------------
 Tue Aug 13 08:12:58 UTC 2019 - Michael Chang <mchang@suse.com>
 
diff --git a/os-prober.spec b/os-prober.spec
index 5088f18..cfe762d 100644
--- a/os-prober.spec
+++ b/os-prober.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2019 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
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Probes disks on the system for installed operating systems
 License:        GPL-2.0-or-later
 Group:          System/Boot
-Url:            https://salsa.debian.org/installer-team/os-prober
+URL:            https://salsa.debian.org/installer-team/os-prober
 Source0:        https://salsa.debian.org/installer-team/os-prober/-/archive/%{version}/%{name}-%{version}.tar.bz2
 Source1:        COPYING-note.txt
 # move newns binary outside of os-prober subdirectory, so that debuginfo
@@ -134,7 +134,7 @@ install -m 0755 -d %{buildroot}%{_bindir}
 install -m 0755 -d %{buildroot}%{_localstatedir}/lib/%{name}
 
 install -m 0755 -p os-prober linux-boot-prober %{buildroot}%{_bindir}
-install -m 0755 -Dp newns %{buildroot}%{_libexecdir}/newns
+install -m 0755 -Dp newns %{buildroot}%{_prefix}/lib/newns
 install -m 0644 -Dp common.sh %{buildroot}%{_datadir}/%{name}/common.sh
 
 %ifarch m68k
@@ -152,24 +152,24 @@ ARCH=x86
 
 for probes in os-probes os-probes/mounted os-probes/init \
               linux-boot-probes linux-boot-probes/mounted; do
-        install -m 755 -d %{buildroot}%{_libexecdir}/$probes
-        cp -a $probes/common/* %{buildroot}%{_libexecdir}/$probes
+        install -m 755 -d %{buildroot}%{_prefix}/lib/$probes
+        cp -a $probes/common/* %{buildroot}%{_prefix}/lib/$probes
         if [ -e "$probes/$ARCH" ]; then
-                cp -a $probes/$ARCH/* %{buildroot}%{_libexecdir}/$probes
+                cp -a $probes/$ARCH/* %{buildroot}%{_prefix}/lib/$probes
         fi
 done
 if [ "$ARCH" = x86 ]; then
         install -m 755 -p os-probes/mounted/powerpc/20macosx \
-            %{buildroot}%{_libexecdir}/os-probes/mounted
+            %{buildroot}%{_prefix}/lib/os-probes/mounted
 fi
 
 %files
 %defattr(-,root,root,-)
 %doc README TODO debian/copyright debian/changelog COPYING-note.txt
 %{_bindir}/*
-%{_libexecdir}/linux-boot-probes
-%{_libexecdir}/newns
-%{_libexecdir}/os-probes
+%{_prefix}/lib/linux-boot-probes
+%{_prefix}/lib/newns
+%{_prefix}/lib/os-probes
 %{_datadir}/%{name}
 %{_localstatedir}/lib/%{name}