Accepting request 1071089 from network:ha-clustering:Factory

OBS-URL: https://build.opensuse.org/request/show/1071089
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd-utils?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger 2023-03-13 11:40:49 +00:00 committed by Git OBS Bridge
commit 5208ce9cd4
2 changed files with 23 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 10 07:42:09 UTC 2023 - Nicholas Yang <nicholas.yang@suse.com>
- bsc#1208922: fails to replace directory /lib/drbd with symlink
* modify drbd-utils.spec to rename it in pretrans script
-------------------------------------------------------------------
Tue Jan 3 05:09:00 UTC 2023 - Heming Zhao <heming.zhao@suse.com>

View File

@ -141,8 +141,20 @@ rm -rf %{buildroot}%{_sysconfdir}/xen
rm -rf %{buildroot}%{libdir}/drbd/crm-*fence-peer.sh # bsc#1204276
%if 0%{?suse_version} < 1550
# create symlink for bsc#1206364
rmdir %{buildroot}/lib/drbd
ln -sf %{libdir}/drbd %{buildroot}/lib/drbd
%endif
%pre
%service_add_pre %{services}
%if 0%{?suse_version} < 1550
if [ ! -L /lib/drbd ] && [ -d /lib/drbd ]; then
rm -rf /lib/drbd.rpmmoved
mv /lib/drbd /lib/drbd.rpmmoved
fi
%endif
%post
%tmpfiles_create %{_tmpfilesdir}/drbd.conf
@ -159,10 +171,6 @@ ln -sf drbd.conf-9.0.5.gz %{_mandir}/ja/man5/drbd.conf.5.gz
ln -sf drbdmon-9.0.8.gz %{_mandir}/man8/drbdmon.8.gz
ln -sf drbdmon-9.0.8.gz %{_mandir}/ja/man8/drbdmon.8.gz
%endif
%if 0%{?suse_version} < 1550
# create symbolic folder for bsc#1206364
ln -s /usr/lib/drbd /lib/drbd
%endif
%preun
%service_del_preun %{services}
@ -190,6 +198,11 @@ ln -sf drbd.conf-9.0.5.gz %{_mandir}/ja/man5/drbd.conf.5.gz
%dir %{_sysconfdir}/multipath
%dir %{_sysconfdir}/multipath/conf.d
%{libdir}/drbd
%if 0%{?suse_version} < 1550
# symlink for bsc#1206364
/lib/drbd
%ghost /lib/drbd.rpmmoved
%endif
%{sbindir}/drbdadm
%{sbindir}/drbdsetup
%{sbindir}/drbdmeta