X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ash.spec;h=84b8c9c60f8ad79fa8e71ccd5e7412d8d4bcfc7e;hb=ee5f2f08b9a1f4cc9c36f85d97a7aab168f28c08;hp=e447dbbaaf14230296239e93b2c04c77ce8b0a2d;hpb=5979a7992e684036c29dfe880e593008b1b36737;p=packages%2Fash.git

diff --git a/ash.spec b/ash.spec
index e447dbb..84b8c9c 100644
--- a/ash.spec
+++ b/ash.spec
@@ -1,22 +1,51 @@
+# conditional build:
+# if BOOT is defined, build BOOT package too
 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:	20
+Version:	0.4.0
+Release:	2
 License:	BSD
-Group:		Shells
-Group(pl):	Pow³oki
-Source0:	ftp://sunsite.unc.edu/pub/Linux/system/shells/%{name}-linux-%{version}.tar.gz
-Patch0:		ash-make.patch
-Patch1:		ash-mknodes.patch
+Group:		Applications/Shells
+Group(de):	Applikationen/Shells
+Group(pl):	Aplikacje/Pow³oki
+Source:      	%{name}-%{version}.tar.gz
+Patch0:		%{name}-builtin.patch
+Patch1:		%{name}-echo.patch
+Patch2:		%{name}-getcwd.patch
+Patch3:		%{name}-getopt.patch
+Patch4:		%{name}-glob.patch
+Patch5:		%{name}-jobs.patch
+Patch6:		%{name}-kill.patch
+Patch7:		%{name}-makefile.patch
+Patch8:		%{name}-manpage.patch
+Patch9:		%{name}-hetio.patch
+Patch10:	%{name}-memout.patch
+Patch11:	%{name}-misc.patch
+Patch12:	%{name}-redir.patch
+Patch13:	%{name}-setmode.patch
+Patch14:	%{name}-syntax.patch
+Patch15:	%{name}-test.patch
+Patch16:	%{name}-times.patch
+Patch17:	%{name}-debian.patch
+Patch18:	%{name}-ppid.patch
+Patch19:	%{name}-freebsd.patch
 Prereq:		fileutils
 Prereq:		grep
+BuildRequires:	glibc-static
+BuildRequires:	flex
+BuildRequires:	byacc
+%if %{?BOOT:1}%{!?BOOT:0}
+BuildRequires:	uClibc-devel-BOOT >= 20000521
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Conflicts:	mkinitrd <= 1.7
 
+%define		_bindir		/bin
+
 %description
 ash is a bourne shell clone from Berkeley. It supports all of the
 standard Bourne shell commands and has the advantage of supporting
@@ -33,7 +62,7 @@ commandes standard du shell Bourne et a l'avantage de les g
 en restant considérablement plus petit que bash.
 
 %description -l pl
-Ash jest klonem shell'a Bourne'a z Berkely. Obs³uguje standardowe
+Ash jest klonem shell'a Bourne'a z Berkeley. Obs³uguje standardowe
 komendy shell'a Bourne'a i jest mniejszy ni¿ bash.
 
 %description -l tr
@@ -47,8 +76,9 @@ 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
-Group:		Shells
-Group(pl):	Pow³oki
+Group:		Applications/Shells
+Group(de):	Applikationen/Shells
+Group(pl):	Aplikacje/Pow³oki
 Prereq:		fileutils
 Prereq:		grep
 Conflicts:	mkinitrd <= 1.7
@@ -69,7 +99,7 @@ commandes standard du shell Bourne et a l'avantage de les g
 en restant considérablement plus petit que bash.
 
 %description static -l pl
-Ash jest klonem shell'a Bourne'a z Berkely. Obs³uguje standardowe
+Ash jest klonem shell'a Bourne'a z Berkeley. Obs³uguje standardowe
 komendy shell'a Bourne'a i jest mniejszy ni¿ bash.
 
 %description static -l tr
@@ -77,68 +107,127 @@ ash, Berkeley'in bir bourne kabu
 komutlarýnýn tümünü destekler ve bash kabuðundan daha küçük olma
 avantajýna sahiptir.
 
+%if %{?BOOT:1}%{!?BOOT:0}
+%package BOOT
+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
+Group:		Applications/Shells
+Group(de):	Applikationen/Shells
+Group(pl):	Aplikacje/Pow³oki
+
+%description BOOT
+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.
+Version for bootdisk
+
+%endif
+
 %prep
-%setup  -q -n ash-linux-%{version}
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+#%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+# this is mainly for information, maybe add changelog to %doc?
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %build
-make
+# BOOT
+%if %{?BOOT:1}%{!?BOOT:0}
+# some of this utilities does not compile with uClibc
+# and it is not necessary
+%{__make} mksignames mkbuiltins mknodes mksignames mksyntax mktokens
+%{__make} \
+	OPT_FLAGS="-m386 -I/usr/lib/bootdisk%{_includedir} -Os" \
+	LDFLAGS="-nostdlib %{rpmldflags}" \
+	LDLIBS="%{_libdir}/bootdisk%{_libdir}/crt0.o %{_libdir}/bootdisk%{_libdir}/libc.a -lgcc"
+mv -f sh ash.BOOT
+%{__make} clean
+%endif
+
+# this patch imposes memory buffers - uClibc lacks them
+patch -p1 <%{PATCH10}
+
+# other
+%{__make} OPT_FLAGS="%{rpmcflags}" LDFLAGS="-static %{rpmldflags}"
+mv -f sh ash.static
+%{__make} OPT_FLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{bin,%{_mandir}/man1}
 
-install sh $RPM_BUILD_ROOT/bin/ash
+# BOOT
+%if %{?BOOT:1}%{!?BOOT:0}
+install -d $RPM_BUILD_ROOT/usr/lib/bootdisk/bin
+install -s ash.BOOT $RPM_BUILD_ROOT/usr/lib/bootdisk/bin/ash
+ln -sf ash $RPM_BUILD_ROOT/usr/lib/bootdisk/bin/sh
+%endif
+
+# other
+install -d $RPM_BUILD_ROOT/{%{_bindir},%{_mandir}/man1}
+install sh $RPM_BUILD_ROOT%{_bindir}/ash
+install ash.static $RPM_BUILD_ROOT%{_bindir}/ash.static
 install sh.1 $RPM_BUILD_ROOT%{_mandir}/man1/ash.1
 echo ".so ash.1" > $RPM_BUILD_ROOT%{_mandir}/man1/bsh.1
-ln -sf ash $RPM_BUILD_ROOT/bin/bsh
-
-rm -f sh
-%{__make} STATIC=-static
-
-install sh $RPM_BUILD_ROOT/bin/ash.static
-
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/*
+ln -sf ash $RPM_BUILD_ROOT/%{_bindir}/bsh
 
 %post
 if [ ! -f /etc/shells ]; then
-        echo "/bin/ash" > /etc/shells
-        echo "/bin/bsh" >> /etc/shells
+        echo "%{_bindir}/ash" > /etc/shells
+        echo "%{_bindir}/bsh" >> /etc/shells
 else
-        if ! grep '^/bin/ash$' /etc/shells > /dev/null; then
-                echo "/bin/ash" >> /etc/shells
+        if ! grep -q '^%{_bindir}/ash$' /etc/shells ; then
+                echo "%{_bindir}/ash" >> /etc/shells
         fi
-        if ! grep '^/bin/bsh$' /etc/shells > /dev/null; then
-                echo "/bin/bsh" >> /etc/shells
+        if ! grep -q '^%{_bindir}/bsh$' /etc/shells ; then
+                echo "%{_bindir}/bsh" >> /etc/shells
         fi
 fi
 
 %post static
 if [ ! -f /etc/shells ]; then
-        echo "/bin/ash.static" >> /etc/shells
+        echo "%{_bindir}/ash.static" >> /etc/shells
 else
-        if ! grep '^/bin/ash.static$' /etc/shells > /dev/null; then
-                echo "/bin/ash.static" >> /etc/shells
+        if ! grep -q '^%{_bindir}/ash.static$' /etc/shells ; then
+                echo "%{_bindir}/ash.static" >> /etc/shells
         fi
 fi
 
 %preun
-if [ "$0" = 0 ]; then
-        grep -v /bin/ash /etc/shells | grep -v /bin/bsh | grep -v /bin/ash.static > /etc/shells.new
-        mv /etc/shells.new /etc/shells
+if [ "$1" = 0 ]; then
+        grep -v '^%{_bindir}/ash$' /etc/shells | grep -v '^%{_bindir}/bsh$' > /etc/shells.new
+        mv -f /etc/shells.new /etc/shells
 fi
 
 %preun static
-if [ "$0" = 0 ]; then
-        grep -v /bin/ash /etc/shells | grep -v /bin/bsh > /etc/shells.new
-        mv /etc/shells.new /etc/shells
+if [ "$1" = 0 ]; then
+        grep -v '^%{_bindir}/ash\.static$' /etc/shells > /etc/shells.new
+        mv -f /etc/shells.new /etc/shells
 fi
 
 %verifyscript
-for n in ash bsh ash.static; do
+for n in ash bsh ; do
     echo -n "Looking for $n in /etc/shells... "
-    if ! grep "^/bin/${n}\$" /etc/shells > /dev/null; then
+    if ! grep -q "^%{_bindir}/${n}\$" /etc/shells ; then
 	echo "missing"
 	echo "${n} missing from /etc/shells" >&2
     else
@@ -146,15 +235,30 @@ for n in ash bsh ash.static; do
     fi
 done
 
+%verifyscript static
+echo -n "Looking for ash.static in /etc/shells... "
+if ! grep -q '^%{_bindir}/ash\.static$' /etc/shells ; then
+	echo "missing"
+	echo "ash.static missing from /etc/shells" >&2
+else
+	echo "found"
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) /bin/ash
-/bin/bsh
+%attr(755,root,root) %{_bindir}/ash
+%attr(755,root,root) %{_bindir}/bsh
 %{_mandir}/man1/*
 
 %files static
 %defattr(644,root,root,755)
-%attr(755,root,root) /bin/ash.static
+%attr(755,root,root) %{_bindir}/ash.static
+
+%if %{?BOOT:1}%{!?BOOT:0}
+%files BOOT
+%defattr(644,root,root,755)
+%attr(755,root,root) /usr/lib/bootdisk/bin/*
+%endif