- updated to 2.03,

- removed man group from man pages,
- gzipping insterad bzipping2 man pages,
- rewrited %post, %preun,
- removed %config and %verify rules from /etc/bashrc (all extensions can be
  added by adding /etc/profile.d/*.sh scripts).

Status: NF.

Changed files:
    bash.spec -> 1.4

diff --git a/bash.spec b/bash.spec
index 8878f7b2816fd48c60cf643788a5428ef8156154..f7745997c7af965d291537c773ef067e48d25cf2 100644 (file)
--- a/bash.spec
+++ b/bash.spec
@@ -1,55 +1,60 @@
-Summary:     GNU Bourne Again Shell (bash)
-Summary(de): GNU Bourne Again Shell (bash)
-Summary(fr): GNU Bourne Again Shell (bash)
-Summary(pl): GNU Bourne Again Shell (bash)
-Summary(tr): GNU Bourne Again Shell (bash)
-Name:        bash
-Version:     2.02.1
-Release:     4
-Group:       Shells
-Copyright:   GPL
-Source0:     ftp://ftp.gnu.org/pub/gnu/bash-%{PACKAGE_VERSION}.tar.gz
-Source1:     bashrc
-Source2:     rbash.1
-Patch0:      bash-paths.patch
-Patch1:      bash-security.patch
-Patch2:      bash-fixes.patch
-Patch3:      bash-arm.patch
-Prereq:      fileutils, grep 
-BuildRoot:   /tmp/%{name}-%{version}-root
+Summary:       GNU Bourne Again Shell (bash)
+Summary(pl):   GNU Bourne Again Shell (bash)
+Summary(de):   GNU Bourne Again Shell (bash)
+Summary(fr):   GNU Bourne Again Shell (bash)
+Summary(tr):   GNU Bourne Again Shell (bash)
+Name:          bash
+Version:       2.03
+Release:       1
+Group:         Shells
+Copyright:     GPL
+Source0:       ftp://prep.ai.mit.edu/pub/gnu/%{name}-%{version}.tar.gz
+Source1:       bashrc
+Patch0:                %{name}.patch
+Patch1:                %{name}-fixes.patch
+Patch2:                %{name}-paths.patch
+Patch3:                %{name}-security.patch
+Prereq:                fileutils
+Prereq:                grep 
+Buildroot:     /tmp/%{name}-%{version}-root
 
 %description
-Bash is an sh-compatible command language interpreter that executes commands
-read from the standard input or from a file.  Bash also incorporates useful
-features from the Korn and C shells (ksh and csh).
+Bash is an sh-compatible command language interpreter that
+executes commands read from the standard input or from a
+file.  Bash also incorporates useful features from the
+Korn and C shells (ksh and csh).
 
-Bash is ultimately intended to be a conformant implementation of the IEEE
-Posix Shell and Tools specification (IEEE Working Group 1003.2).
+Bash is ultimately intended to be a conformant implementation
+of the IEEE Posix Shell and Tools specification (IEEE
+Working Group 1003.2).
+
+%description -l pl
+Bash jest zaawansowanym shellem, który wykonuje komendy czytane ze
+standardowego wej¶cia (stdin) lub z pliku. Posiada w³a¶ciwo¶ci 
+shelli Korn i C (ksh i csh). 
+
+Bash ma równie¿ zaimplementowany IEEE Posix Shell oraz jest zgodny ze 
+specyfikacj± - IEEE Working Group 1003.2.
 
 %description -l de
-Bash ist ein sh-kompatibler Befehlssprachen-Interpreter, der über die
-Standardeingabe oder eine Datei gelesene Befehle ausführt. Bash beinhaltet
-außerdem nützliche Funktionen der Korn- und der C-Shell (ksh und csh).
+Bash ist ein sh-kompatibler Befehlssprachen-Interpreter, der
+über die Standardeingabe oder eine Datei gelesene Befehle ausführt.
+Bash beinhaltet außerdem nützliche Funktionen der Korn- und der
+C-Shell (ksh und csh).
 
-Bash soll eine kompatible Implementierung der 'IEEE Posix Shell and Tools
-Specification' (IEEE Working Group 1003.2) sein.
+Bash soll eine kompatible Implementierung der
+'IEEE Posix Shell and Tools Specification' (IEEE
+Working Group 1003.2) sein.
 
 %description -l fr
-Bash est un interpréteur de commande compatible sh qui exécute les commandes
-lues sur l'entrée standard ou depuis un fichier. Bash inclue également des
-fonctionnalités utiles des shells Korn et C (ksh et csh).
+Bash est un interpréteur de commande compatible sh qui exécute
+les commandes lues sur l'entrée standard ou depuis un fichier.
+Bash inclue également des fonctionnalités utiles des shells Korn et C
+(ksh et csh).
 
 Bash est prévu pour être une implémentation de shell conforme la
-spécification Posix IEEE sur les shell et les outils (Groupe de travail IEEE
-1003.2).
-
-%description -l pl
-Bash jest zaawansowanym shellem, który wykonuje komendy czytane ze
-standardowego wej¶cia (stdin) lub z pliku. Posiada w³a¶ciwo¶ci shelli: Korn
-i C (ksh i csh).
-
-Bash ma równie¿ zaimplementowany IEEE Posix Shell oraz jest zgodny ze
-specyfikacj± - IEEE Working Group 1003.2.
+spécification Posix IEEE sur les shell et les outils (Groupe de 
+travail IEEE 1003.2).
 
 %description -l tr
 Bash standart giriþten ya da bir dosyadan komut okuyup çalýþtýran sh uyumlu
@@ -60,111 +65,92 @@ tasarlanm
 
 %prep
 %setup -q
-%patch0 -p1 -b .paths
-%patch1 -p1 -b .security
-%patch2 -p1 -b .fixes
-%patch3 -p1 -b .arm
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
+LDFLAGS="-s" CFLAGS="$RPM_OPT_FLAGS" \
 ./configure \
        --prefix=/usr \
-       --with-curses \
+       --enable-alias \
+       --enable-help-builtin \
+       --enable-history \
+       --enable-job-control \
+       --enable-restricted \
        --enable-readline \
-       --enable-history
-make
+       --enable-static-link
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/{etc,bin,usr/info}
-make install prefix=$RPM_BUILD_ROOT/usr
+install -d $RPM_BUILD_ROOT/{usr,bin,etc}
+make prefix=$RPM_BUILD_ROOT/usr install
 
-mv $RPM_BUILD_ROOT/usr/bin/bash $RPM_BUILD_ROOT/bin
-gzip -9nf $RPM_BUILD_ROOT/usr/info/bash.info*
+mv $RPM_BUILD_ROOT/usr/bin/bash $RPM_BUILD_ROOT/bin/bash
+rm -f $RPM_BUILD_ROOT/usr/bin/installed-bash
+
+rm -f $RPM_BUILD_ROOT/usr/bin/bash.old
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/bashrc
 
-echo ".so bash.1" > $RPM_BUILD_ROOT/usr/man/man1/sh.1
+echo .so bash.1 > $RPM_BUILD_ROOT/usr/man/man1/sh.1
+echo .so bash.1 > $RPM_BUILD_ROOT/usr/man/man1/rbash.1
+
 ln -sf bash $RPM_BUILD_ROOT/bin/sh
+ln -sf bash $RPM_BUILD_ROOT/bin/rbash
 
-install %{SOURCE2} $RPM_BUILD_ROOT/usr/man/man1
+gzip -9nf $RPM_BUILD_ROOT/usr/{info/bash.info,man/man1/*}
 
-gzip -9nf $RPM_BUILD_ROOT/usr/man/man1/*
+bzip2 -9 NEWS README 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# ***** bash doesn't use install-info. It's always listed in /usr/info/dir
-# to prevent prereq loops
 %post
-echo "/bin/bash" >> /etc/shells
-echo "/bin/sh" >> /etc/shells
-echo "/bin/rbash" >> /etc/shells
-sort /etc/shells | uniq > /etc/shells.tmp
-mv /etc/shells.tmp /etc/shells
-
-%postun
-if [ "$1" = "0" ]; then
-       grep -v /bin/bash /etc/shells | grep -v /bin/sh | grep -v /bin/rbash > /etc/shells.tmp
-       mv /etc/shells.tmp /etc/shells
-fi
+(cat /etc/shells; echo "/bin/sh"; echo "/bin/bash"; echo "/bin/rbash") | sort -u > /etc/shells
+
+%preun
+cat /etc/shells | egrep -v "/bin/bash|/bin/bash|/bin/rbash" > /etc/shells
 
 %files
-%defattr(-,root,root)
-%doc CHANGES COMPAT NEWS NOTES README CWRU/POSIX.NOTES
-%doc doc/{FAQ,INTRO,article.ms}
-%doc examples/{bashdb,functions,misc,scripts.noah,scripts.v2,scripts,startup-files}
-%config /etc/bashrc
-%attr(755, root, root) /bin/*
+%defattr(644,root,root,755)
+%doc NEWS.bz2 README.bz2 
+
+/etc/bashrc
+
+%attr(755,root,root) /bin/*
+%attr(755,root,root) /usr/bin/*
+
 /usr/info/bash.info.gz
-%attr(644, root,  man) /usr/man/man1/*
+/usr/man/man1/*
 
 %changelog
-* Sat Dec 19 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [2.02.1-4]
-- added gzipping man pages,
-- simplifications in %post
-- added arm patch from rawhide.
-
-* Tue Oct  6 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [2.02.1-2]
-- removed doc subpackage,
-- added bash-fixes.patch (partialy based on Debian patch for bash) with
-  following changes:
-  - .bash_history created 600 by default,
-  - bash binary is now linked with shared (system) libreadline, libhistory,
-  - use TMPDIR by using tempnam(3),
-  - man page with rbash(1),
-- added symlink /bin/rbash -> bash and (un)registering in /etc/shells
-  /bin/rbash in %post{un},
-- changed Buildroot to /tmp/%%{name}-%%{version}-root,
-- added using %%{name} and %%{version} in Source,
-- simplification in %install and %files,
-- added %attr and %defattr macros in %files (allows build package from
-  non-root account),
-- added pl translation (Wojtek ¦lusarczyk <wojtek@shadow.eu.org>),
-- added de, fr, tr translations from old 1.4.x bash spec.
-
-* Wed Aug 19 1998 Jeff Johnson <jbj@redhat.com>
-- resurrect for RH 6.0.
-
-* Sun Jul 26 1998 Jeff Johnson <jbj@redhat.com>
-- update to 2.02.1
-
-* Thu Jun 11 1998 Jeff Johnson <jbj@redhat.com>
-- Package for 5.2.
-
-* Mon Apr 20 1998 Ian Macdonald <ianmacd@xs4all.nl>
-- added POSIX.NOTES doc file
-- some extraneous doc files removed
-- minor .spec file changes
-
-* Sun Apr 19 1998 Ian Macdonald <ianmacd@xs4all.nl>
-- upgraded to version 2.02
-- Alpha, MIPS & Sparc patches removed due to lack of test platforms
-- glibc & signal patches no longer required
-- added documentation subpackage (doc)
+* Mon Feb 22 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
+  [2.03-1]
+- removed man group from man pages,
+- gzipping insterad bzipping2 man pages,
+- rewrited %post, %preun,
+- removed %config and %verify rules from /etc/bashrc (all extensions can be
+  added by adding /etc/profile.d/*.sh scripts).
+
+* Sun Sep 05 1998 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
+  [2.02.1-1d]
+- updated to 2.02.1,
+- fixed files permissions,
+- build with restricted shell support.
+
+* Wed Jun 17 1998 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
+  [14.7-9d]
+- build against glibc-2.1,
+- translation modified for pl,
+- added %defattr support,
+- build from non root's account.
+
+* Mon Apr 27 1998 Prospector System <bugs@redhat.com>
+- translations modified for de, fr, tr
 
 * Fri Nov 07 1997 Donnie Barnes <djb@redhat.com>
 - added signal handling patch from Dean Gaudet <dgaudet@arctic.org> that