From 655d777a11f4d8bcc6b7b5a27699e8413538263d553df6c661a20373f6d8086c Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Thu, 7 May 2015 19:12:12 +0000 Subject: [PATCH] Accepting request 305695 from home:pluskalm:branches:Base:System - Correct info files scriplet handling section - Update info and update-alternatives requirements OBS-URL: https://build.opensuse.org/request/show/305695 OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=42 --- gawk.changes | 6 ++++++ gawk.spec | 14 ++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gawk.changes b/gawk.changes index bca5919..66c5954 100644 --- a/gawk.changes +++ b/gawk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 7 07:48:15 UTC 2015 - mpluskal@suse.com + +- Correct info files scriplet handling section +- Update info and update-alternatives requirements + ------------------------------------------------------------------- Sun May 3 09:30:05 UTC 2015 - astieger@suse.com diff --git a/gawk.spec b/gawk.spec index 85ea29d..178bc1c 100644 --- a/gawk.spec +++ b/gawk.spec @@ -27,10 +27,10 @@ Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source3: http://savannah.gnu.org/people/viewgpg.php?user_id=80653#/gawk.keyring BuildRequires: update-alternatives -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: %{install_info_prereq} -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: update-alternatives +Requires(post): %{install_info_prereq} +Requires(post): update-alternatives +Requires(preun): %{install_info_prereq} +Requires(preun): update-alternatives Provides: awk BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,14 +74,12 @@ ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/a %install_info --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz %preun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/gawk.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz if [ $1 -eq 0 ]; then %{_sbindir}/update-alternatives --remove awk %{_bindir}/gawk fi -%postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/gawk.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz - %files -f %{name}.lang %defattr(-,root,root) #UsrMerge