X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=mksh.spec;h=133e2a8f69226fb6541028484e7fc4ed7e859c7c;hb=6a3ebac2ab8b5b744c3dbc1689febaf8da67f668;hp=76c9dbfb0ee36ead19876626710bd55215a074b8;hpb=e8ed3f0e4ba55966f3aa461d8deb6617f32d106e;p=packages%2Fmksh.git

diff --git a/mksh.spec b/mksh.spec
index 76c9dbf..133e2a8 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -1,22 +1,22 @@
 #
 # Conditional build:
+%bcond_with	lto	# enable link time optimisations (breaks tests)
 %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:	50d
-Release:	2
+Version:	58
+Release:	1
 License:	BSD
 Group:		Applications/Shells
-Source0:	http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5:	1c3882c07a760b23df1ad94ad0b4ed2e
+Source0:	https://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
+# Source0-md5:	6922a3e2228de2f0e78ff25398ccf8df
 Source1:	%{name}-mkshrc
+Source2:	get-source.sh
 Patch0:		%{name}-mkshrc_support.patch
 Patch1:		%{name}-circumflex.patch
-Patch2:		%{name}-no_stop_alias.patch
-Patch3:		%{name}-cmdline-length.patch
 URL:		https://www.mirbsd.org/mksh.htm
 %if %{with tests}
 BuildRequires:	ed
@@ -78,18 +78,15 @@ 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
+%setup -qc
+%{__mv} mksh/* .; rmdir mksh
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # sed rules instead of patch (needed update for every release)
 sed -i -e 's|\(#define.*MKSH_VERSION.*\)"|\1 @DISTRO@"|g' sh.h
-sed -i -e 's|\(@(#)MIRBSD KSH.*\)|\1 @DISTRO@|g' check.t
+sed -i -e 's|\(KSH R%{version}.*\)|\1 @DISTRO@|g' check.t
 
 # fill distro
 sed -i -e 's#@DISTRO@#PLD/Linux 3.0#g' check.t sh.h
@@ -136,10 +133,10 @@ EOF
 install -d out
 
 CC="%{__cc}" \
-CFLAGS="%{rpmcflags} -DMKSH_GCC55009 -DMKSH_BINSHREDUCED" \
+CFLAGS="%{rpmcflags} -DMKSH_GCC55009" \
 LDFLAGS="%{rpmldflags}" \
 CPPFLAGS="%{rpmcppflags}" \
-sh ./Build.sh -Q -r -j -c lto
+sh ./Build.sh -Q -r -j %{?with_lto:-c lto}
 
 # skip some tests if not on terminal
 if ! tty -s; then
@@ -159,10 +156,10 @@ mv mksh out/mksh.dynamic
 
 %if %{with static}
 CC="%{__cc}" \
-CFLAGS="%{rpmcflags} -DMKSH_GCC55009 -DMKSH_BINSHREDUCED" \
+CFLAGS="%{rpmcflags} -DMKSH_GCC55009" \
 LDFLAGS="%{rpmldflags} -static" \
 CPPFLAGS="%{rpmcppflags}" \
-sh ./Build.sh -Q -r -j -c lto
+sh ./Build.sh -Q -r -j %{?with_lto:-c lto}
 
 %if %{with tests}
 ./test.sh -v $skip_tests