X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=mksh.spec;h=16bad2a1fee017d2f78684806ef29e95bed3ec1a;hb=20fe49cbcfeca0427aebdf3ce348ec0fe802fcc1;hp=084cc22226f2abebf9b7eda30b62eef3777a09d2;hpb=90672aa55ef1391461c0c53e6dd1e2786c5eafbb;p=packages%2Fmksh.git

diff --git a/mksh.spec b/mksh.spec
index 084cc22..16bad2a 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -1,15 +1,20 @@
-%bcond_without	static
-%bcond_without	tests
+#
+# TODO: https://bugs.launchpad.net/mksh/+bug/1179287
+#
+# Conditional build:
+%bcond_without	static	# static version of mksh
+%bcond_without	tests	# rtchecks and test.sh checks
+#
 #
 Summary:	MirBSD Korn Shell
 Summary(pl.UTF-8):	Powłoka Korna z MirBSD
 Name:		mksh
-Version:	42b
+Version:	47
 Release:	1
 License:	BSD
 Group:		Applications/Shells
 Source0:	http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5:	8b4b9182eb63b47390f164246959b661
+# Source0-md5:	71c7cbcd78306897801b8b6691091e66
 Source1:	%{name}-mkshrc
 Patch0:		%{name}-mkshrc_support.patch
 Patch1:		%{name}-circumflex.patch
@@ -21,7 +26,7 @@ BuildRequires:	ed
 BuildRequires:	perl-base
 %endif
 %{?with_static:BuildRequires:   glibc-static}
-BuildRequires:	rpmbuild(macros) >= 1.462
+BuildRequires:	rpmbuild(macros) >= 1.670
 # is needed for /etc directory existence
 Requires(pre):	FHS
 Requires:	setup >= 2.4.6-2
@@ -148,7 +153,7 @@ fi
 ./mksh rtchecks >rtchecks.got 2>&1
 if ! cmp --quiet rtchecks.got rtchecks.expected ; then
 	echo "rtchecks failed"
-	diff -Naurp %{SOURCE3} rtchecks.got
+	diff -Naurp rtchecks.expected rtchecks.got
 	exit 1
 fi
 ./test.sh -v $skip_tests
@@ -195,11 +200,10 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p %add_etc_shells -p /bin/sh /bin/ksh /bin/mksh
 %preun  -p %remove_etc_shells -p /bin/sh /bin/ksh /bin/mksh
 
-%posttrans -p %add_etc_shells -p /bin/sh /bin/ksh
-
+%posttrans -p %add_etc_shells -p /bin/sh /bin/ksh /bin/mksh
 
-%post static -p %add_etc_shells -p /bin/mksh.static
-%preun static -p %remove_etc_shells -p /bin/mksh.static
+%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)