From 204fed047ca3e4e019531512eb04b66ba5912309b9262921a7a1594948f6b91a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 8 Jun 2016 11:58:17 +0000 Subject: [PATCH] Accepting request 400449 from home:scarabeus_iv:branches:Base:System - Move installinfo scriptlet to preun so it won't fail OBS-URL: https://build.opensuse.org/request/show/400449 OBS-URL: https://build.opensuse.org/package/show/Base:System/which?expand=0&rev=7 --- which.changes | 5 +++++ which.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/which.changes b/which.changes index c7ee03c..a422904 100644 --- a/which.changes +++ b/which.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 7 12:16:07 UTC 2016 - tchvatal@suse.com + +- Move installinfo scriptlet to preun so it won't fail + ------------------------------------------------------------------- Wed Sep 9 12:31:06 UTC 2015 - mpluskal@suse.com diff --git a/which.spec b/which.spec index 076620b..0970d82 100644 --- a/which.spec +++ b/which.spec @@ -1,7 +1,7 @@ # # spec file for package which # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ License: GPL-3.0+ Group: System/Base Url: https://savannah.gnu.org/projects/which/ Source0: http://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.gz -Requires(post): %{install_info_prereq} +Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} Provides: util-linux:%{_bindir}/which BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,12 +41,12 @@ the specified program is in your PATH. make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install %post %install_info --info-dir="%{_infodir}" "%{_infodir}/which.info.gz" -%postun +%preun %install_info_delete --info-dir="%{_infodir}" "%{_infodir}/which.info.gz" %files