SPECS: mksh.spec - cleanups, tabs, adapters

glen glen at pld-linux.org
Tue Oct 16 04:07:27 CEST 2007


Author: glen                         Date: Tue Oct 16 02:07:27 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups, tabs, adapters

---- Files affected:
SPECS:
   mksh.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/mksh.spec
diff -u SPECS/mksh.spec:1.2 SPECS/mksh.spec:1.3
--- SPECS/mksh.spec:1.2	Tue Oct 16 01:39:31 2007
+++ SPECS/mksh.spec	Tue Oct 16 04:07:21 2007
@@ -17,31 +17,30 @@
 
 %description
 mksh is the MirBSD enhanced version of the Public Domain Korn shell
-(pdksh), a bourne-compatible shell which is largely si- milar to the
+(pdksh), a bourne-compatible shell which is largely similar to the
 original AT&T Korn shell. It includes bug fixes and feature
 improvements in order to produce a modern, robust shell good for
 interactive and especially script use. It has UTF-8 support in the
-emacs command line editing mode; corres- ponds to OpenBSD 4.2-current
+emacs command line editing mode; corresponds to OpenBSD 4.2-current
 ksh sans GNU bash-like $PS1; the build environment requirements are
 autoconfigured; throughout code simplification/bugfix/enhancement has
 been done, and the shell has extended compatibility to other modern
 shells.
 
-
 %prep
-%setup -q -T -c %{name}-%{version}
+%setup -qcT
 gzip -dc %{SOURCE0} | cpio -mid
-mv mksh/* ./ ; rm -fr mksh
-cp "%{SOURCE1}" ./
+mv mksh/* ./
+rm -rf mksh
+cp %{SOURCE1} .
 
 %build
-CC="%__cc" CFLAGS="%{optflags}" sh ./Build.sh -Q -r -j
+CC="%{__cc}" CFLAGS="%{rpmcflags}" sh ./Build.sh -Q -r -j
 ./test.sh -v
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -D mksh   $RPM_BUILD_ROOT%{_bindir}/mksh
+install -D mksh	$RPM_BUILD_ROOT%{_bindir}/mksh
 install -D mksh.1 $RPM_BUILD_ROOT%{_mandir}/man1/mksh.1
 
 %clean
@@ -51,28 +50,28 @@
 t = {}
 f = io.open("/etc/shells", "r")
 if f then
-   for l in f:lines() do t[l]=l; end
-   f:close()
+	for l in f:lines() do t[l]=l; end
+	f:close()
 end
 for _, s in ipairs({"/bin/mksh", "/bin/sh"}) do
-   if not t[s] then
-      f = io.open("/etc/shells", "a"); f:write(s.."\n"); f:close()
-   end
+	if not t[s] then
+		f = io.open("/etc/shells", "a"); f:write(s.."\n"); f:close()
+	end
 end
 
 %preun -p <lua>
 if arg[2] == "0" then
-   f = io.open("/etc/shells", "r")
-   if f then
-      s=""
-      for l in f:lines() do
-        if not string.match(l,"^/bin/mksh$") then
-           s=s..l.."\n"
-        end
-      end
-      f:close()
-      io.open("/etc/shells", "w"):write(s)
-   end
+	f = io.open("/etc/shells", "r")
+	if f then
+		s=""
+		for l in f:lines() do
+			if not string.match(l,"^/bin/mksh$") then
+				s=s..l.."\n"
+			end
+		end
+		f:close()
+		io.open("/etc/shells", "w"):write(s)
+	end
 end
 
 %files
@@ -87,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007/10/16 02:07:21  glen
+- cleanups, tabs, adapters
+
 Revision 1.2  2007/10/15 23:39:31  areq
 - fix setup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mksh.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list