poprawki: ash (lepsza wersja)

[Tomasz Kłoczko]

Ta poprawka jest z podbiciem rewizji.

kloczek
-- 
-----------------------------------------------------------
*Ludzie nie mają problemów, tylko sobie sami je stwarzają*
-----------------------------------------------------------
Tomasz Kłoczko, sys adm @zie.pg.gda.pl|*e-mail: kloczek w rudy.mif.pg.gda.pl*
-------------- następna część ---------
--- ash.spec.org	Thu Aug 13 09:35:16 1998
+++ ash.spec	Mon Sep 28 23:58:33 1998
@@ -1,28 +1,24 @@
-Summary: Small bourne shell from Berkeley
-Summary(pl): Mały shell bourne'a 
-Name: ash
-Version: 0.2
-Release: 14d
-Copyright: BSD
-Group: Shells
-Source: sunsite.unc.edu:/pub/Linux/system/Shells/ash-linux-0.2.tar.gz
-Patch: ash.patch
-Prereq: fileutils grep
-Buildroot: /var/tmp/ash-root
-Conflicts: mkinitrd <= 1.7
+Summary:     Small bourne shell from Berkeley
 Summary(de): Kleine Bourne-Shell von Berkeley
 Summary(fr): Shell Bourne réduit de Berkeley
+Summary(pl): Mały shell bourne'a 
 Summary(tr): Ufak bir bourne kabuđu
+Name:        ash
+Version:     0.2
+Release:     15d
+Copyright:   BSD
+Group:       Shells
+Source:      ftp://sunsite.unc.edu:/pub/Linux/system/Shells/ash-linux-%{version}.tar.gz
+Patch:       ash.patch
+Prereq:      fileutils, grep
+Buildroot:   /tmp/%{name}-%{version}-root
+Conflicts:   mkinitrd <= 1.7
 
 %description
 ash is a bourne shell clone from Berkeley.  It supports all of the standard
 Bourne shell commands and has the advantage of supporting them while 
 remaining considerably smaller than bash. 
 
-%description -l pl
-Ash jest klonem shell'a bourne'a z Berkely. Obsługuje standardowe komendy
-shell'a Bourne'a i jest mniejszy niż bash. 
-
 %description -l de
 ash ist ein Bourne-Shell-Clone aus Berkeley, der alle Standard-Bourne-Shell-
 Befehle unterstützt und dennoch erheblich weniger Platz beansprucht als bash. 
@@ -32,33 +28,36 @@
 standard du shell Bourne et a l'avantage de les gérer tout en restant
 considérablement plus petit que bash.
 
+%description -l pl
+Ash jest klonem shell'a bourne'a z Berkely. Obsługuje standardowe komendy
+shell'a Bourne'a i jest mniejszy niż bash. 
+
 %description -l tr
 ash, Berkeley'in bir bourne kabuđu kopyasýdýr. Standart bourne kabuđu
 komutlarýnýn tümünü destekler ve bash kabuđundan daha küçük olma
 avantajýna sahiptir.
 
 %prep
-%setup -n ash-linux-0.2
+%setup -n ash-linux-%{version}
 %patch -p0
 
 %build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
+make
 strip sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/bin
-mkdir -p $RPM_BUILD_ROOT/usr/man/man1
+install -d $RPM_BUILD_ROOT/{bin,usr/man/man1}
 
-install -m 711 sh $RPM_BUILD_ROOT/bin/ash
-install -m 644 sh.1 $RPM_BUILD_ROOT/usr/man/man1/ash.1
-ln -sf ash.1 $RPM_BUILD_ROOT/usr/man/man1/bsh.1
+install -s sh $RPM_BUILD_ROOT/bin/ash
+install sh.1 $RPM_BUILD_ROOT/usr/man/man1/ash.1
+echo ".so ash.1" > $RPM_BUILD_ROOT/usr/man/man1/bsh.1
 ln -sf ash $RPM_BUILD_ROOT/bin/bsh
 
 rm -f sh
 make STATIC=-static
 
-install -m 711 sh $RPM_BUILD_ROOT/bin/ash.static
+install -s sh $RPM_BUILD_ROOT/bin/ash.static
 
 %post
 if [ ! -f /etc/shells ]; then
@@ -74,14 +73,12 @@
 fi
 
 %postun
-
 if [ "$0" = 0 ]; then
 	grep -v '^/bin/ash' < /etc/shells | grep -v '^/bin/bsh' > /etc/shells.new
 	mv /etc/shells.new /etc/shells
 fi
 
 %verifyscript
-
 for n in ash bsh; do
     echo -n "Looking for $n in /etc/shells... "
     if ! grep "^/bin/${n}\$" /etc/shells > /dev/null; then
@@ -96,16 +93,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%attr(0711,root,root) /bin/ash
-%attr(0711,root,root) /bin/ash.static
-%attr(0711,root,root) /bin/bsh
-%attr(-,root,root) /usr/man/man1/ash.1
-%attr(-,root,root) /usr/man/man1/bsh.1
+%attr(711, root, root) /bin/*
+%attr(644, root,  man) /usr/man/man1/*
 
 %changelog
+* Sun Sep 27 1998 Tomasz Kłoczko <kloczek w rudy.mif.pg.gda.pl>
+  [0.2-15d]
+- bsh(1) man page is now maked as nroff include to ash(1) instead
+  making sym link to ash.1 (this allow compress man pages in future).
 
 * Mon Jun 29 1998 Wojtek Slusarczyk <wojtek w shadow.eu.org>
-[0.2-14d]
+  [0.2-14d]
 - build against glibc-2.1,
 - added a ash patch,
 - added pl translation,
@@ -113,21 +111,16 @@
 - moved %changelog at the end of spec.
 
 * Tue May 05 1998 Prospector System <bugs w redhat.com>
-
 - translations modified for de, fr, tr
 
-
 * Mon Oct 20 1997 Erik Troan <ewt w redhat.com>
-
 - made /bin/ash built shared
 - added ash.static
 - uses a buildroot and %attr
 
 * Sun Aug 24 1997 Erik Troan <ewt w redhat.com>
-
 - built against glibc
 - statically linked
 
 * Wed Apr 16 1997 Erik Troan <ewt w redhat.com>
-
-- fixed preinstall script to >> /etc/shells for bsh.
+- fixed preinstall script to >> /etc/shells for bsh.
\ No newline at end of file