From fe3dfa54187c5c32532f814fed6167c5524a23be41c0b4f71c8f0e5e78e5eb46 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Sat, 8 Feb 2014 12:35:32 +0000 Subject: [PATCH] - adjust update-alternative usage to packaging policy (see http://lists.opensuse.org/opensuse-packaging/2014-02/msg00024.html) - move mawk to /usr/bin and add symlink in /bin OBS-URL: https://build.opensuse.org/package/show/Base:System/mawk?expand=0&rev=12 --- mawk.changes | 7 +++++++ mawk.spec | 41 +++++++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/mawk.changes b/mawk.changes index 942cf3d..f227dd4 100644 --- a/mawk.changes +++ b/mawk.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 8 12:04:51 UTC 2014 - gber@opensuse.org + +- adjust update-alternative usage to packaging policy + (see http://lists.opensuse.org/opensuse-packaging/2014-02/msg00024.html) +- move mawk to /usr/bin and add symlink in /bin + ------------------------------------------------------------------- Tue May 15 08:43:19 UTC 2012 - gber@opensuse.org diff --git a/mawk.spec b/mawk.spec index 1907187..e1560a4 100644 --- a/mawk.spec +++ b/mawk.spec @@ -1,7 +1,7 @@ # # spec file for package mawk # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Guido Berhoerster. # # All modifications and additions to the file contributed by third parties @@ -51,41 +51,46 @@ chmod 755 examples/* # without --enable-warnings several functions will not be marked with gcc's # noreturn attribute and produce warnings when $RPM_OPT_FLAGS contains -Wall %configure \ - --enable-warnings \ - --bindir=/bin + --enable-warnings make %{?_smp_mflags} %install %make_install -# move to /bin and symlink to /usr/bin -install -d -m 755 %{buildroot}/%{_bindir} -ln -s ../../bin/mawk %{buildroot}/%{_bindir}/mawk -# create ghost files -touch %{buildroot}/bin/awk %{buildroot}%{_bindir}/awk \ - %{buildroot}%{_mandir}/man1/awk.1.gz +# compatibility symlink +install -d -m 755 %{buildroot}/bin +ln -s %{_bindir}/mawk %{buildroot}/bin/mawk +# create symlinks for update-alternatives +install -d -m 755 %{buildroot}%{_sysconfdir}/alternatives +ln -s %{_sysconfdir}/alternatives/awk %{buildroot}/bin/awk +ln -s %{_sysconfdir}/alternatives/usr-bin-awk %{buildroot}%{_bindir}/awk +ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} %{buildroot}%{_mandir}/man1/awk.1%{?ext_man} %check make check %post -/usr/sbin/update-alternatives --install /bin/awk awk /bin/mawk 15 \ - --slave /usr/bin/awk usr-bin-awk /bin/mawk \ - --slave %{_mandir}/man1/awk.1.gz awk.1.gz %{_mandir}/man1/mawk.1.gz +%{_sbindir}/update-alternatives \ + --install /bin/awk awk %{_bindir}/mawk 15 \ + --slave %{_bindir}/awk usr-bin-awk %{_bindir}/mawk \ + --slave %{_mandir}/man1/awk.1.gz awk.1%{?ext_man} %{_mandir}/man1/mawk.1%{?ext_man} %preun if [ $1 -eq 0 ]; then - /usr/sbin/update-alternatives --remove awk /bin/mawk + %{_sbindir}/update-alternatives --remove awk %{_bindir}/mawk fi %files %defattr(-,root,root,-) %doc ACKNOWLEDGMENT CHANGES COPYING README examples/ -%doc %{_mandir}/man1/mawk.1* -%ghost /bin/awk -%ghost %{_bindir}/awk -%ghost %{_mandir}/man1/awk.1.gz -%{_bindir}/mawk /bin/mawk +%{_bindir}/mawk +%{_mandir}/man1/mawk.1%{?ext_man} +/bin/awk +%{_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} %changelog