- removed /etc/skel directory from package,

- fixed %files in static,
- text reformatings.

Changed files:
    bash.spec -> 1.24

diff --git a/bash.spec b/bash.spec
index b139567231e9d9fc9f0f579a53566477a012d19e..c865ed0018bd0983645da294de00e5bcb840c86b 100644 (file)
--- a/bash.spec
+++ b/bash.spec
@@ -21,18 +21,33 @@ Patch5:             bash-info.patch
 BuildPrereq:   ncurses-devel
 PreReq:                /sbin/install-info
 PreReq:                grep
-PreReq:                /bin/mv
+PreReq:                fileutils
 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 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 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 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
@@ -42,26 +57,6 @@ 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 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 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 tr
 Bash standart giriþten ya da bir dosyadan komut okuyup çalýþtýran sh uyumlu
 bir komut dili yorumlayýcýsýdýr. Ayný zamanda Korn ve C kabuklarýnýn (ksh ve
@@ -75,25 +70,25 @@ Summary(pl):        Statycznie zlinkowany GNU Bourne Again Shell (bash)
 Group:         Shells
 Group(pl):     Pow³oki
 Requires:      %{name}
+PreReq:                grep
+PreReq:                fileutils
 
 %description static
-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).
 
 This packege contains staticly linked version of bash.
 
 %description static -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). 
+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 
+Bash ma równie¿ zaimplementowany IEEE Posix Shell oraz jest zgodny ze
 specyfikacj± - IEEE Working Group 1003.2.
 
 W tym pakiecie jest statycznie zlinkowany bash.
@@ -108,9 +103,8 @@ W tym pakiecie jest statycznie zlinkowany bash.
 %patch5 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure \
-       --prefix=%{_prefix} \
+LDFLAGS="-s"; export LDFLAGS
+%configure \
        --enable-alias \
        --enable-help-builtin \
        --enable-history \
@@ -120,9 +114,7 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
        --with-curses \
        --enable-extended-glob \
        --enable-dparen-arithmetic \
-       --enable-static-link \
-       --infodir=%{_infodir} \
-       %{_target_platform}
+       --enable-static-link
 
 make TERMCAP_LIB="-lncurses"
 mv bash bash.static
@@ -135,7 +127,7 @@ install -d $RPM_BUILD_ROOT{%{_mandir},%{_infodir}}
 install -d $RPM_BUILD_ROOT/{bin,etc}
 
 make install \
-       prefix=$RPM_BUILD_ROOT%{_prefix} \
+       bindir=$RPM_BUILD_ROOT%{_bindir} \
        infodir=$RPM_BUILD_ROOT%{_infodir} \
        mandir=$RPM_BUILD_ROOT%{_mandir} 
 
@@ -147,8 +139,8 @@ cp -a       skel            $RPM_BUILD_ROOT/etc
 echo   .so bash.1 >    $RPM_BUILD_ROOT%{_mandir}/man1/rbash.1
 ln -sf bash            $RPM_BUILD_ROOT/bin/rbash
 
-gzip -9nf      $RPM_BUILD_ROOT{%{_infodir}/bash.info,%{_mandir}/man1/*} \
-               NEWS README doc/{FAQ,INTRO}
+gzip -9nf $RPM_BUILD_ROOT{%{_infodir}/bash.info,%{_mandir}/man1/*} \
+       NEWS README doc/{FAQ,INTRO}
 
 %post
 if [ ! -f /etc/shells ]; then
@@ -161,7 +153,6 @@ else
        if ! grep '^/bin/rbash$' /etc/shells > /dev/null; then
                echo "/bin/rbash" >> /etc/shells
        fi
-
 fi
 
 /sbin/install-info %{_infodir}/bash.info.gz /etc/info-dir
@@ -189,7 +180,6 @@ if [ $1 = 0 ]; then
        mv /etc/shells.new /etc/shells
 fi
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -198,7 +188,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc {NEWS,README}.gz doc/{FAQ,INTRO}.gz
 
 /etc/bashrc
-/etc/skel
+/etc/skel/*
 
 %attr(755,root,root) /bin/bash
 %attr(755,root,root) /bin/rbash
@@ -208,8 +198,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %files static
-%defattr(644,root,root,755)
-%attr(755,root,root) /bin/bash
+%attr(755,root,root) /bin/bash.static
 
 %changelog
 * Sat Jun  5 1999 Jan Rêkorajski <baggins@pld.org.pl>