diff --git a/drbd-utils.changes b/drbd-utils.changes index f87951b..20cccc8 100644 --- a/drbd-utils.changes +++ b/drbd-utils.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Oct 11 09:43:25 UTC 2021 - nick wang -- 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 - 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 diff --git a/drbd-utils.spec b/drbd-utils.spec index 58d6524..324a42b 100644 --- a/drbd-utils.spec +++ b/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} diff --git a/rpmlint-build-error-wip.patch b/rpmlint-build-error.patch similarity index 100% rename from rpmlint-build-error-wip.patch rename to rpmlint-build-error.patch diff --git a/usrmerge_move_lib_to_prefix_lib.patch b/usrmerge_move_lib_to_prefix_lib.patch index a6dc307..0ba69cf 100644 --- a/usrmerge_move_lib_to_prefix_lib.patch +++ b/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