Accepting request 1073906 from home:nicholasyang:branches:network:ha-clustering:Factory

- bsc#1208922: fails to replace directory /lib/drbd with symlink
  * modify drbd-utils.spec to manipulate the symlink in %postun and %posttrans script

OBS-URL: https://build.opensuse.org/request/show/1073906
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=125

drbd-utils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 23 06:22:17 UTC 2023 - Nicholas Yang <nicholas.yang@suse.com>
+
+- bsc#1208922: fails to replace directory /lib/drbd with symlink
+  * modify drbd-utils.spec to manipulate the symlink in %postun and %posttrans script
+
 -------------------------------------------------------------------
 Fri Mar 10 07:42:09 UTC 2023 - Nicholas Yang <nicholas.yang@suse.com>
 

drbd-utils.spec

@@ -141,20 +141,8 @@ 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
@@ -178,6 +166,22 @@ ln -sf drbd.conf-9.0.5.gz %{_mandir}/ja/man5/drbd.conf.5.gz
 %postun
 %service_del_postun %{services}
 
+%if 0%{?suse_version} < 1550
+if [ -d /lib/drbd ]; then
+  rm -rf /lib/drbd.rpmmoved
+  mv /lib/drbd /lib/drbd.rpmmoved
+elif [ ! -e %{libdir}/drbd ] && [ -L /lib/drbd ]; then
+  rm /lib/drbd
+fi
+%endif
+
+%posttrans
+%if 0%{?suse_version} < 1550
+if [ ! -e /lib/drbd ]; then
+  ln -sf %{libdir}/drbd /lib/drbd
+fi
+%endif
+
 %files -n drbd-utils
 %config(noreplace) %{_sysconfdir}/drbd.conf
 %config(noreplace) %{_sysconfdir}/drbd.d/global_common.conf
@@ -198,11 +202,6 @@ 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