SPECS: dash.spec - rel 2; upstream fixes that are in debian patch

[arekm]

Author: arekm                        Date: Thu May  8 07:30:39 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2; upstream fixes that are in debian patch

---- Files affected:
SPECS:
   dash.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/dash.spec
diff -u SPECS/dash.spec:1.7 SPECS/dash.spec:1.8
--- SPECS/dash.spec:1.7	Sun Sep  2 14:58:16 2007
+++ SPECS/dash.spec	Thu May  8 09:30:34 2008
@@ -3,12 +3,13 @@
 Summary(pl.UTF-8):	Zgodna z POSIX implementacja /bin/sh
 Name:		dash
 Version:	0.5.4
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/Shells
 Source0:	http://gondor.apana.org.au/~herbert/dash/files/%{name}-%{version}.tar.gz
 # Source0-md5:	bc457e490a589d2f87f2333616b67931
 URL:		http://gondor.apana.org.au/~herbert/dash/
+Patch0:		%{name}-debian.patch
 Requires(post):	grep
 Requires(preun):	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -50,18 +52,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if [ ! -f /etc/shells ]; then
-	umask 022
-	echo '%{_shell}' > /etc/shells
-else
-	grep -q '^%{_shell}$' /etc/shells || echo '%{_shell}' >> /etc/shells
-fi
-
-%preun
-if [ "$1" = "0" ]; then
-	%{__sed} -i -e '/^%(echo %{_shell} | sed -e 's,/,\\/,g')$/d' /etc/shells
-fi
+%post   -p %add_etc_shells -p /bin/dash
+%preun  -p %remove_etc_shells -p /bin/dash
 
 %files
 %defattr(644,root,root,755)
@@ -74,7 +66,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.7  2007-09-02 12:58:16  arekm
+Revision 1.8  2008-05-08 07:30:34  arekm
+- rel 2; upstream fixes that are in debian patch
+
+Revision 1.7  2007/09/02 12:58:16  arekm
 - up to 0.5.4
 
 Revision 1.6  2007/02/12 22:09:09  glen
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dash.spec?r1=1.7&r2=1.8&f=u