diff --git a/bug-812269_pacemaker-fencing-update-cib.patch b/bug-812269_pacemaker-fencing-update-cib.patch deleted file mode 100644 index 02f0605..0000000 --- a/bug-812269_pacemaker-fencing-update-cib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/fencing/main.c b/fencing/main.c -index 1a16b48..90787f8 100644 ---- a/fencing/main.c -+++ b/fencing/main.c -@@ -761,7 +761,7 @@ update_cib_cache_cb(const char *event, xmlNode * msg) - xmlNode *cib_last = local_cib; - - local_cib = NULL; -- rc = (*cib_apply_patch_event)(msg, cib_last, &local_cib, LOG_DEBUG); -+ /*rc = (*cib_apply_patch_event)(msg, cib_last, &local_cib, LOG_DEBUG);*/ - free_xml(cib_last); - - switch (rc) { diff --git a/pacemaker.changes b/pacemaker.changes index ace2fd7..8ea8482 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 17 16:52:02 UTC 2014 - ygao@suse.com + +- Drop the obsolete patch (bnc#857779): + * bug-812269_pacemaker-fencing-update-cib.patch + ------------------------------------------------------------------- Fri Jan 17 16:08:36 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 2f55268..a5f6f0a 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -111,9 +111,8 @@ Patch4: pacemaker-NodeUtilization-RA.patch Patch5: pacemaker-colocated-utilization.patch Patch6: pacemaker-cibsecret-tool-temp-disabled.patch Patch7: pacemaker-nagios-plugin-dir.patch -Patch8: bug-812269_pacemaker-fencing-update-cib.patch -Patch9: bug-812269_pacemaker-fencing-device-register-messages.patch -Patch10: pacemaker-Wno-cast-align.patch +Patch8: bug-812269_pacemaker-fencing-device-register-messages.patch +Patch9: pacemaker-Wno-cast-align.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: pacemaker-ticket-support = 2.0 Conflicts: heartbeat < 3.0 @@ -399,7 +398,6 @@ manager for Corosync, CMAN and/or Linux-HA. %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 # Force the local time #