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
This commit is contained in:
Dirk Mueller 2021-01-27 22:23:16 +00:00 committed by Git OBS Bridge
parent beac6968c1
commit d23e4f7b39
2 changed files with 23 additions and 11 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Dec 14 16:06:16 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
- remove use of obsolete %install_info
-------------------------------------------------------------------
Wed Apr 15 08:48:59 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>

View File

@ -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