Hello community,
here is the log from the commit of package corosync for openSUSE:Factory
checked in at 2019-11-13 13:13:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/corosync (Old)
and /work/SRC/openSUSE:Factory/.corosync.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "corosync"
Wed Nov 13 13:13:42 2019 rev:64 rq:747294 version:2.4.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/corosync/corosync.changes 2019-10-28
16:44:16.760541590 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new.2990/corosync.changes
2019-11-13 13:13:44.158786241 +0100
@@ -1,0 +2,7 @@
+Thu Nov 7 06:26:20 UTC 2019 - Yuan Ren <y...@suse.com>
+
+- Packaging bug updating Corosync(bsc#1155792)
+ Some noisy output from Tumbleweed caused by RPM macro not fairly used
+ Make sure corosync sysconfig keep original configured firstly(bsc1153502)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ corosync.spec ++++++
--- /var/tmp/diff_new_pack.78PeYv/_old 2019-11-13 13:13:45.366787498 +0100
+++ /var/tmp/diff_new_pack.78PeYv/_new 2019-11-13 13:13:45.366787498 +0100
@@ -256,8 +256,13 @@
%post
/usr/lib/corosync/upgrade.sh
-%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd
-%{fillup_and_insserv -n corosync}
+%{fillup_only -n corosync}
+# Upgrade
+if [ $1 -eq 2 ] ; then
+ # restore configured /etc/sysconfig/corosync(bsc#1155792)
+ install -m 0644 %{_sysconfdir}/sysconfig/corosync /tmp/.sysconfig.corosync
+fi
+
%service_add_post corosync.service corosync-notifyd.service
rm -rf %{_sysconfdir}/corosync/corosync.conf.example
%{_sysconfdir}/corosync/corosync.conf.example.unicast
@@ -268,8 +273,13 @@
%service_del_preun corosync.service corosync-notifyd.service
%postun
-if [ -f /etc/sysconfig/corosync ]; then
- rm /etc/sysconfig/corosync
+if [ -f %{_sysconfdir}/sysconfig/corosync ]; then
+ rm %{_sysconfdir}/sysconfig/corosync
+fi
+
+%posttrans
+if [ ! -f %{_sysconfdir}/sysconfig/corosync ] ; then
+ install -m 0644 /tmp/.sysconfig.corosync %{_sysconfdir}/sysconfig/corosync
fi
%files
@@ -571,7 +581,12 @@
%service_add_pre corosync-qdevice.service
%post -n corosync-qdevice
-%{fillup_and_insserv -n corosync-qdevice}
+%{fillup_only -n corosync-qdevice}
+# Upgrade
+if [ $1 -eq 2 ] ; then
+ install -m 0644 %{_sysconfdir}/sysconfig/corosync-qdevice
/tmp/.sysconfig.corosync-qdevice
+fi
+
%if %{sles_version} > 0
ln -s /run/corosync-qdevice /var/run/
%endif
@@ -584,11 +599,17 @@
unlink /var/run/corosync-qdevice
%endif
+%service_del_postun corosync-qdevice.service
+
%postun -n corosync-qdevice
-if [ -f /etc/sysconfig/corosync-qdevice ]; then
- rm /etc/sysconfig/corosync-qdevice
+if [ -f %{_sysconfdir}/sysconfig/corosync-qdevice ]; then
+ rm %{_sysconfdir}/sysconfig/corosync-qdevice
+fi
+
+%posttrans -n corosync-qdevice
+if [ ! -f %{_sysconfdir}/sysconfig/corosync-qdevice ] ; then
+ install -m 0644 /tmp/.sysconfig.corosync-qdevice
%{_sysconfdir}/sysconfig/corosync-qdevice
fi
-%service_del_postun corosync-qdevice.service
%files -n corosync-qdevice
%defattr(-,root,root,-)
@@ -641,7 +662,11 @@
%if %{sles_version} > 0
ln -s /run/corosync-qnetd /var/run/
%endif
-%{fillup_and_insserv -n corosync-qnetd}
+%{fillup_only -n corosync-qnetd}
+# Upgrade
+if [ $1 -eq 2 ] ; then
+ install -m 0644 %{_sysconfdir}/sysconfig/corosync-qnetd
/tmp/.sysconfig.corosync-qnetd
+fi
%service_add_post corosync-qnetd.service
@@ -652,11 +677,17 @@
unlink /var/run/corosync-qnetd
%endif
+%service_del_postun corosync-qnetd.service
+
%postun -n corosync-qnetd
-if [ -f /etc/sysconfig/corosync-qnetd ];then
- rm /etc/sysconfig/corosync-qnetd
+if [ -f %{_sysconfdir}/sysconfig/corosync-qnetd ]; then
+ rm %{_sysconfdir}/sysconfig/corosync-qnetd
+fi
+
+%posttrans -n corosync-qnetd
+if [ ! -f %{_sysconfdir}/sysconfig/corosync-qnetd ] ; then
+ install -m 0644 /tmp/.sysconfig.corosync-qnetd
%{_sysconfdir}/sysconfig/corosync-qnetd
fi
-%service_del_postun corosync-qnetd.service
%files -n corosync-qnetd
%defattr(-,root,root,-)
