Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package ksh for openSUSE:Factory checked in 
at 2023-03-21 17:42:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
 and      /work/SRC/openSUSE:Factory/.ksh.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ksh"

Tue Mar 21 17:42:06 2023 rev:113 rq:1073278 version:93vu

Changes:
--------
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes  2021-04-08 21:03:23.533980133 
+0200
+++ /work/SRC/openSUSE:Factory/.ksh.new.31432/ksh.changes       2023-03-21 
17:42:06.501996802 +0100
@@ -1,0 +2,5 @@
+Tue Dec 27 13:06:43 UTC 2022 - Ludwig Nussel <[email protected]>
+
+- Replace transitional %usrmerged macro with regular version check 
(boo#1206798)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ksh.spec ++++++
--- /var/tmp/diff_new_pack.UIHQod/_old  2023-03-21 17:42:07.762002828 +0100
+++ /var/tmp/diff_new_pack.UIHQod/_new  2023-03-21 17:42:07.766002847 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ksh
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
 %global         do_tests       0
 %endif
 %global         use_locale     0
-%if 0%{?usrmerged}
+%if 0%{?suse_version} >= 1550
 %define libdir %{_libdir}
 %define bindir %{_bindir}
 %else
@@ -52,9 +52,9 @@
 BuildRequires:  vim
 URL:            http://www.research.att.com/~gsf/download/
 Requires(post): /bin/ln /bin/rm /etc/bash.bashrc /bin/true
-Requires(postun): /bin/ln /bin/rm /etc/bash.bashrc /bin/true
+Requires(postun):/bin/ln /bin/rm /etc/bash.bashrc /bin/true
 Requires(post):  update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 %if %use_suid_exe
 PreReq:         permissions
 %endif
@@ -711,7 +711,7 @@
   # create update-alternatives symlinks
   mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
   touch %{buildroot}/%{_sysconfdir}/alternatives/ksh
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
   touch %{buildroot}/%{_sysconfdir}/alternatives/usr-bin-ksh
   ln -sf %{_sysconfdir}/alternatives/usr-bin-ksh        
%{buildroot}%{_bindir}/ksh
 %endif
@@ -728,7 +728,7 @@
   if cmp -s %{buildroot}%{_datadir}/ksh/fun/pushd 
%{buildroot}%{_datadir}/ksh/fun/popd ; then
       ln -sf pushd %{buildroot}%{_datadir}/ksh/fun/popd
   fi
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
   for so in %{buildroot}%{libdir}/ast/*.so.*.* ; do
       so=${so##*/}
       ln -sf %{libdir}/ast/$so %{buildroot}%{_libdir}/ast/${so%%%%.*}.so
@@ -828,7 +828,7 @@
 fi
 %{_sbindir}/update-alternatives \
     --install %{bindir}/ksh ksh %{bindir}/ksh93 20 \
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
     --slave %{_bindir}/ksh usr-bin-ksh /bin/ksh93 \
 %endif
     --slave %{_mandir}/man1/ksh.1.gz ksh.1.gz %{_mandir}/man1/ksh93.1.gz \
@@ -862,7 +862,7 @@
 %doc %{_mandir}/man1/rksh.1.gz
 %doc %{_mandir}/man1/ksh93.1.gz
 %ghost %{_sysconfdir}/alternatives/ksh
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/ksh93
 /bin/ksh
 %ghost %{_sysconfdir}/alternatives/usr-bin-ksh

Reply via email to