From 75be86193156c23a61cfe428f922445336ada0f461e1660173906744f64cb27b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 25 Feb 2010 10:12:05 +0000 Subject: [PATCH] Accepting request 33371 from Base:System Copy from Base:System/gawk based on submit request 33371 from user msmeissn OBS-URL: https://build.opensuse.org/request/show/33371 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gawk?expand=0&rev=8 --- gawk.changes | 5 +++++ gawk.spec | 43 +++++++++++++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/gawk.changes b/gawk.changes index 6463dd5..c356f82 100644 --- a/gawk.changes +++ b/gawk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 16 09:06:01 UTC 2010 - guido+opensuse.org@berhoerster.name + +- use update-alternatives + ------------------------------------------------------------------- Tue Nov 3 19:09:17 UTC 2009 - coolo@novell.com diff --git a/gawk.spec b/gawk.spec index fadae7b..4678374 100644 --- a/gawk.spec +++ b/gawk.spec @@ -1,7 +1,7 @@ # # spec file for package gawk (Version 3.1.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,14 @@ Name: gawk Url: http://www.gnu.org/software/gawk/ -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Text/Utilities Provides: awk AutoReqProv: on -PreReq: %{install_info_prereq} +BuildRequires: update-alternatives +PreReq: %{install_info_prereq} update-alternatives Version: 3.1.6 -Release: 26 +Release: 27 Summary: GNU awk Source: gawk-%{version}.tar.bz2 Patch: gawk-%{version}.diff @@ -75,32 +76,50 @@ make check %install make install DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/bin -mv -f $RPM_BUILD_ROOT/usr/bin/awk $RPM_BUILD_ROOT/usr/bin/gawk \ - $RPM_BUILD_ROOT/bin -ln -sf ../../bin/awk ../../bin/gawk $RPM_BUILD_ROOT/usr/bin -ln -sf gawk.1 $RPM_BUILD_ROOT%{_mandir}/man1/awk.1 -rm -f $RPM_BUILD_ROOT/usr/bin/*-%{version} +mv -f $RPM_BUILD_ROOT/usr/bin/gawk $RPM_BUILD_ROOT/bin +ln -sf ../../bin/gawk $RPM_BUILD_ROOT/usr/bin +rm -f $RPM_BUILD_ROOT/usr/bin/*-%{version} $RPM_BUILD_ROOT/usr/bin/awk +# create ghost files +touch $RPM_BUILD_ROOT/usr/bin/awk $RPM_BUILD_ROOT/bin/awk \ + $RPM_BUILD_ROOT/%{_mandir}/man1/awk.1.gz %find_lang %name %clean rm -rf $RPM_BUILD_ROOT %post +/usr/sbin/update-alternatives --install /bin/awk awk /bin/gawk 20 \ + --slave /usr/bin/awk usr-bin-awk /bin/gawk \ + --slave %{_mandir}/man1/awk.1.gz awk.1.gz %{_mandir}/man1/gawk.1.gz %install_info --info-dir=%{_infodir} %{_infodir}/gawk.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/gawkinet.info.gz +%preun +if [ $1 -eq 0 ]; then + /usr/sbin/update-alternatives --remove awk /bin/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) +%if %{suse_version} >= 1120 +%ghost /bin/awk +%ghost %{_bindir}/awk +%ghost %{_mandir}/man1/awk.1.gz +%endif %doc AUTHORS COPYING FUTURES LIMITATIONS NEWS POSIX.STD PROBLEMS README -/bin/* -/usr/bin/* +/bin/gawk +%{_bindir}/gawk +%{_bindir}/igawk +%{_bindir}/pgawk %{_libdir}/awk /usr/share/awk %{_infodir}/*.info.gz -%{_mandir}/man1/*.1.gz +%{_mandir}/man1/gawk.1.gz +%{_mandir}/man1/igawk.1.gz +%{_mandir}/man1/pgawk.1.gz %changelog