Hello community,
here is the log from the commit of package mksh for openSUSE:Factory checked in
at 2014-08-25 11:03:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mksh (Old)
and /work/SRC/openSUSE:Factory/.mksh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mksh"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mksh/mksh.changes 2014-07-01
07:05:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mksh.new/mksh.changes 2014-08-25
11:04:04.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Aug 21 12:22:27 CEST 2014 - p...@suse.de
+
+- We use update-alternatives so there is no need to obsolete ksh.
+- Do not differentiate between openSUSE and SLES and simply state
+ that this is the SUSE version.
+
+-------------------------------------------------------------------
+Tue Aug 19 13:51:41 CEST 2014 - p...@suse.de
+
+- Test for suse_version 1315 as that is what SLE12 will be using.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mksh.spec ++++++
--- /var/tmp/diff_new_pack.arjWIf/_old 2014-08-25 11:04:05.000000000 +0200
+++ /var/tmp/diff_new_pack.arjWIf/_new 2014-08-25 11:04:05.000000000 +0200
@@ -34,10 +34,11 @@
# for %%check
BuildRequires: perl
BuildRequires: update-alternatives
-%if 0%{?suse_version} >= 1320
-# replaces pdksh in openSUSE >= 13.2
+%if 0%{?suse_version} >= 1315
+# replaces pdksh in openSUSE >= 13.2 and SLES >= 12
Provides: pdksh = %{version}
Obsoletes: pdksh < %{version}
+Provides: /bin/ksh
Requires(post): update-alternatives
Requires(preun): update-alternatives
%else
@@ -56,14 +57,16 @@
%setup -q -n %{name}
%patch0 -p1
+%if 0%{?sles_version} > 0 || 0%{suse_version} > 0
ed -s sh.h <<'EOF'
-,s/#define MKSH_VERSION "R\([^"]*\)"/#define MKSH_VERSION "R\1 openSUSE"/
+,s/#define MKSH_VERSION "R\([^"]*\)"/#define MKSH_VERSION "R\1 SUSE"/
w
EOF
ed -s check.t <<'EOF'
-,s/@(#)\(MIRBSD\|LEGACY\) KSH R\(.*\)/@(#)\1 KSH R\2 openSUSE/
+,s/@(#)\(MIRBSD\|LEGACY\) KSH R\(.*\)/@(#)\1 KSH R\2 SUSE/
w
EOF
+%endif
ln -s . examples
@@ -98,7 +101,7 @@
done
install -d -m 755 %{buildroot}%{_sysconfdir}/alternatives
ln -s %{_sysconfdir}/bash.bashrc %{buildroot}%{_sysconfdir}/mkshrc
-%if 0%{?suse_version} >= 1320
+%if 0%{?suse_version} >= 1315
# compatibility symlinks for pdksh, lksh replaces pdksh in openSUSE >= 13.2
ln -s /bin/lksh %{buildroot}/bin/pdksh
ln -s %{_bindir}/lksh %{buildroot}%{_bindir}/pdksh
@@ -122,7 +125,7 @@
%clean
rm -Rf %{buildroot}
-%if 0%{?suse_version} >= 1320
+%if 0%{?suse_version} >= 1315
%post
%{_sbindir}/update-alternatives \
--install /bin/ksh ksh %{_bindir}/lksh 15 \
@@ -163,7 +166,7 @@
%{_bindir}/lksh
%{_mandir}/man1/mksh.1%{?ext_man}
%{_mandir}/man1/lksh.1%{?ext_man}
-%if 0%{?suse_version} >= 1320
+%if 0%{?suse_version} >= 1315
/bin/pdksh
%{_bindir}/pdksh
%{_mandir}/man1/pdksh.1%{?ext_man}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
