Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package mawk for openSUSE:Factory checked in 
at 2021-01-27 18:58:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mawk (Old)
 and      /work/SRC/openSUSE:Factory/.mawk.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mawk"

Wed Jan 27 18:58:32 2021 rev:20 rq:867248 version:1.3.4.20200120

Changes:
--------
--- /work/SRC/openSUSE:Factory/mawk/mawk.changes        2020-06-12 
21:41:13.499986532 +0200
+++ /work/SRC/openSUSE:Factory/.mawk.new.28504/mawk.changes     2021-01-27 
18:59:16.932530621 +0100
@@ -1,0 +2,5 @@
+Wed Dec 16 08:19:25 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ mawk.spec ++++++
--- /var/tmp/diff_new_pack.muj6SP/_old  2021-01-27 18:59:17.580531624 +0100
+++ /var/tmp/diff_new_pack.muj6SP/_new  2021-01-27 18:59:17.584531630 +0100
@@ -57,13 +57,17 @@
 %install
 %make_install
 
+# create symlinks for update-alternatives
+install -d -m 755 %{buildroot}%{_sysconfdir}/alternatives
+%if 0%{?usrmerged}
+ln -s %{_sysconfdir}/alternatives/awk %{buildroot}%{_bindir}/awk
+%else
 # compatibility symlink
 install -d -m 755 %{buildroot}/bin
 ln -s %{_bindir}/mawk %{buildroot}/bin/mawk
-# create symlinks for update-alternatives
-install -d -m 755 %{buildroot}%{_sysconfdir}/alternatives
 ln -s %{_sysconfdir}/alternatives/awk %{buildroot}/bin/awk
 ln -s %{_sysconfdir}/alternatives/usr-bin-awk %{buildroot}%{_bindir}/awk
+%endif
 ln -s %{_sysconfdir}/alternatives/awk.1%{?ext_man} 
%{buildroot}%{_mandir}/man1/awk.1%{?ext_man}
 
 %check
@@ -71,8 +75,12 @@
 
 %post
 %{_sbindir}/update-alternatives \
+%if 0%{?usrmerged}
+  --install %{_bindir}/awk awk %{_bindir}/mawk 15 \
+%else
   --install /bin/awk awk %{_bindir}/mawk 15 \
   --slave %{_bindir}/awk usr-bin-awk %{_bindir}/mawk \
+%endif
   --slave %{_mandir}/man1/awk.1.gz awk.1%{?ext_man} 
%{_mandir}/man1/mawk.1%{?ext_man}
 
 %preun
@@ -83,10 +91,12 @@
 %files
 %license COPYING
 %doc ACKNOWLEDGMENT CHANGES README examples/
-/bin/mawk
 %{_bindir}/mawk
 %{_mandir}/man1/mawk.1%{?ext_man}
+%if !0%{?usrmerged}
 /bin/awk
+/bin/mawk
+%endif
 %{_bindir}/awk
 %{_mandir}/man1/awk.1%{?ext_man}
 %ghost %{_sysconfdir}/alternatives/awk

Reply via email to