Accepting request 925957 from home:wanghaisu:branches:network:ha-clustering:Factory

Modify patch name and add in changelogs.

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

drbd-utils.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Mon Oct 11 09:43:25 UTC 2021 - nick wang <nwang@suse.com>
 
-- Update to 9.19.0 
+- Update to 9.19.0
  * v9,events2: show changes of peer-client
  * v9: rr-conflict strategy auto-discard for protocol A
  * windrbd: various fixes including setting the systemd root
@@ -12,6 +12,7 @@ Mon Oct 11 09:43:25 UTC 2021 - nick wang <nwang@suse.com>
 - Remove patch fix-libdir-in-Makefile.patch
   Remove patch systemd-drbd-service-needs-network-online.patch (included)
 - Add drbd-utils.rpmlintrc for Error missing-call-to-setgroups-before-setuid
+- Add rpmlint-build-error.patch to fix rpmbuild build errors
 
 -------------------------------------------------------------------
 Fri Sep 17 08:05:56 UTC 2021 - nick wang <nwang@suse.com>

drbd-utils.spec

@@ -44,7 +44,7 @@ Patch3:         fence-after-pacemaker-down.patch
 Patch4:         0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 Patch5:         move_fencing_from_disk_to_net_in_example.patch
 Patch6:         pie-fix.patch
-Patch99:        rpmlint-build-error-wip.patch
+Patch99:        rpmlint-build-error.patch
 
 Provides:       drbd-bash-completion = %{version}
 Provides:       drbd-pacemaker = %{version}

usrmerge_move_lib_to_prefix_lib.patch

@@ -1,3 +1,5 @@
+https://en.opensuse.org/openSUSE:Usr_merge
+
 diff -Naur drbd-utils-9.19.0.orig/scripts/Makefile.in drbd-utils-9.19.0/scripts/Makefile.in
 --- drbd-utils-9.19.0.orig/scripts/Makefile.in	2021-10-11 17:59:20.189282860 +0800
 +++ drbd-utils-9.19.0/scripts/Makefile.in	2021-10-11 18:01:25.988786913 +0800