X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mksh.spec;h=a14ab80c9749c5a56c8221470b5692274efe88c1;hb=d4eb7072e18fd92e492a3ca511ffb81c4865af8a;hp=4c3cee1f19a83c91944ad1b8c9dbddce1aab647a;hpb=abf806a4853c96fbc2d2d108c7c3f2cf610a7ca8;p=packages%2Fmksh.git

diff --git a/mksh.spec b/mksh.spec
index 4c3cee1..a14ab80 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -1,16 +1,30 @@
+%bcond_without	static
 %bcond_without	tests
+#
 Summary:	MirBSD Korn Shell
 Summary(pl.UTF-8):	Powłoka Korna z MirBSD
 Name:		mksh
-Version:	39
-Release:	0.1
+Version:	40
+Release:	1
 License:	BSD
 Group:		Applications/Shells
 Source0:	http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.cpio.gz
-# Source0-md5:	b2eeb4fe4ccac2704e1440e53cd2672c
-Source1:	http://www.mirbsd.org/MirOS/dist/hosted/other/arc4random.c
-URL:		http://mirbsd.de/mksh
+# Source0-md5:	395a6c5f39c7e2afd8f6504d90ca90bd
+Source1:	%{name}-mkshrc
+Patch0:		%{name}-mkshrc_support.patch
+Patch1:		%{name}-circumflex.patch
+Patch2:		%{name}-no_stop_alias.patch
+URL:		https://www.mirbsd.org/mksh.htm
+%if %{with tests}
+BuildRequires:	ed
+BuildRequires:	perl-base
+%endif
+%{?with_static:BuildRequires:   glibc-static}
 BuildRequires:	rpmbuild(macros) >= 1.462
+# is needed for /etc directory existence
+Requires(pre):	FHS
+Requires:	setup >= 2.4.6-2
+Obsoletes:	pdksh
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir			/bin
@@ -39,36 +53,91 @@ emacsa; $PS1 odpowiada temu z ksh obecnym w OpenBSD 4.2-current;
 wykonanym uproszczeniom kodu, poprawkom i rozszerzeniom powłoka ma
 rozszerzoną kompatybilność z innymi współczesnymi powłokami.
 
+%package static
+Summary:	Statically linked the MirBSD enhanced version of pdksh
+Summary(pl.UTF-8):	Skonsolidowana statycznie powłoka mksh
+Group:		Applications/Shells
+# requires base for /etc/mkshrc?
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+mksh is the MirBSD enhanced version of the Public Domain Korn shell
+(pdksh), a Bourne-compatible shell which is largely similar to the
+original AT&T Korn shell.
+
+This packege contains statically linked version of mksh.
+
+%description static -l pl.UTF-8
+mksh to pochodząca z MirBSD rozszerzona wersja powłoki Public Domain
+Korn Shell (pdksh) - kompatybilnej z powłoką Bourne'a, w większości
+zbliżonej do oryginalnej powłoki Korna z AT&T.
+
+W tym pakiecie jest mksh skonsolidowany statycznie.
+
 %prep
 %setup -qcT
 gzip -dc %{SOURCE0} | cpio -mid
 mv mksh/* .; rmdir mksh
-cp -a %{SOURCE1} .
+
+%patch0 -p0
+%patch1 -p1
+%patch2 -p1
 
 %build
-CC="%{__cc}" CFLAGS="%{rpmcppflags} %{rpmcflags}" sh ./Build.sh -Q -r -j
+install -d out
+
+CC="%{__cc}" \
+CFLAGS="%{rpmcppflags} %{rpmcflags}" \
+LDFLAGS="%{rpmldflags}" \
+sh ./Build.sh -Q -r -j
+
+%{?with_tests:./test.sh -v}
+mv mksh out/mksh.dynamic
+
+%if %{with static}
+CC="%{__cc}" \
+CFLAGS="%{rpmcppflags} %{rpmcflags}" \
+LDFLAGS="%{rpmldflags} -static" \
+sh ./Build.sh -Q -r -j
 
 %{?with_tests:./test.sh -v}
+mv mksh out/mksh.static
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-install -p mksh	$RPM_BUILD_ROOT%{_bindir}/mksh
+install -p out/mksh.dynamic $RPM_BUILD_ROOT%{_bindir}/mksh
+%{?with_static:install -p out/mksh.static $RPM_BUILD_ROOT%{_bindir}/mksh.static}
+
 cp -a mksh.1 $RPM_BUILD_ROOT%{_mandir}/man1/mksh.1
+echo ".so mksh.1" > $RPM_BUILD_ROOT%{_mandir}/man1/sh.1
+
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mkshrc
+ln -sf mksh $RPM_BUILD_ROOT%{_bindir}/sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p <lua>
-%lua_add_etc_shells %{_bindir}/mksh
+%post   -p %add_etc_shells -p /bin/sh /bin/mksh
+%preun  -p %remove_etc_shells -p /bin/sh /bin/mksh
+
+%posttrans -p %add_etc_shells -p /bin/sh
 
-%preun	-p <lua>
-if arg[2] == 0 then
-	%lua_remove_etc_shells  %{_bindir}/mksh
-end
+%post static -p %add_etc_shells -p /bin/mksh.static
+%preun static -p %remove_etc_shells -p /bin/mksh.static
 
 %files
 %defattr(644,root,root,755)
 %doc dot.mkshrc
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/mkshrc
 %attr(755,root,root) %{_bindir}/mksh
+%attr(755,root,root) %{_bindir}/sh
 %{_mandir}/man1/mksh.1*
+%{_mandir}/man1/sh.1*
+
+%if %{with static}
+%files static
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/mksh.static
+%endif