X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ash.spec;h=d460a1577dc29c5a50d2cd9b7109660353d356d4;hb=059491f0e8da473cbb60507c7b23c871602045fc;hp=03efbdef255c649bd5f97cfa998510e5da92a12f;hpb=d92437fed537074124771d7d617dd1f7181d9630;p=packages%2Fash.git

diff --git a/ash.spec b/ash.spec
index 03efbde..d460a15 100644
--- a/ash.spec
+++ b/ash.spec
@@ -1,3 +1,5 @@
+# Env: 123
+# Branch: HEAD
 # conditional build:
 # if BOOT is defined, build BOOT package too
 Summary:	Small bourne shell from Berkeley
@@ -6,18 +8,42 @@ Summary(fr):	Shell Bourne r
 Summary(pl):	Ma³y shell bourne'a 
 Summary(tr):	Ufak bir bourne kabuðu
 Name:		ash
-Version:	0.3.1
-Release:	1
+Version:	0.4.0
+Release:	3
 License:	BSD
 Group:		Applications/Shells
 Group(de):	Applikationen/Shells
 Group(pl):	Aplikacje/Pow³oki
-Source0:	ftp://ftp.pld.org.pl/people/malekith/%{name}-linux-%{version}.tar.gz
-Patch0:		%{name}-Makefile.patch
+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
+Patch20:	%{name}-sighup.patch
 Prereq:		fileutils
 Prereq:		grep
 BuildRequires:	glibc-static
-%{?BOOT:BuildRequires:	uClibc-devel-BOOT}
+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
 
@@ -104,28 +130,51 @@ Version for bootdisk
 %endif
 
 %prep
-%setup -q -n ash-linux-%{version}
-%patch -p1
+%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
+%patch20 -p1
 
 %build
 # 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="-I/usr/lib/bootdisk%{_includedir} -Os" \
-	LDFLAGS="-nostdlib -s" \
+	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="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}" \
-	LDFLAGS="-static %{!?debug:-s}"
+%{__make} OPT_FLAGS="%{rpmcflags}" LDFLAGS="-static %{rpmldflags}"
 mv -f sh ash.static
-%{__make} OPT_FLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}" \
-	LDFLAGS="%{!?debug:-s}"
-
-
+%{__make} OPT_FLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -133,8 +182,8 @@ rm -rf $RPM_BUILD_ROOT
 # 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 -s ash $RPM_BUILD_ROOT/usr/lib/bootdisk/bin/sh
+install ash.BOOT $RPM_BUILD_ROOT/usr/lib/bootdisk/bin/ash
+ln -sf ash $RPM_BUILD_ROOT/usr/lib/bootdisk/bin/sh
 %endif
 
 # other
@@ -150,10 +199,10 @@ if [ ! -f /etc/shells ]; then
         echo "%{_bindir}/ash" > /etc/shells
         echo "%{_bindir}/bsh" >> /etc/shells
 else
-        if ! grep '^%{_bindir}/ash$' /etc/shells > /dev/null; then
+        if ! grep -q '^%{_bindir}/ash$' /etc/shells ; then
                 echo "%{_bindir}/ash" >> /etc/shells
         fi
-        if ! grep '^%{_bindir}/bsh$' /etc/shells > /dev/null; then
+        if ! grep -q '^%{_bindir}/bsh$' /etc/shells ; then
                 echo "%{_bindir}/bsh" >> /etc/shells
         fi
 fi
@@ -162,27 +211,27 @@ fi
 if [ ! -f /etc/shells ]; then
         echo "%{_bindir}/ash.static" >> /etc/shells
 else
-        if ! grep '^%{_bindir}/ash.static$' /etc/shells > /dev/null; then
+        if ! grep -q '^%{_bindir}/ash.static$' /etc/shells ; then
                 echo "%{_bindir}/ash.static" >> /etc/shells
         fi
 fi
 
 %preun
-if [ "$0" = 0 ]; then
-        grep -v %{_bindir}/ash /etc/shells | grep -v %{_bindir}/bsh | grep -v %{_bindir}/ash.static > /etc/shells.new
+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 %{_bindir}/ash /etc/shells | grep -v %{_bindir}/bsh > /etc/shells.new
+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 "^%{_bindir}/${n}\$" /etc/shells > /dev/null; then
+    if ! grep -q "^%{_bindir}/${n}\$" /etc/shells ; then
 	echo "missing"
 	echo "${n} missing from /etc/shells" >&2
     else
@@ -190,6 +239,15 @@ 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