From d23e4f7b39f4334f8b08c988bea3c1bb63a8ae4b3f5b1813e8c8370df5690837 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 27 Jan 2021 22:23:16 +0000 Subject: [PATCH 1/2] Accepting request 867177 from home:lnussel:usrmove - prepare usrmerge (boo#1029961) - remove use of obsolete %install_info OBS-URL: https://build.opensuse.org/request/show/867177 OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=81 --- gawk.changes | 6 ++++++ gawk.spec | 28 +++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/gawk.changes b/gawk.changes index 7b15e8f..5526afb 100644 --- a/gawk.changes +++ b/gawk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 14 16:06:16 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) +- remove use of obsolete %install_info + ------------------------------------------------------------------- Wed Apr 15 08:48:59 UTC 2020 - Paolo Stivanin diff --git a/gawk.spec b/gawk.spec index 2650f0b..c490b06 100644 --- a/gawk.spec +++ b/gawk.spec @@ -1,7 +1,7 @@ # # spec file for package gawk # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -60,30 +60,36 @@ make check %{?_smp_mflags} %install %make_install -#UsrMerge +%if !0%{?usrmerged} install -d %{buildroot}/bin ln -sf %{_bindir}/gawk %{buildroot}/bin ln -s %{_sysconfdir}/alternatives/awk %{buildroot}/bin/awk -#EndUsrMerge +%endif rm -f %{buildroot}%{_bindir}/*-%{version} %{buildroot}%{_bindir}/awk # create symlinks for update-alternatives +%if !0%{?usrmerged} ln -s %{_sysconfdir}/alternatives/usr-bin-awk %{buildroot}%{_bindir}/awk +%else +ln -s %{_sysconfdir}/alternatives/awk %{buildroot}%{_bindir}/awk +%endif ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/awk.1%{?ext_man} %find_lang %{name} %post +%if !0%{?usrmerged} %{_sbindir}/update-alternatives \ --install /bin/awk awk %{_bindir}/gawk 20 \ --slave %{_bindir}/awk usr-bin-awk %{_bindir}/gawk \ --slave %{_mandir}/man1/awk.1.gz awk.1%{?ext_man} %{_mandir}/man1/gawk.1%{?ext_man} -%install_info --info-dir=%{_infodir} %{_infodir}/gawk.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz +%else +%{_sbindir}/update-alternatives \ + --install %{_bindir}/awk awk %{_bindir}/gawk 20 \ + --slave %{_mandir}/man1/awk.1.gz awk.1%{?ext_man} %{_mandir}/man1/gawk.1%{?ext_man} +%endif %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 @@ -91,19 +97,19 @@ fi %files -f %{name}.lang %config %{_sysconfdir}/profile.d/gawk.csh %config %{_sysconfdir}/profile.d/gawk.sh +%if !0%{?usrmerged} #UsrMerge /bin/awk +/bin/gawk +%ghost %{_sysconfdir}/alternatives/usr-bin-awk #EndUsrMerge +%endif %{_bindir}/awk %{_mandir}/man1/awk.1%{?ext_man} %ghost %{_sysconfdir}/alternatives/awk -%ghost %{_sysconfdir}/alternatives/usr-bin-awk %ghost %{_sysconfdir}/alternatives/awk.1%{?ext_man} %license COPYING* %doc AUTHORS NEWS POSIX.STD README ChangeLog* -#UsrMerge -/bin/gawk -#EndUsrMerge %{_bindir}/gawk %{_libexecdir}/awk %{_libdir}/gawk From 7b533d5cf6be7d05cbdb45e9ec9dc177c20a6e57baf55b80f7839aaa263b3173 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 5 Feb 2021 15:24:02 +0000 Subject: [PATCH 2/2] Accepting request 869221 from home:lnussel:usrmove - fix update-alternatives usage. Needs to be in %postun according to https://en.opensuse.org/openSUSE:Packaging_Multiple_Version_guidelines#update-alternatives_mechanism OBS-URL: https://build.opensuse.org/request/show/869221 OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=82 --- gawk.changes | 6 ++++++ gawk.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gawk.changes b/gawk.changes index 5526afb..9d87cc3 100644 --- a/gawk.changes +++ b/gawk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 4 10:41:36 UTC 2021 - Ludwig Nussel + +- fix update-alternatives usage. Needs to be in %postun according to + https://en.opensuse.org/openSUSE:Packaging_Multiple_Version_guidelines#update-alternatives_mechanism + ------------------------------------------------------------------- Mon Dec 14 16:06:16 UTC 2020 - Ludwig Nussel diff --git a/gawk.spec b/gawk.spec index c490b06..0ff4d18 100644 --- a/gawk.spec +++ b/gawk.spec @@ -89,8 +89,8 @@ ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/a --slave %{_mandir}/man1/awk.1.gz awk.1%{?ext_man} %{_mandir}/man1/gawk.1%{?ext_man} %endif -%preun -if [ $1 -eq 0 ]; then +%postun +if [ ! -f %{_bindir}/gawk ]; then %{_sbindir}/update-alternatives --remove awk %{_bindir}/gawk fi